Chore: Move to ubuntu2004-builder

[ci-management.git] / jjb / multicloud / multicloud-k8s.yaml

diff --git a/jjb/multicloud/multicloud-k8s.yaml b/jjb/multicloud/multicloud-k8s.yaml
index dd43c95..0420320 100644 (file)
--- a/jjb/multicloud/multicloud-k8s.yaml
+++ b/jjb/multicloud/multicloud-k8s.yaml
@@ -12,6 +12,7 @@
           script:
             !include-raw-escape: 'build-multicloud-k8s-docker-image.sh'
       - '{project-name}-{stream}-{area}-verify-shell':
+          disable-job: '{disable-kud}'
           area: kud-deployment
           build-timeout: 45
           script:
@@ -26,10 +27,15 @@
     stream:
       - 'master':
           branch: 'master'
+      - 'honolulu':
+          branch: 'honolulu'
+          #KUD fixes are not backported to maintenance branches
+          disable-kud: true
     mvn-settings: 'multicloud-k8s-settings'
+    disable-kud: false
     files: '**'
     archive-artifacts: ''
-    build-node: ubuntu1804-builder-4c-4g
+    build-node: ubuntu2004-builder-4c-4g
 
 #- project:
 #    name: multicloud-k8s-arm64
@@ -52,12 +58,3 @@
 #    files: '**'
 #    archive-artifacts: ''
 #    build-node: ubuntu1804-docker-arm64-4c-2g
-
-- project:
-    name: multicloud-k8s-info
-    project-name: multicloud-k8s
-    jobs:
-      - gerrit-info-yaml-verify
-    build-node: centos7-builder-2c-1g
-    project: multicloud/k8s
-    branch: master