Chore: Revert back to ubuntu1804-builder

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

diff --git a/jjb/multicloud/multicloud-k8s.yaml b/jjb/multicloud/multicloud-k8s.yaml
index f8cf56f..428535a 100644 (file)
--- a/jjb/multicloud/multicloud-k8s.yaml
+++ b/jjb/multicloud/multicloud-k8s.yaml
@@ -3,7 +3,7 @@
     name: multicloud-k8s
     project-name: 'multicloud-k8s'
     path: 'src'
-    golangver: 'golang112'
+    golangver: 'golang114'
     jobs:
       - '{project-name}-{stream}-{subproject}-verify-python'
       - '{project-name}-{stream}-verify-golang'
@@ -12,9 +12,13 @@
           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:
             !include-raw-escape: 'kud-deployment.sh'
+      - '{project-name}-gerrit-release-jobs':
+          build-node: centos7-docker-8c-8g
     project: 'multicloud/k8s'
     subproject:
       - validation-scripts:
@@ -23,16 +27,21 @@
     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: ubuntu1604-builder-8c-8g
+    build-node: ubuntu1804-builder-4c-4g
 
 #- project:
 #    name: multicloud-k8s-arm64
 #    project-name: 'multicloud-k8s-arm64'
 #    path: 'src/k8splugin'
-#    golangver: 'golang112'
+#    golangver: 'golang114'
 #    jobs:
 #      - '{project-name}-{stream}-docker-golang-shell-daily':
 #          script:
@@ -48,13 +57,4 @@
 #    mvn-settings: 'multicloud-k8s-settings'
 #    files: '**'
 #    archive-artifacts: ''
-#    build-node: ubuntu1604-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
+#    build-node: ubuntu1804-docker-arm64-4c-2g