diff options
Diffstat (limited to 'jjb')
| -rw-r--r-- | jjb/csit/csit-perf.yaml | 125 | ||||
| -rw-r--r-- | jjb/csit/csit-tox.yaml | 2 | ||||
| -rw-r--r-- | jjb/csit/csit-vpp-device.yaml | 3 | ||||
| -rwxr-xr-x | jjb/scripts/vpp/checkstyle.sh | 6 | ||||
| -rwxr-xr-x | jjb/scripts/vpp/debug-hst.sh | 10 | ||||
| -rwxr-xr-x | jjb/scripts/vpp/hst.sh | 2 | ||||
| -rw-r--r-- | jjb/vpp/docs.yaml | 3 | ||||
| -rw-r--r-- | jjb/vpp/vpp.yaml | 43 |
8 files changed, 27 insertions, 167 deletions
diff --git a/jjb/csit/csit-perf.yaml b/jjb/csit/csit-perf.yaml index d9fc66483..d40541084 100644 --- a/jjb/csit/csit-perf.yaml +++ b/jjb/csit/csit-perf.yaml @@ -23,24 +23,15 @@ - 2n-icx: os: 'ubuntu2204' executor-arch: 'x86_64' - - 2n-clx: - os: 'ubuntu2204' - executor-arch: 'x86_64' - 2n-spr: os: 'ubuntu2204' executor-arch: 'x86_64' - 2n-zn2: os: 'ubuntu2204' executor-arch: 'x86_64' - - 2n-tx2: - os: 'ubuntu2204' - executor-arch: 'aarch64' - 3n-icx: os: 'ubuntu2204' executor-arch: 'x86_64' - - 3n-tsh: - os: 'ubuntu2204' - executor-arch: 'aarch64' - 3n-alt: os: 'ubuntu2204' executor-arch: 'aarch64' @@ -61,24 +52,15 @@ - 2n-icx: os: 'ubuntu2204' executor-arch: 'x86_64' - - 2n-clx: - os: 'ubuntu2204' - executor-arch: 'x86_64' - 2n-spr: os: 'ubuntu2204' executor-arch: 'x86_64' - 2n-zn2: os: 'ubuntu2204' executor-arch: 'x86_64' - - 2n-tx2: - os: 'ubuntu2204' - executor-arch: 'aarch64' - 3n-icx: os: 'ubuntu2204' executor-arch: 'x86_64' - - 3n-tsh: - os: 'ubuntu2204' - executor-arch: 'aarch64' - 3n-alt: os: 'ubuntu2204' executor-arch: 'aarch64' @@ -111,24 +93,15 @@ - 2n-icx: os: 'ubuntu2204' executor-arch: 'x86_64' - - 2n-clx: - os: 'ubuntu2204' - executor-arch: 'x86_64' - 2n-spr: os: 'ubuntu2204' executor-arch: 'x86_64' - 2n-zn2: os: 'ubuntu2204' executor-arch: 'x86_64' - - 2n-tx2: - os: 'ubuntu2204' - executor-arch: 'aarch64' - 3n-icx: os: 'ubuntu2204' executor-arch: 'x86_64' - - 3n-tsh: - os: 'ubuntu2204' - executor-arch: 'aarch64' - 3n-alt: os: 'ubuntu2204' executor-arch: 'aarch64' @@ -148,91 +121,72 @@ - master: branch: 'master' branch-id: 'oper' - - '2406': - branch: 'rls2406' - branch-id: 'oper-rls2406' - 'csit-vpp-perf-mrr-daily-master-{node-arch}': node-arch: - 2n-icx: os: 'ubuntu2204' executor-arch: 'x86_64' - periodicity: '30 22 * * 1,4' - - 2n-clx: - os: 'ubuntu2204' - executor-arch: 'x86_64' - periodicity: '30 22 * * 1,4' + periodicity: '30 22 * * 0-4' - 2n-spr: os: 'ubuntu2204' executor-arch: 'x86_64' - periodicity: '30 22 * * 1,4' + periodicity: '30 22 * * 0-4' - 2n-zn2: os: 'ubuntu2204' executor-arch: 'x86_64' - periodicity: '30 22 * * 1,4' - - 2n-tx2: - os: 'ubuntu2204' - executor-arch: 'aarch64' - periodicity: '30 22 * * 1,4' + periodicity: '30 22 * * 0-4' - 3n-icx: os: 'ubuntu2204' executor-arch: 'x86_64' - periodicity: '30 22 * * 1,4' - - 3n-tsh: - os: 'ubuntu2204' - executor-arch: 'aarch64' - periodicity: '30 22 * * 1,4' + periodicity: '30 22 * * 0-4' - 3n-alt: os: 'ubuntu2204' executor-arch: 'aarch64' - periodicity: '30 22 * * 1,4' + periodicity: '30 22 * * 0-4' - 3n-snr: os: 'ubuntu2204' executor-arch: 'x86_64' - periodicity: '30 22 * * 1,4' + periodicity: '30 22 * * 0-4' - 3n-icxd: os: 'ubuntu2204' executor-arch: 'x86_64' - periodicity: '30 22 * * 1,4' + periodicity: '30 22 * * 0-4' - 3na-spr: os: 'ubuntu2204' executor-arch: 'x86_64' - periodicity: '30 22 * * 1,4' + periodicity: '30 22 * * 0-4' - 3nb-spr: os: 'ubuntu2204' executor-arch: 'x86_64' - periodicity: '30 22 * * 1,4' + periodicity: '30 22 * * 0-4' - 'csit-vpp-perf-hoststack-daily-master-{node-arch}': node-arch: - 2n-icx: os: 'ubuntu2204' executor-arch: 'x86_64' - periodicity: '30 22 * * 1,4' + periodicity: '30 22 * * 0-4' - 2n-spr: os: 'ubuntu2204' executor-arch: 'x86_64' - periodicity: '30 22 * * 1,4' + periodicity: '30 22 * * 0-4' - 3n-icx: os: 'ubuntu2204' executor-arch: 'x86_64' - periodicity: '30 22 * * 1,4' + periodicity: '30 22 * * 0-4' - 3na-spr: os: 'ubuntu2204' executor-arch: 'x86_64' - periodicity: '30 22 * * 1,4' + periodicity: '30 22 * * 0-4' - 3nb-spr: os: 'ubuntu2204' executor-arch: 'x86_64' - periodicity: '30 22 * * 1,4' + periodicity: '30 22 * * 0-4' - 'csit-vpp-perf-mrr-weekly-master-{node-arch}': node-arch: - 2n-icx: os: 'ubuntu2204' executor-arch: 'x86_64' periodicity: '0 0 * * 6' - - 2n-clx: - os: 'ubuntu2204' - executor-arch: 'x86_64' - periodicity: '0 0 * * 6' - 2n-aws: os: 'ubuntu2204' executor-arch: 'x86_64' @@ -250,9 +204,6 @@ - 2n-icx: os: 'ubuntu2204' executor-arch: 'x86_64' - - 2n-clx: - os: 'ubuntu2204' - executor-arch: 'x86_64' - 2n-spr: os: 'ubuntu2204' executor-arch: 'x86_64' @@ -282,24 +233,15 @@ - 2n-icx: os: 'ubuntu2204' executor-arch: 'x86_64' - - 2n-clx: - os: 'ubuntu2204' - executor-arch: 'x86_64' - 2n-spr: os: 'ubuntu2204' executor-arch: 'x86_64' - 2n-zn2: os: 'ubuntu2204' executor-arch: 'x86_64' - - 2n-tx2: - os: 'ubuntu2204' - executor-arch: 'aarch64' - 3n-icx: os: 'ubuntu2204' executor-arch: 'x86_64' - - 3n-tsh: - os: 'ubuntu2204' - executor-arch: 'aarch64' - 3n-alt: os: 'ubuntu2204' executor-arch: 'aarch64' @@ -321,24 +263,15 @@ - 2n-icx: os: 'ubuntu2204' executor-arch: 'x86_64' - - 2n-clx: - os: 'ubuntu2204' - executor-arch: 'x86_64' - 2n-spr: os: 'ubuntu2204' executor-arch: 'x86_64' - 2n-zn2: os: 'ubuntu2204' executor-arch: 'x86_64' - - 2n-tx2: - os: 'ubuntu2204' - executor-arch: 'aarch64' - 3n-icx: os: 'ubuntu2204' executor-arch: 'x86_64' - - 3n-tsh: - os: 'ubuntu2204' - executor-arch: 'aarch64' - 3n-alt: os: 'ubuntu2204' executor-arch: 'aarch64' @@ -371,24 +304,15 @@ - 2n-icx: os: 'ubuntu2204' executor-arch: 'x86_64' - - 2n-clx: - os: 'ubuntu2204' - executor-arch: 'x86_64' - 2n-spr: os: 'ubuntu2204' executor-arch: 'x86_64' - 2n-zn2: os: 'ubuntu2204' executor-arch: 'x86_64' - - 2n-tx2: - os: 'ubuntu2204' - executor-arch: 'aarch64' - 3n-icx: os: 'ubuntu2204' executor-arch: 'x86_64' - - 3n-tsh: - os: 'ubuntu2204' - executor-arch: 'aarch64' - 3n-alt: os: 'ubuntu2204' executor-arch: 'aarch64' @@ -426,24 +350,15 @@ - 2n-icx: os: 'ubuntu2204' executor-arch: 'x86_64' - - 2n-clx: - os: 'ubuntu2204' - executor-arch: 'x86_64' - 2n-spr: os: 'ubuntu2204' executor-arch: 'x86_64' - 2n-zn2: os: 'ubuntu2204' executor-arch: 'x86_64' - - 2n-tx2: - os: 'ubuntu2204' - executor-arch: 'aarch64' - 3n-icx: os: 'ubuntu2204' executor-arch: 'x86_64' - - 3n-tsh: - os: 'ubuntu2204' - executor-arch: 'aarch64' - 3n-alt: os: 'ubuntu2204' executor-arch: 'aarch64' @@ -476,24 +391,15 @@ - 2n-icx: os: 'ubuntu2204' executor-arch: 'x86_64' - - 2n-clx: - os: 'ubuntu2204' - executor-arch: 'x86_64' - 2n-spr: os: 'ubuntu2204' executor-arch: 'x86_64' - 2n-zn2: os: 'ubuntu2204' executor-arch: 'x86_64' - - 2n-tx2: - os: 'ubuntu2204' - executor-arch: 'aarch64' - 3n-icx: os: 'ubuntu2204' executor-arch: 'x86_64' - - 3n-tsh: - os: 'ubuntu2204' - executor-arch: 'aarch64' - 3n-alt: os: 'ubuntu2204' executor-arch: 'aarch64' @@ -542,9 +448,6 @@ - master: branch: 'master' branch-id: 'oper' - - '2406': - branch: 'rls2406' - branch-id: 'oper-rls2406' stream_report: - '2406': branch: 'rls2406' diff --git a/jjb/csit/csit-tox.yaml b/jjb/csit/csit-tox.yaml index e94645bb0..ae6dacca5 100644 --- a/jjb/csit/csit-tox.yaml +++ b/jjb/csit/csit-tox.yaml @@ -25,8 +25,6 @@ stream: - master: branch: 'master' - - '2406': - branch: 'rls2406' - job-template: name: 'csit-verify-tox-{stream}-{os}-{executor-arch}' diff --git a/jjb/csit/csit-vpp-device.yaml b/jjb/csit/csit-vpp-device.yaml index cb5a9b245..b0f7a7bb3 100644 --- a/jjb/csit/csit-vpp-device.yaml +++ b/jjb/csit/csit-vpp-device.yaml @@ -42,9 +42,6 @@ - master: branch: 'master' branch-id: 'oper' - - '2406': - branch: 'rls2406' - branch-id: 'oper-rls2406' - job-template: name: 'csit-vpp-device-report-coverage-{stream}-{node-arch}' diff --git a/jjb/scripts/vpp/checkstyle.sh b/jjb/scripts/vpp/checkstyle.sh index 00fc8bdb8..7feae3980 100755 --- a/jjb/scripts/vpp/checkstyle.sh +++ b/jjb/scripts/vpp/checkstyle.sh @@ -34,9 +34,9 @@ if git show --stat | grep -q "$MATRIX_FILE" ; then fi fi -if [ -n "$(grep -E '^checkstyle:' Makefile)" ] +if grep -qE '^checkstyle:' Makefile then - make checkstyle + make UNATTENDED=yes install-deps checkstyle else - echo "Can't find checkstyle target in Makefile - skipping checkstyle" + echo "Can't find checkstyle target in Makefile - skipping checkstyle" fi diff --git a/jjb/scripts/vpp/debug-hst.sh b/jjb/scripts/vpp/debug-hst.sh index e57ab4c22..1761d0949 100755 --- a/jjb/scripts/vpp/debug-hst.sh +++ b/jjb/scripts/vpp/debug-hst.sh @@ -36,15 +36,15 @@ vpp_make_build_debug() { BUILD_ERROR="FAILED 'make install-ext-deps'" return fi - if ! make UNATTENDED=yes build ; then - BUILD_ERROR="FAILED 'make build'" + if ! make VERBOSE=true VPPSRC="$(pwd)" -C "$HST_DIR" build-debug ; then + BUILD_ERROR="FAILED 'make -C $HST_DIR build-debug'" return fi } hst_test_debug() { - if ! make VERBOSE=true VPPSRC="$(pwd)" -C "$HST_DIR" build-debug test ; then - BUILD_ERROR="FAILED 'make -C $HST_DIR test' (debug)" + if ! make VERBOSE=true VPPSRC="$(pwd)" -C "$HST_DIR" test-debug ; then + BUILD_ERROR="FAILED 'make -C $HST_DIR test-debug'" return fi } @@ -58,5 +58,5 @@ if [ -n "$BUILD_ERROR" ] ; then RETVAL="1" fi echo -e "\n$line\n* VPP ${OS_ID^^}-${OS_VERSION_ID}-${OS_ARCH^^}" \ - "BUILD $BUILD_RESULT\n$line\n" + "DEBUG HostStack Test Suite $BUILD_RESULT\n$line\n" exit $RETVAL diff --git a/jjb/scripts/vpp/hst.sh b/jjb/scripts/vpp/hst.sh index 08f075b68..1a5f3cad8 100755 --- a/jjb/scripts/vpp/hst.sh +++ b/jjb/scripts/vpp/hst.sh @@ -62,5 +62,5 @@ if [ -n "$BUILD_ERROR" ] ; then RETVAL="1" fi echo -e "\n$line\n* VPP ${OS_ID^^}-${OS_VERSION_ID}-${OS_ARCH^^}" \ - "BUILD $BUILD_RESULT\n$line\n" + "HostStack Test Suite $BUILD_RESULT\n$line\n" exit $RETVAL diff --git a/jjb/vpp/docs.yaml b/jjb/vpp/docs.yaml index 1ee98ba8e..545789edc 100644 --- a/jjb/vpp/docs.yaml +++ b/jjb/vpp/docs.yaml @@ -15,9 +15,6 @@ - 'master': branch: 'master' branch-refspec: '' - - '2310': - branch: 'stable/2310' - branch-refspec: '' - '2402': branch: 'stable/2402' branch-refspec: '' diff --git a/jjb/vpp/vpp.yaml b/jjb/vpp/vpp.yaml index aad2cfedd..037ebd4b0 100644 --- a/jjb/vpp/vpp.yaml +++ b/jjb/vpp/vpp.yaml @@ -1,4 +1,4 @@ -# Copyright (c) 2023 Cisco and/or its affiliates. +# Copyright (c) 2024 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: @@ -39,9 +39,6 @@ - 'master': branch: 'master' branch-refspec: '' - - '2310': - branch: 'stable/2310' - branch-refspec: '' - '2402': branch: 'stable/2402' branch-refspec: '' @@ -106,11 +103,6 @@ branch-refspec: '' make-test-os: 'ubuntu-20.04 ubuntu-22.04' make-test-multiworker-os: 'debian-11' - - '2310': - branch: 'stable/2310' - branch-refspec: '' - make-test-os: 'ubuntu-20.04 ubuntu-22.04' - make-test-multiworker-os: 'debian-11' - '2402': branch: 'stable/2402' branch-refspec: '' @@ -142,9 +134,6 @@ - 'master': branch: 'master' branch-refspec: '' - - '2310': - branch: 'stable/2310' - branch-refspec: '' - '2402': branch: 'stable/2402' branch-refspec: '' @@ -249,11 +238,6 @@ branch-refspec: '' make-test-os: 'ubuntu-20.04 ubuntu-22.04' make-test-multiworker-os: '' - - '2310': - branch: 'stable/2310' - branch-refspec: '' - make-test-os: 'ubuntu-20.04 ubuntu-22.04' - make-test-multiworker-os: '' - '2402': branch: 'stable/2402' branch-refspec: '' @@ -282,9 +266,6 @@ - 'master': branch: 'master' branch-refspec: '' - - '2310': - branch: 'stable/2310' - branch-refspec: '' - '2402': branch: 'stable/2402' branch-refspec: '' @@ -299,12 +280,10 @@ - 1n-alt: os: 'ubuntu2204' executor-arch: 'aarch64' - skip-vote: 'true' + skip-vote: 'false' exclude: - # 1n-alt testbed not supported - # in CSIT prior to 2402 - - testbed-arch: 1n-alt - stream: '2310' + - testbed-arch: 1n-spr + stream: '2402' # [end] VPP-CSIT-VERIFY-DEVICE PROJECT # VPP-CSIT-VERIFY-PERF PROJECT @@ -323,9 +302,6 @@ - 2n-icx: os: 'ubuntu2204' executor-arch: 'x86_64' - - 2n-clx: - os: 'ubuntu2204' - executor-arch: 'x86_64' - 2n-spr: os: 'ubuntu2204' executor-arch: 'x86_64' @@ -335,18 +311,10 @@ - 3n-icx: os: 'ubuntu2204' executor-arch: 'x86_64' - - 3n-tsh: - os: 'ubuntu2204' - executor-arch: 'aarch64' - make-parallel-jobs: '16' - 3n-alt: os: 'ubuntu2204' executor-arch: 'aarch64' make-parallel-jobs: '16' - - 2n-tx2: - os: 'ubuntu2204' - executor-arch: 'aarch64' - make-parallel-jobs: '16' - 3n-snr: os: 'ubuntu2204' executor-arch: 'x86_64' @@ -376,9 +344,6 @@ - 'master': branch: 'master' branch-refspec: '' - - '2310': - branch: 'stable/2310' - branch-refspec: '' - '2402': branch: 'stable/2402' branch-refspec: '' |