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 4131c7f..0420320 100644 (file)
--- a/jjb/multicloud/multicloud-k8s.yaml
+++ b/jjb/multicloud/multicloud-k8s.yaml
@@ -2,8 +2,8 @@
 - project:
     name: multicloud-k8s
     project-name: 'multicloud-k8s'
-    path: 'src/k8splugin'
-    golangver: 'golang111'
+    path: 'src'
+    golangver: 'golang114'
     jobs:
       - '{project-name}-{stream}-{subproject}-verify-python'
       - '{project-name}-{stream}-verify-golang'
@@ -11,28 +11,14 @@
       - '{project-name}-{stream}-docker-golang-shell-daily':
           script:
             !include-raw-escape: 'build-multicloud-k8s-docker-image.sh'
-    project: 'multicloud/k8s'
-    subproject:
-      - validation-scripts:
-          path: '.'
-          pattern: '**'
-    stream:
-      - 'master':
-          branch: 'master'
-    mvn-settings: 'multicloud-k8s-settings'
-    files: '**'
-    archive-artifacts: ''
-    build-node: ubuntu1604-builder-4c-4g
-
-- project:
-    name: multicloud-k8s-arm64
-    project-name: 'multicloud-k8s-arm64'
-    path: 'src/k8splugin'
-    golangver: 'golang111'
-    jobs:
-      - '{project-name}-{stream}-docker-golang-shell-daily':
+      - '{project-name}-{stream}-{area}-verify-shell':
+          disable-job: '{disable-kud}'
+          area: kud-deployment
+          build-timeout: 45
           script:
-            !include-raw-escape: 'build-multicloud-k8s-docker-image.sh'
+            !include-raw-escape: 'kud-deployment.sh'
+      - '{project-name}-gerrit-release-jobs':
+          build-node: centos7-docker-8c-8g
     project: 'multicloud/k8s'
     subproject:
       - validation-scripts:
@@ -41,7 +27,34 @@
     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-docker-arm64-4c-2g
+    build-node: ubuntu2004-builder-4c-4g
+
+#- project:
+#    name: multicloud-k8s-arm64
+#    project-name: 'multicloud-k8s-arm64'
+#    path: 'src/k8splugin'
+#    golangver: 'golang114'
+#    jobs:
+#      - '{project-name}-{stream}-docker-golang-shell-daily':
+#          script:
+#            !include-raw-escape: 'build-multicloud-k8s-docker-image.sh'
+#    project: 'multicloud/k8s'
+#    subproject:
+#      - validation-scripts:
+#          path: '.'
+#          pattern: '**'
+#    stream:
+#      - 'master':
+#          branch: 'master'
+#    mvn-settings: 'multicloud-k8s-settings'
+#    files: '**'
+#    archive-artifacts: ''
+#    build-node: ubuntu1804-docker-arm64-4c-2g