Merge "Add stable/2402 branch and remove stable/2306 branch to docker executor image...

diff --git a/.github/workflows/gerrit-verify.yaml b/.github/workflows/gerrit-verify.yaml
index c4c9c9c..3ea946d 100644 (file)
--- a/.github/workflows/gerrit-verify.yaml
+++ b/.github/workflows/gerrit-verify.yaml
@@ -46,7 +46,7 @@ jobs:
   call-gerrit-ci-management-verify:
     # yamllint disable rule:line-length
     uses:
-      lfit/releng-reusable-workflows/.github/workflows/gerrit-ci-management-verify.yaml@f1c0233862b6e944d4627a68a3f329cc97a50698  # v0.1.2
+      lfit/releng-reusable-workflows/.github/workflows/gerrit-ci-management-verify.yaml@6bb945b7d6f815db25d1cde9711f1b084f81e092 # v0.9
     # yamllint enable rule:line-length
     with:
       GERRIT_BRANCH: ${{ inputs.GERRIT_BRANCH }}

diff --git a/global-jjb b/global-jjb
index d31ff46..766dbef 160000 (submodule)
--- a/global-jjb
+++ b/global-jjb
@@ -1 +1 @@
-Subproject commit d31ff4635d1dc4a6afe4cf3be622a219be5f1318
+Subproject commit 766dbef8a63d824d6e551d4f179806521be95d13

diff --git a/jjb/csit/csit-perf.yaml b/jjb/csit/csit-perf.yaml
index 0b634b9..78dd9fd 100644 (file)
--- a/jjb/csit/csit-perf.yaml
+++ b/jjb/csit/csit-perf.yaml
@@ -156,73 +156,73 @@
             - 2n-icx:
                 os: 'ubuntu2204'
                 executor-arch: 'x86_64'
-                periodicity: '30 22 * * 1,4'
+                periodicity: '30 22 * * 0-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'
+                periodicity: '30 22 * * 0-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'
+                periodicity: '30 22 * * 0-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-{stream}-{node-arch}':
           node-arch:
             - 2n-icx:

diff --git a/jjb/csit/csit-vpp-device.yaml b/jjb/csit/csit-vpp-device.yaml
index 7750a3e..f2a0542 100644 (file)
--- a/jjb/csit/csit-vpp-device.yaml
+++ b/jjb/csit/csit-vpp-device.yaml
@@ -25,11 +25,6 @@
                 branch: 'rls2402'
                 branch-id: 'oper-rls2402'
     node-arch:
-#      - '1n-tx2':
-#          os: 'ubuntu2204'
-#          executor-arch: 'aarch64'
-#          make-parallel-jobs: '32'
-#          skip-vote: 'false'
       - '1n-alt':
           os: 'ubuntu2204'
           executor-arch: 'aarch64'
@@ -39,7 +34,7 @@
           os: 'ubuntu2204'
           executor-arch: 'x86_64'
           make-parallel-jobs: '32'
-          skip-vote: 'false'
+          skip-vote: 'true'
     project: 'csit'
     branch: 'master'
     branch-id: 'oper'

diff --git a/jjb/scripts/vpp/build.sh b/jjb/scripts/vpp/build.sh
index 388d05c..850d610 100644 (file)
--- a/jjb/scripts/vpp/build.sh
+++ b/jjb/scripts/vpp/build.sh
@@ -60,6 +60,12 @@ make_build_test() {
         BUILD_ERROR="FAILED 'make install-ext-deps'"
         return
     fi
+    if [ -f extras/scripts/build_static_vppctl.sh ]; then
+        if ! extras/scripts/build_static_vppctl.sh ; then
+            BUILD_ERROR="FAILED 'extras/scripts/build_static_vppctl.sh'"
+            return
+        fi
+    fi
     if ! make UNATTENDED=yes test-dep ; then
         BUILD_ERROR="FAILED 'make test-dep'"
         return

diff --git a/jjb/vpp/vpp.yaml b/jjb/vpp/vpp.yaml
index 4422988..62975f0 100644 (file)
--- a/jjb/vpp/vpp.yaml
+++ b/jjb/vpp/vpp.yaml
@@ -245,10 +245,6 @@
           os: 'ubuntu2204'
           executor-arch: 'x86_64'
           skip-vote: 'true'
-#      - 1n-tx2:
-#          os: 'ubuntu2204'
-#          executor-arch: 'aarch64'
-#          skip-vote: 'false'
       - 1n-alt:
           os: 'ubuntu2204'
           executor-arch: 'aarch64'

diff --git a/packer/common-packer b/packer/common-packer
index 15aba27..09cb3bc 160000 (submodule)
--- a/packer/common-packer
+++ b/packer/common-packer
@@ -1 +1 @@
-Subproject commit 15aba27a45f98edb33890daa3712c6a4371b2947
+Subproject commit 09cb3bcf48185afdc5af0a548be904491ae215de

diff --git a/packer/templates/builder.pkr.hcl b/packer/templates/builder.pkr.hcl
new file mode 120000 (symlink)
index 0000000..8ea2d87
--- /dev/null
+++ b/packer/templates/builder.pkr.hcl
@@ -0,0 +1 @@
+../common-packer/templates/builder.pkr.hcl
\ No newline at end of file

diff --git a/packer/templates/docker.pkr.hcl b/packer/templates/docker.pkr.hcl
new file mode 120000 (symlink)
index 0000000..08567df
--- /dev/null
+++ b/packer/templates/docker.pkr.hcl
@@ -0,0 +1 @@
+../common-packer/templates/docker.pkr.hcl
\ No newline at end of file