move vpp-verify|merge-*-ubuntu2004-aarch64 to beta jobs

- VPP build fails with static assert on ubuntu20.04/aarch64
     /w/workspace/vpp-verify-master-ubuntu2004-aarch64/src/plugins/af_xdp/input.c: In function af_xdp_device_input_refill:
     /w/workspace/vpp-verify-master-ubuntu2004-aarch64/src/vppinfra/error_bootstrap.h:111:34: error: static assertion failed: "wrong size"
       111 | #define STATIC_ASSERT(truth,...) _Static_assert(truth, __VA_ARGS__)
           |                                  ^~~~~~~~~~~~~~
     /w/workspace/vpp-verify-master-ubuntu2004-aarch64/src/plugins/af_xdp/input.c:140:3: note: in expansion of macro STATIC_ASSERT
       140 |   STATIC_ASSERT (sizeof (vlib_buffer_t) == XDP_PACKET_HEADROOM, "wrong size");
           |   ^~~~~~~~~~~~~
     Building C object plugins/af_xdp/CMakeFiles/af_xdp_plugin_thunderx2t99.dir/input.c.o

Updated ubuntu2004 Job Names:
$ jjsb-test vpp-* 2>&1 | grep -e'Number of jobs' -e'Job name' | sed -e 's/INFO:jenkins_jobs.builder://g' | grep ubuntu20
Job name:  vpp-beta-merge-master-ubuntu2004-aarch64
Job name:  vpp-beta-verify-master-ubuntu2004-aarch64
Job name:  vpp-gcc-verify-2009-ubuntu2004-x86_64
Job name:  vpp-gcc-verify-master-ubuntu2004-x86_64
Job name:  vpp-merge-2009-ubuntu2004-x86_64
Job name:  vpp-merge-master-ubuntu2004-x86_64
Job name:  vpp-verify-2009-ubuntu2004-x86_64
Job name:  vpp-verify-master-ubuntu2004-x86_64

Signed-off-by: Dave Wallace <[email protected]>
Change-Id: I60939c547ef330f109e5d445a85adb47ffdb30af

diff --git a/jjb/vpp/vpp.yaml b/jjb/vpp/vpp.yaml
index bd06acc..95d8882 100644 (file)
--- a/jjb/vpp/vpp.yaml
+++ b/jjb/vpp/vpp.yaml
@@ -256,27 +256,27 @@
 # this project gets deleted or commented out if it is only
 # 'os-in-XXXX' project.
 #
-- project:
-    name: vpp-os-in-2009-aarch64
-    jobs:
-      - 'vpp-verify-{stream}-{os}-{executor-arch}'
-      - 'vpp-merge-{stream}-{os}-{executor-arch}'
-
-    project: 'vpp'
-    make-parallel-jobs: '16'
-    stream:
-      - master:
-          branch: 'master'
-          repo-stream-part: 'master'
-          branch-head-refspec: ''
-      - '2009':
-          branch: 'stable/2009'
-          repo-stream-part: 'stable.2009'
-          branch-head-refspec: ''
-    os:
-      - ubuntu2004:
-          repo-os-part: 'ubuntu.focal.main'
-    executor-arch: 'aarch64'
+#- project:
+#    name: vpp-os-in-2009-aarch64
+#    jobs:
+#      - 'vpp-verify-{stream}-{os}-{executor-arch}'
+#      - 'vpp-merge-{stream}-{os}-{executor-arch}'
+#
+#    project: 'vpp'
+#    make-parallel-jobs: '16'
+#    stream:
+#      - master:
+#          branch: 'master'
+#          repo-stream-part: 'master'
+#          branch-head-refspec: ''
+#      - '2009':
+#          branch: 'stable/2009'
+#          repo-stream-part: 'stable.2009'
+#          branch-head-refspec: ''
+#    os:
+#      - ubuntu2004:
+#          repo-os-part: 'ubuntu.focal.main'
+#    executor-arch: 'aarch64'
 # [end] VPP-OS-IN-2009-AARCH64 PROJECT
 
 # VPP-BETA-AARCH64 PROJECT
@@ -308,6 +308,8 @@
     os:
       - centos8:
           repo-os-part: 'centos8'
+      - ubuntu2004:
+          repo-os-part: 'ubuntu.focal.main'
     executor-arch: aarch64
 # [end] VPP-BETA-AARCH64 PROJECT