Refactor!: JJB code to comply with updates to v5.x

[ci-management.git] / jjb / akraino-templates / akraino-jjb-kni.yaml

diff --git a/jjb/akraino-templates/akraino-jjb-kni.yaml b/jjb/akraino-templates/akraino-jjb-kni.yaml
index 1e48683..a9fc7d9 100644 (file)
--- a/jjb/akraino-templates/akraino-jjb-kni.yaml
+++ b/jjb/akraino-templates/akraino-jjb-kni.yaml
@@ -36,14 +36,14 @@
       - description-setter:
           regexp: "(^(Nexus|S3) build logs: .*)"
 
-- kni_common: &kni_common
+- _kni_common: &kni_common
     name: kni-common
 
     ######################
     # Default parameters #
     ######################
 
-    build-node: "{build-node}"
+    build-node: ""
     build-days-to-keep: 30
     build-timeout: 60
     submodule-recursive: true
@@ -80,7 +80,7 @@
           submodule-recursive: '{submodule-recursive}'
           submodule-timeout: '{submodule-timeout}'
           submodule-disable: false
-          choosing-strategy: default
+          choosing-strategy: gerrit
 
     gerrit_verify_triggers:
       - patchset-created-event:
@@ -105,7 +105,7 @@
     publishers:
       - lf-infra-publish
 
-- kni_common_deploy: &kni_common_deploy
+- _kni_common_deploy: &kni_common_deploy
     name: kni-common-deploy
     <<: *kni_common
     archive-artifacts: >
@@ -139,7 +139,7 @@
           submodule-recursive: '{submodule-recursive}'
           submodule-timeout: '{submodule-timeout}'
           submodule-disable: false
-          choosing-strategy: default
+          choosing-strategy: gerrit
           basedir: '{project-name}'
       - akraino-lf-infra-gerrit-scm:
           jenkins-ssh-credential: '{jenkins-ssh-credential}'
@@ -215,6 +215,32 @@
 - job-template:
     id: kni-verify-deploy-gcp
     name: 'kni-{project-name}-verify-deploy-gcp'
+    site: edge-sites-testing.gcp.devcluster.openshift.com
+    build-node: kni-cloud
+    <<: *kni_common_deploy
+
+    gerrit_trigger_file_paths:
+      - compare-type: ANT
+        pattern: 'profiles/production.gcp/**'
+      - compare-type: ANT
+        pattern: 'sites/edge-sites-testing.gcp.devcluster.openshift.com/**'
+      - compare-type: ANT
+        pattern: 'base/**'
+
+    builders:
+      - lf-infra-pre-build
+      - config-file-provider:
+          files:
+            - file-id: kni-coreos-pull-secret
+              target: akraino-secrets/coreos-pull-secret
+      - shell: !include-raw-escape:
+          - ../shell/install_go.sh
+      - shell: ./installer/ci/kni_deploy_gcp.sh {site}
+
+- job-template:
+    id: kni-verify-deploy-gcp-hub
+    name: 'kni-{project-name}-verify-deploy-gcp'
+    site: kni-mgmt-hub.gcp.devcluster.openshift.com
     build-node: kni-cloud
     <<: *kni_common_deploy
 
@@ -222,7 +248,7 @@
       - compare-type: ANT
         pattern: 'profiles/production.gcp/**'
       - compare-type: ANT
-        pattern: 'sites/testing.gcp.edge-sites.net/**'
+        pattern: 'sites/kni-mgmt-hub.gcp.devcluster.openshift.com/**'
       - compare-type: ANT
         pattern: 'base/**'
 
@@ -234,7 +260,32 @@
               target: akraino-secrets/coreos-pull-secret
       - shell: !include-raw-escape:
           - ../shell/install_go.sh
-      - shell: ./installer/ci/kni_deploy_gcp.sh
+      - shell: ./installer/ci/kni_deploy_gcp.sh {site}
+
+- job-template:
+    id: kni-verify-deploy-gcp-ie
+    name: 'kni-{project-name}-verify-deploy-gcp'
+    site: kni-ie.gcp.devcluster.openshift.com
+    build-node: kni-cloud
+    <<: *kni_common_deploy
+
+    gerrit_trigger_file_paths:
+      - compare-type: ANT
+        pattern: 'profiles/production.gcp/**'
+      - compare-type: ANT
+        pattern: 'sites/kni-ie.gcp.devcluster.openshift.com/**'
+      - compare-type: ANT
+        pattern: 'base/**'
+
+    builders:
+      - lf-infra-pre-build
+      - config-file-provider:
+          files:
+            - file-id: kni-coreos-pull-secret
+              target: akraino-secrets/coreos-pull-secret
+      - shell: !include-raw-escape:
+          - ../shell/install_go.sh
+      - shell: ./installer/ci/kni_deploy_gcp.sh {site}
 
 - job-template:
     id: kni-verify-deploy-baremetal
@@ -260,7 +311,7 @@
           submodule-recursive: '{submodule-recursive}'
           submodule-timeout: '{submodule-timeout}'
           submodule-disable: false
-          choosing-strategy: default
+          choosing-strategy: gerrit
           basedir: 'kni-blueprint-pae'
       - akraino-lf-infra-gerrit-scm:
           jenkins-ssh-credential: '{jenkins-ssh-credential}'