X-Git-Url: https://gerrit.akraino.org/r/gitweb?a=blobdiff_plain;f=jjb%2Fakraino-templates%2Fakraino-jjb-kni.yaml;h=7edb45c6003b2955fe500d0bd0971acd5514581a;hb=23b8fd16e40ebf79e64a0cbc384d31beb86130da;hp=1e48683fefcbcbd1433e0f4c301ea6fdeeda92a5;hpb=a08444714f8a1983e6bb4b8fad303c65a98b49d6;p=ci-management.git

diff --git a/jjb/akraino-templates/akraino-jjb-kni.yaml b/jjb/akraino-templates/akraino-jjb-kni.yaml
index 1e48683..7edb45c 100644
--- a/jjb/akraino-templates/akraino-jjb-kni.yaml
+++ b/jjb/akraino-templates/akraino-jjb-kni.yaml
@@ -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:
@@ -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}'