diff options
Diffstat (limited to 'jjb/csit')
| -rw-r--r-- | jjb/csit/csit-func.yaml | 12 | ||||
| -rw-r--r-- | jjb/csit/csit-perf.yaml | 28 | ||||
| -rw-r--r-- | jjb/csit/csit-tox.yaml | 4 | ||||
| -rw-r--r-- | jjb/csit/csit-vpp-device.yaml | 12 | ||||
| -rw-r--r-- | jjb/csit/csit.yaml | 159 | ||||
| -rw-r--r-- | jjb/csit/include-raw-csit-cpta.sh | 18 |
6 files changed, 50 insertions, 183 deletions
diff --git a/jjb/csit/csit-func.yaml b/jjb/csit/csit-func.yaml index d68cbcbe9..565aefcad 100644 --- a/jjb/csit/csit-func.yaml +++ b/jjb/csit/csit-func.yaml @@ -36,9 +36,6 @@ - master: branch: 'master' branch-id: 'oper' - - '1908': - branch: 'rls1908' - branch-id: 'oper-rls1908' stream: - master: branch: 'master' @@ -46,8 +43,8 @@ branch: 'rls1901' - '1904': branch: 'rls1904' - - '1908': - branch: 'rls1908' + - '1908_1': + branch: 'rls1908_1' - job-template: name: 'csit-vpp-verify-{stream_timed}-{os}-weekly' @@ -191,6 +188,11 @@ 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. + # Can be removed when this job is no longer needed for full API coverage. + - csit-fail-on-crc-mismatch-parameter: + fail-on-crc-mismatch: 'True' scm: - gerrit-trigger-scm: diff --git a/jjb/csit/csit-perf.yaml b/jjb/csit/csit-perf.yaml index e2d9bb88d..21a50e19c 100644 --- a/jjb/csit/csit-perf.yaml +++ b/jjb/csit/csit-perf.yaml @@ -22,16 +22,21 @@ - 'csit-vpp-perf-mrr-daily-master{node-arch}': node-arch: - '' + - -2n-clx - -2n-skx - -2n-dnv - -3n-skx - -3n-dnv - -3n-tsh: executor: 'ubuntu1804arm-us' - vpp-mrr-daily-periodicity: '0 16 * * 6' - - 'csit-vpp-perf-mrr-weekly-master-2n-skx' + vpp-mrr-daily-periodicity: '0 14 * * *' + - 'csit-vpp-perf-mrr-weekly-master-{node-arch}': + node-arch: + - 2n-clx + - 2n-skx - 'csit-vpp-perf-ndrpdr-weekly-master-{node-arch}': node-arch: + - 2n-clx - 2n-skx - 3n-skx - 3n-hsw @@ -39,6 +44,7 @@ - 'csit-dpdk-perf-mrr-weekly-master{node-arch}': node-arch: - '' + - -2n-clx - -2n-skx - -3n-skx - 'csit-ligato-perf-verify-{stream}-{node-arch}' @@ -48,7 +54,7 @@ ligato-executor: 'ubuntu1804-basebuild-4c-4g' branch: 'master' branch-id: 'oper' - vpp-mrr-daily-periodicity: '0 16 * * 1,3,5' + vpp-mrr-daily-periodicity: '0 2,14 * * *' stream: - master: branch: 'master' @@ -62,13 +68,14 @@ branch: 'rls1904' branch-id: 'oper-rls1904' executor: 'ubuntu1804-us' - - '1908': - branch: 'rls1908' - branch-id: 'oper-rls1908' + - '1908_1': + branch: 'rls1908_1' + branch-id: 'oper-rls1908_1' executor: 'ubuntu1804-us' build-artifact-num-to-keep: 10 node-arch: + - 2n-clx - 2n-skx - 2n-dnv - 3n-skx @@ -144,6 +151,11 @@ name: ARCHIVE_ARTIFACTS default: '{archive-artifacts}' description: Artifacts to archive to the logs server. + # This is a manually-triggered verify job, part of API coverage. + # CRC checking is needed to ensure vpp crc job breaks only when intended. + # Can be removed when this job is no longer needed for full API coverage. + - csit-fail-on-crc-mismatch-parameter: + fail-on-crc-mismatch: 'True' scm: - gerrit-trigger-scm: @@ -253,13 +265,13 @@ maven-version: 'mvn33-new' - job-template: - name: 'csit-vpp-perf-mrr-weekly-master-2n-skx' + name: 'csit-vpp-perf-mrr-weekly-master-{node-arch}' description: | <ul> <li>objective <ul> - <li>check vpp perf mrr weekly on 2n-skx + <li>check vpp perf mrr weekly on {node-arch} </ul> <li>perf test-cases selection <ul> diff --git a/jjb/csit/csit-tox.yaml b/jjb/csit/csit-tox.yaml index a4c3182b3..49603a1ca 100644 --- a/jjb/csit/csit-tox.yaml +++ b/jjb/csit/csit-tox.yaml @@ -14,8 +14,8 @@ branch: 'rls1901' - '1904': branch: 'rls1904' - - '1908': - branch: 'rls1908' + - '1908_1': + branch: 'rls1908_1' - job-template: name: 'csit-verify-tox-{stream}' diff --git a/jjb/csit/csit-vpp-device.yaml b/jjb/csit/csit-vpp-device.yaml index f16dae549..70dee6d21 100644 --- a/jjb/csit/csit-vpp-device.yaml +++ b/jjb/csit/csit-vpp-device.yaml @@ -39,9 +39,6 @@ - master: branch: 'master' branch-id: 'oper' - - '1908': - branch: 'rls1908' - branch-id: 'oper-rls1908' stream: - master: branch: 'master' @@ -53,8 +50,8 @@ branch: 'rls1904' branch-id: 'oper-rls1904' - '1908': - branch: 'rls1908' - branch-id: 'oper-rls1908' + branch: 'rls1908_1' + branch-id: 'oper-rls1908_1' exclude: - stream: '1901' os: 'ubuntu1804' @@ -127,6 +124,11 @@ 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' scm: - gerrit-trigger-scm: diff --git a/jjb/csit/csit.yaml b/jjb/csit/csit.yaml index 2f1dc8554..248f93594 100644 --- a/jjb/csit/csit.yaml +++ b/jjb/csit/csit.yaml @@ -19,8 +19,6 @@ jobs: - 'csit-docs-merge-{stream_timed}' - 'csit-report-merge-{stream}' - - 'csit-report-merge-1901_3' - - 'csit-report-merge-1904_2' - 'csit-trending-daily-master' project: 'csit' @@ -32,9 +30,6 @@ - master: branch: 'master' executor: 'ubuntu1804-us' - - '1908': - branch: 'rls1908' - executor: 'ubuntu1804-us' stream: - master: branch: 'master' @@ -45,8 +40,8 @@ - '1904': branch: 'rls1904' executor: 'ubuntu1804-us' - - '1908': - branch: 'rls1908' + - '1908_1': + branch: 'rls1908_1' executor: 'ubuntu1804-us' - project: @@ -209,156 +204,6 @@ maven-version: 'mvn33-new' - job-template: - name: 'csit-report-merge-1901_3' - - project-type: freestyle - node: '{executor-large}' - concurrent: false - allow-empty: 'true' - fingerprint: false - only-if-success: true - default-excludes: 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}' - - parameters: - - project-parameter: - project: '{project}' - - gerrit-parameter: - branch: 'rls1901_3' - - maven-exec: - maven-version: 'mvn33-new' - - string: - name: ARCHIVE_ARTIFACTS - default: '{archive-artifacts}' - description: Artifacts to archive to the logs server. - - scm: - - gerrit-trigger-scm: - credentials-id: 'jenkins-gerrit-credentials' - refspec: '$GERRIT_REFSPEC' - choosing-strategy: 'default' - - wrappers: - - fdio-infra-wrappers-non-activity-timeout: - build-timeout: '{build-timeout}' - - triggers: - - gerrit: - server-name: 'Primary' - trigger-on: - - comment-added-contains-event: - comment-contains-value: 'run-report' - projects: - - project-compare-type: 'ANT' - project-pattern: '{project}' - branches: - - branch-compare-type: 'ANT' - branch-pattern: '**/rls1901_3' - skip-vote: - successful: true - failed: true - unstable: true - notbuilt: true - - builders: - - maven-target: - maven-version: 'mvn33-new' - goals: '--version' - settings: 'csit-settings' - settings-type: cfp - global-settings: 'global-settings' - global-settings-type: cfp - - provide-maven-settings: - settings-file: 'csit-settings' - global-settings-file: 'global-settings' - - shell: - !include-raw-escape: include-raw-csit-report.sh - - publishers: - - fdio-infra-shiplogs: - maven-version: 'mvn33-new' - -- job-template: - name: 'csit-report-merge-1904_2' - - project-type: freestyle - node: '{executor-large}' - concurrent: false - allow-empty: 'true' - fingerprint: false - only-if-success: true - default-excludes: 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}' - - parameters: - - project-parameter: - project: '{project}' - - gerrit-parameter: - branch: 'rls1904_2' - - maven-exec: - maven-version: 'mvn33-new' - - string: - name: ARCHIVE_ARTIFACTS - default: '{archive-artifacts}' - description: Artifacts to archive to the logs server. - - scm: - - gerrit-trigger-scm: - credentials-id: 'jenkins-gerrit-credentials' - refspec: '$GERRIT_REFSPEC' - choosing-strategy: 'default' - - wrappers: - - fdio-infra-wrappers-non-activity-timeout: - build-timeout: '{build-timeout}' - - triggers: - - gerrit: - server-name: 'Primary' - trigger-on: - - comment-added-contains-event: - comment-contains-value: 'run-report' - projects: - - project-compare-type: 'ANT' - project-pattern: '{project}' - branches: - - branch-compare-type: 'ANT' - branch-pattern: '**/rls1904_2' - skip-vote: - successful: true - failed: true - unstable: true - notbuilt: true - - builders: - - maven-target: - maven-version: 'mvn33-new' - goals: '--version' - settings: 'csit-settings' - settings-type: cfp - global-settings: 'global-settings' - global-settings-type: cfp - - provide-maven-settings: - settings-file: 'csit-settings' - global-settings-file: 'global-settings' - - shell: - !include-raw-escape: include-raw-csit-report.sh - - publishers: - - fdio-infra-shiplogs: - maven-version: 'mvn33-new' - -- job-template: name: 'csit-trending-daily-master' project-type: freestyle diff --git a/jjb/csit/include-raw-csit-cpta.sh b/jjb/csit/include-raw-csit-cpta.sh index e3a118451..8225745c3 100644 --- a/jjb/csit/include-raw-csit-cpta.sh +++ b/jjb/csit/include-raw-csit-cpta.sh @@ -9,21 +9,27 @@ set -xe -o pipefail [ "${SECONDARY_BUILD_DIR}" ] || SECONDARY_BUILD_DIR="${DOC_DIR}_new/_build" [ "${SITE_DIR}" ] || SITE_DIR="build-root/docs/deploy-site" [ "${RESOURCES_DIR}" ] || RESOURCES_DIR="${SITE_DIR}/src/site/resources/trending" -[ "${SECONDARY_RESOURCES_DIR}" ] || SECONDARY_RESOURCES_DIR="${RESOURCES_DIR}/new" +[ "${STATIC_VPP_DIR}" ] || STATIC_VPP_DIR="${RESOURCES_DIR}/_static/vpp" [ "${MVN}" ] || MVN="/opt/apache/maven/bin/mvn" +[ "${FAILED_TESTS}" ] || FAILED_TESTS="${STATIC_VPP_DIR}/trending-failed-tests.txt" + +# Create a text file with email body in case the build fails: +cd "${WORKSPACE}" +mkdir -p "${STATIC_VPP_DIR}" +EMAIL_BODY="ERROR: The build number ${BUILD_NUMBER} of the job ${JOB_NAME} failed. For more information see: ${BUILD_URL}" +echo "${EMAIL_BODY}" > "${FAILED_TESTS}" cd "${DOC_DIR}" chmod +x ./run_cpta.sh STATUS=$(./run_cpta.sh | tail -1) cd "${WORKSPACE}" +rm -rf "${SITE_DIR}/"* mkdir -p "${RESOURCES_DIR}" -mv -f ${BUILD_DIR}/* "${RESOURCES_DIR}" -if [ -d "${SECONDARY_BUILD_DIR}" ]; then - mkdir -p "${SECONDARY_RESOURCES_DIR}" - mv -f "${SECONDARY_BUILD_DIR}"/* "${SECONDARY_RESOURCES_DIR}" -fi +ls "${RESOURCES_DIR}" +mv -f "${BUILD_DIR}/"* "${RESOURCES_DIR}" + cd "${SITE_DIR}" cat > pom.xml << EOF |