X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=jjb%2Fcsit%2Fcsit-vpp-device.yaml;h=dbf3ef9317734fe1af267678934d2eb2cabd21d8;hb=00753ac1ade6af7cd7aba21bfb7d53baed3b2b3b;hp=a34c1702eca3eccca29cdc78de31000f8ee3a9f5;hpb=b082bcf3bf0ccd29d0356b4b11537887eee30e0c;p=ci-management.git
diff --git a/jjb/csit/csit-vpp-device.yaml b/jjb/csit/csit-vpp-device.yaml
index a34c1702e..dbf3ef931 100644
--- a/jjb/csit/csit-vpp-device.yaml
+++ b/jjb/csit/csit-vpp-device.yaml
@@ -1,4 +1,4 @@
-# Copyright (c) 2020 Cisco and/or its affiliates.
+# Copyright (c) 2023 Cisco and/or its affiliates.
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at:
@@ -15,116 +15,62 @@
- project:
name: csit-vpp-device
description: 'CSIT jenkins jobs.'
- os:
- - 'ubuntu1804'
- node-arch:
- - '1n-skx'
- - '1n-tx2':
- executor: 'vpp-csit-arm-ubuntu18'
- skip-vote: 'true'
- trigger: 'gerrit-trigger-csit-vpp-devicetest-manual'
jobs:
- - 'csit-vpp-device-{stream}-{os}-{node-arch}'
- - 'csit-vpp-device-{stream}-{os}-{node-arch}-semiweekly':
+ - 'csit-vpp-device-{stream}-{os}-{executor-arch}-{node-arch}'
+ - 'csit-vpp-device-semiweekly-{stream}-{os}-{executor-arch}-{node-arch}'
+ - 'csit-vpp-device-weekly-{stream}-{os}-{executor-arch}-{node-arch}'
+ - 'csit-vpp-device-report-coverage-{stream}-{node-arch}':
stream:
- - master:
- branch: 'master'
- branch-id: 'oper'
- - '1908_2':
- branch: 'rls1908_2'
- branch-id: 'oper-rls1908_2'
- - 'csit-vpp-device-{stream}-{os}-{node-arch}-weekly':
- stream:
- - master:
- branch: 'master'
- branch-id: 'oper'
- - '1908_2':
- branch: 'rls1908_2'
- branch-id: 'oper-rls1908_2'
- - 'csit-vpp-device-master-{os}-1n-tx2-csit-verify-hourly'
- - 'csit-vpp-device-master-{os}-1n-tx2-vpp-verify-hourly'
-
+ - '2402':
+ branch: 'rls2402'
+ branch-id: 'oper-rls2402'
+ node-arch:
+ - '1n-alt':
+ os: 'ubuntu2204'
+ executor-arch: 'aarch64'
+ make-parallel-jobs: '32'
+ skip-vote: 'false'
+ - '1n-spr':
+ os: 'ubuntu2204'
+ executor-arch: 'x86_64'
+ make-parallel-jobs: '32'
+ skip-vote: 'true'
project: 'csit'
- executor: 'vpp-csit-device'
branch: 'master'
branch-id: 'oper'
- trigger: 'gerrit-trigger-csit-vpp-devicetest-full'
stream:
- master:
branch: 'master'
branch-id: 'oper'
- - '1908_2':
- branch: 'rls1908_2'
- branch-id: 'oper-rls1908_2'
- - '2001':
- branch: 'rls2001'
- branch-id: 'oper-rls2001'
+ - '2402':
+ branch: 'rls2402'
+ branch-id: 'oper-rls2402'
- job-template:
- name: 'csit-vpp-device-{stream}-{os}-{node-arch}'
- description: |
-
- - objective
-
- - vpp-device verify - per csit gerrit patch
-
- - job
-
- - name: csit-vpp-device-{stream}-{os}-{node-arch}
-
- trigger: keyword in comment to csit patch:
- csit-devicetest tag_list
-
- - executor
-
-
- test-cases selection
-
- - test-cases selected using trigger keyword followed by tags
-
- all test-cases are labelled with CSIT RF topic tags
- defined in csit/docs/tag_documentation.rst
-
- - default tags for vpp-device test type
-
-
- results
-
- - jjb verify: PASS/FAIL
-
- present: no
-
- analyse: no
-
-
+ name: 'csit-vpp-device-report-coverage-{stream}-{node-arch}'
project-type: freestyle
- node: '{executor}'
+ node: 'csit-builder-{os}-prod-{executor-arch}'
concurrent: true
- archive-artifacts: 'archive/*.*'
latest-only: false
- build-discarder:
- daysToKeep: '{build-days-to-keep}'
- numToKeep: '{build-num-to-keep}'
- artifactDaysToKeep: '{build-artifact-days-to-keep}'
- artifactNumToKeep: '{build-artifact-num-to-keep}'
+ properties:
+ - lf-infra-properties:
+ build-days-to-keep: "{build-days-to-keep}"
parameters:
- project-parameter:
project: '{project}'
- gerrit-parameter:
branch: '{branch}'
+ - make-parallel-jobs-parameter:
+ make-parallel-jobs: '{make-parallel-jobs}'
- os-parameter:
os: '{os}'
- - gerrit-refspec-parameter
+ - gerrit-refspec-parameter:
+ refspec: '$GERRIT_REFSPEC'
- gerrit-event-type-parameter
- gerrit-event-comment-text-parameter
- - string:
- name: ARCHIVE_ARTIFACTS
- default: '{archive-artifacts}'
- description: Artifacts to archive to the logs server.
- # This is an automatic verify job, part of API coverage.
- # CRC checking is needed to ensure vpp crc job breaks only when intended.
- # Unlikely to be removed, as this job is primary source of API coverage.
- csit-fail-on-crc-mismatch-parameter:
fail-on-crc-mismatch: 'True'
@@ -139,247 +85,150 @@
build-timeout: '{build-timeout}'
triggers:
- - '{trigger}':
+ - gerrit-trigger-csit-perftest:
project: '{project}'
branch: '{branch}'
- skip-vote: '{skip-vote}'
+ trigger-word: 'csit-vpp-report-dev-{node-arch}'
+ skip-vote: false
builders:
+ - shell:
+ !include-raw-escape:
+ - ../scripts/setup_executor_env.sh
- shell:
!include-raw-escape:
- ../scripts/csit/device-verify.sh
publishers:
- - robot:
- output-path: archive
- other-files:
- - '*.*'
- - fdio-infra-shiplogs:
- maven-version: 'mvn33-new'
+ - fdio-infra-publish
- job-template:
- name: 'csit-vpp-device-{stream}-{os}-{node-arch}-semiweekly'
- description: |
-
- - objective
-
- - Validate latest vpp build from corresponding branch stored
- in nexus against verified CSIT codebase of corresponding
- branch.
-
- - executor
-
-
- test-cases selection
-
- - pre-selected test-cases
-
- all test-cases are labelled with CSIT RF topic tags
- defined in csit/docs/tag_documentation.rst
-
- - default tags for vpp-device test type
-
-
- results
-
- - jjb verify: PASS/FAIL
-
- present: no
-
- analyse: no
-
-
+ name: 'csit-vpp-device-{stream}-{os}-{executor-arch}-{node-arch}'
project-type: freestyle
- node: '{executor}'
- concurrent: false
- archive-artifacts: 'csit/archive/*.*'
+ node: 'csit-builder-{os}-prod-{executor-arch}'
+ concurrent: true
latest-only: false
- build-discarder:
- daysToKeep: '{build-days-to-keep}'
- numToKeep: '{build-num-to-keep}'
- artifactDaysToKeep: '{build-artifact-days-to-keep}'
- artifactNumToKeep: '{build-artifact-num-to-keep}'
+ properties:
+ - lf-infra-properties:
+ build-days-to-keep: "{build-days-to-keep}"
parameters:
- project-parameter:
project: '{project}'
- gerrit-parameter:
branch: '{branch}'
+ - make-parallel-jobs-parameter:
+ make-parallel-jobs: '{make-parallel-jobs}'
- os-parameter:
os: '{os}'
- - string:
- name: ARCHIVE_ARTIFACTS
- default: '{archive-artifacts}'
- description: Artifacts to archive to the logs server.
+ - gerrit-refspec-parameter:
+ refspec: '$GERRIT_REFSPEC'
+ - gerrit-event-type-parameter
+ - gerrit-event-comment-text-parameter
+ # This is an automatic verify job, part of API coverage.
+ # CRC checking is needed to ensure vpp crc job breaks only when intended.
+ # Unlikely to be removed, as this job is primary source of API coverage.
+ - csit-fail-on-crc-mismatch-parameter:
+ fail-on-crc-mismatch: 'True'
+
+ scm:
+ - gerrit-trigger-scm:
+ credentials-id: 'jenkins-gerrit-credentials'
+ refspec: '$GERRIT_REFSPEC'
+ choosing-strategy: 'gerrit'
wrappers:
- - fdio-infra-wrappers-non-activity-timeout:
+ - fdio-infra-wrappers:
build-timeout: '{build-timeout}'
triggers:
- - timed: '0 4 * * 2,6'
-
- - gerrit-trigger-manually-triggered:
- comment-trigger-value: 'csit-verify-vpp'
- name: '{project}'
+ - gerrit-trigger-csit-vpp-devicetest-full:
+ project: '{project}'
branch: '{branch}'
+ skip-vote: '{skip-vote}'
builders:
- - shell: 'echo "BRANCH_ID={branch-id}" > $WORKSPACE/variables.prop'
- - inject:
- properties-file: variables.prop
- shell:
!include-raw-escape:
- - ../scripts/csit/device-semiweekly.sh
+ - ../scripts/setup_executor_env.sh
+ - shell:
+ !include-raw-escape:
+ - ../scripts/csit/device-verify.sh
publishers:
- - robot:
- output-path: 'csit/archive'
- other-files:
- - '*.*'
- - fdio-infra-shiplogs:
- maven-version: 'mvn33-new'
+ - fdio-infra-publish
- job-template:
- name: 'csit-vpp-device-{stream}-{os}-{node-arch}-weekly'
- description: |
-
- - objective
-
- - Validate CSIT code of corresponding branch against
- verified vpp build from corresponding branch.
-
- - executor
-
-
- test-cases selection
-
- - pre-selected test-cases
-
- all test-cases are labelled with CSIT RF topic tags
- defined in csit/docs/tag_documentation.rst
-
- - default tags for vpp-device test type
-
-
- results
-
- - jjb verify: PASS/FAIL
-
- present: no
-
- analyse: no
-
-
+ name: 'csit-vpp-device-semiweekly-{stream}-{os}-{executor-arch}-{node-arch}'
project-type: freestyle
- node: '{executor}'
+ node: 'csit-builder-{os}-prod-{executor-arch}'
concurrent: false
- archive-artifacts: 'archive/*.*'
latest-only: false
- build-discarder:
- daysToKeep: '{build-days-to-keep}'
- numToKeep: '{build-num-to-keep}'
- artifactDaysToKeep: '{build-artifact-days-to-keep}'
- artifactNumToKeep: '{build-artifact-num-to-keep}'
+ properties:
+ - lf-infra-properties:
+ build-days-to-keep: "{build-days-to-keep}"
parameters:
- project-parameter:
project: '{project}'
- gerrit-parameter:
branch: '{branch}'
+ - make-parallel-jobs-parameter:
+ make-parallel-jobs: '{make-parallel-jobs}'
- os-parameter:
os: '{os}'
- - string:
- name: ARCHIVE_ARTIFACTS
- default: '{archive-artifacts}'
- description: Artifacts to archive to the logs server.
-
- scm:
- - git-scm:
- credentials-id: 'jenkins-gerrit-credentials'
- branch: '{branch}'
wrappers:
- fdio-infra-wrappers-non-activity-timeout:
build-timeout: '{build-timeout}'
triggers:
- - timed: '0 4 * * 0'
+ - timed: '0 4 * * 2,6'
- gerrit-trigger-manually-triggered:
- comment-trigger-value: 'csit-vpp-ref-verify'
+ comment-trigger-value: 'csit-verify-vpp'
name: '{project}'
branch: '{branch}'
builders:
+ - shell: 'echo "BRANCH_ID={branch-id}" > $WORKSPACE/variables.prop'
+ - inject:
+ properties-file: variables.prop
- shell:
!include-raw-escape:
- - ../scripts/csit/device-verify.sh
+ - ../scripts/setup_executor_env.sh
+ - shell:
+ !include-raw-escape:
+ - ../scripts/csit/device-semiweekly.sh
publishers:
- - robot:
- output-path: archive
- other-files:
- - '*.*'
- - fdio-infra-shiplogs:
- maven-version: 'mvn33-new'
+ - fdio-infra-publish
- job-template:
- name: 'csit-vpp-device-master-{os}-1n-tx2-csit-verify-hourly'
- description: |
-
- - objective
-
- - Validate CSIT code of corresponding branch against
- verified vpp build from corresponding branch.
-
- - executor
-
- - vpp-csit-arm-ubuntu18
-
- - test-cases selection
-
- - pre-selected test-cases
-
- all test-cases are labelled with CSIT RF topic tags
- defined in csit/docs/tag_documentation.rst
-
- - default tags for vpp-device test type
-
-
- results
-
- - jjb verify: PASS/FAIL
-
- present: no
-
- analyse: no
-
-
+ name: 'csit-vpp-device-weekly-{stream}-{os}-{executor-arch}-{node-arch}'
project-type: freestyle
- node: 'vpp-csit-arm-ubuntu18'
+ node: 'csit-builder-{os}-prod-{executor-arch}'
concurrent: false
- archive-artifacts: 'archive/*.*'
latest-only: false
- build-discarder:
- daysToKeep: '{build-days-to-keep}'
- numToKeep: '{build-num-to-keep}'
- artifactDaysToKeep: '{build-artifact-days-to-keep}'
- artifactNumToKeep: '{build-artifact-num-to-keep}'
+ properties:
+ - lf-infra-properties:
+ build-days-to-keep: "{build-days-to-keep}"
parameters:
- project-parameter:
project: '{project}'
- gerrit-parameter:
branch: '{branch}'
+ - make-parallel-jobs-parameter:
+ make-parallel-jobs: '{make-parallel-jobs}'
- os-parameter:
- os: 'ubuntu1804'
- - string:
- name: ARCHIVE_ARTIFACTS
- default: '{archive-artifacts}'
- description: Artifacts to archive to the logs server.
+ os: '{os}'
scm:
- git-scm:
@@ -391,96 +240,20 @@
build-timeout: '{build-timeout}'
triggers:
- - timed: '0 * * * *'
-
- builders:
- - shell:
- !include-raw-escape:
- - ../scripts/csit/device-verify.sh
-
- publishers:
- - robot:
- output-path: archive
- other-files:
- - '*.*'
- - fdio-infra-shiplogs:
- maven-version: 'mvn33-new'
-
-- job-template:
- name: 'csit-vpp-device-master-{os}-1n-tx2-vpp-verify-hourly'
- description: |
-
- - objective
-
- - Validate latest vpp build from corresponding branch stored
- in nexus against verified CSIT codebase of corresponding
- branch.
-
- - executor
-
- - vpp-csit-arm-ubuntu18
-
- - test-cases selection
-
- - pre-selected test-cases
-
- all test-cases are labelled with CSIT RF topic tags
- defined in csit/docs/tag_documentation.rst
-
- - default tags for vpp-device test type
-
-
- results
-
- - jjb verify: PASS/FAIL
-
- present: no
-
- analyse: no
-
-
-
- project-type: freestyle
- node: 'vpp-csit-arm-ubuntu18'
- concurrent: false
- archive-artifacts: 'csit/archive/*.*'
- latest-only: false
-
- build-discarder:
- daysToKeep: '{build-days-to-keep}'
- numToKeep: '{build-num-to-keep}'
- artifactDaysToKeep: '{build-artifact-days-to-keep}'
- artifactNumToKeep: '{build-artifact-num-to-keep}'
+ - timed: '0 4 * * 0'
- parameters:
- - project-parameter:
- project: '{project}'
- - gerrit-parameter:
+ - gerrit-trigger-manually-triggered:
+ comment-trigger-value: 'csit-vpp-ref-verify'
+ name: '{project}'
branch: '{branch}'
- - os-parameter:
- os: 'ubuntu1804'
- - string:
- name: ARCHIVE_ARTIFACTS
- default: '{archive-artifacts}'
- description: Artifacts to archive to the logs server.
-
- wrappers:
- - fdio-infra-wrappers-non-activity-timeout:
- build-timeout: '{build-timeout}'
-
- triggers:
- - timed: '30 * * * *'
builders:
- - shell: 'echo "BRANCH_ID={branch-id}" > $WORKSPACE/variables.prop'
- - inject:
- properties-file: variables.prop
- shell:
!include-raw-escape:
- - ../scripts/csit/device-semiweekly.sh
+ - ../scripts/setup_executor_env.sh
+ - shell:
+ !include-raw-escape:
+ - ../scripts/csit/device-verify.sh
publishers:
- - robot:
- output-path: 'csit/archive'
- other-files:
- - '*.*'
- - fdio-infra-shiplogs:
- maven-version: 'mvn33-new'
+ - fdio-infra-publish