X-Git-Url: https://gerrit.akraino.org/r/gitweb?p=ci-management.git;a=blobdiff_plain;f=jjb%2Fakraino-templates%2Fakraino-jjb-kni.yaml;h=2be29527bd4886823cf09da8f8781d5b6f8b04fb;hp=e207263a08a5bc2f2685d0527edcbeed77bc9cf6;hb=0646001ff141372c25dda0863f819b31ba40e409;hpb=e2ba355c1af4c10253e4d89554dd2e31a31af6e0

diff --git a/jjb/akraino-templates/akraino-jjb-kni.yaml b/jjb/akraino-templates/akraino-jjb-kni.yaml
index e207263..2be2952 100644
--- a/jjb/akraino-templates/akraino-jjb-kni.yaml
+++ b/jjb/akraino-templates/akraino-jjb-kni.yaml
@@ -133,9 +133,9 @@
           jenkins-ssh-credential: '{jenkins-ssh-credential}'
 
     gerrit_trigger_file_paths:
-      - compare-type: REG_EXP
+      - compare-type: ANT
         pattern: 'Makefile'
-      - compare-type: REG_EXP
+      - compare-type: ANT
         pattern: 'cmd/binary.go'
 
     gerrit_verify_triggers:
@@ -181,8 +181,8 @@
       - lf-infra-publish
 
 - job-template:
-    id: kni-blueprint-pae-verify-deploy-aws
-    name: '{project-name}-verify-deploy-aws'
+    id: kni-verify-deploy-aws
+    name: 'kni-{project-name}-verify-deploy-aws'
 
     ######################
     # Default parameters #
@@ -228,10 +228,12 @@
               key-file-variable: KNI_KEY_PATH
 
     gerrit_trigger_file_paths:
-      - compare-type: REG_EXP
-        pattern: 'profiles/production.aws/*'
-      - compare-type: REG_EXP
-        pattern: 'sites/testing.aws.edge-sites.net/*'
+      - compare-type: ANT
+        pattern: 'profiles/production.aws/**'
+      - compare-type: ANT
+        pattern: 'sites/testing.aws.edge-sites.net/**'
+      - compare-type: ANT
+        pattern: 'base/**'
 
     gerrit_verify_triggers:
       - patchset-created-event:
@@ -243,7 +245,7 @@
           comment-contains-value: '^Patch Set[ ]+[0-9]+:([ ]+|[\n]+)(recheck|reverify)$'
 
     scm:
-      - lf-infra-gerrit-scm:
+      - akraino-lf-infra-gerrit-scm:
           jenkins-ssh-credential: '{jenkins-ssh-credential}'
           git-url: '{git-url}/{project}.git'
           refspec: '$GERRIT_REFSPEC'
@@ -252,7 +254,17 @@
           submodule-timeout: '{submodule-timeout}'
           submodule-disable: false
           choosing-strategy: default
-
+          basedir: '{project-name}'
+      - akraino-lf-infra-gerrit-scm:
+          jenkins-ssh-credential: '{jenkins-ssh-credential}'
+          git-url: '{git-url}/kni/installer.git'
+          refspec: 'refs/heads/master'
+          branch: 'master'
+          submodule-recursive: '{submodule-recursive}'
+          submodule-timeout: '{submodule-timeout}'
+          submodule-disable: false
+          choosing-strategy: default
+          basedir: 'installer'
     triggers:
       - gerrit:
           server-name: '{gerrit-server-name}'
@@ -273,15 +285,14 @@
               target: akraino-secrets/coreos-pull-secret
       - shell: !include-raw-escape:
           - ../shell/install_go.sh
-      - shell: !include-raw-escape:
-          - ../shell/kni_deploy_aws.sh
+      - shell: ./installer/ci/kni_deploy_aws.sh
 
     publishers:
       - lf-infra-publish
 
 - job-template:
-    id: kni-blueprint-pae-verify-deploy-libvirt
-    name: '{project-name}-verify-deploy-libvirt'
+    id: kni-verify-deploy-libvirt
+    name: 'kni-{project-name}-verify-deploy-libvirt'
 
     ######################
     # Default parameters #
@@ -327,10 +338,12 @@
               key-file-variable: KNI_KEY_PATH
 
     gerrit_trigger_file_paths:
-      - compare-type: REG_EXP
-        pattern: 'profiles/testing.libvirt/*'
-      - compare-type: REG_EXP
-        pattern: 'sites/testing.virt.edge-sites.net/*'
+      - compare-type: ANT
+        pattern: 'profiles/testing.libvirt/**'
+      - compare-type: ANT
+        pattern: 'sites/testing.virt.edge-sites.net/**'
+      - compare-type: ANT
+        pattern: 'base/**'
 
     gerrit_verify_triggers:
       - patchset-created-event:
@@ -354,7 +367,7 @@
               file-paths: '{obj:gerrit_trigger_file_paths}'
 
     scm:
-      - lf-infra-gerrit-scm:
+      - akraino-lf-infra-gerrit-scm:
           jenkins-ssh-credential: '{jenkins-ssh-credential}'
           git-url: '{git-url}/{project}.git'
           refspec: '$GERRIT_REFSPEC'
@@ -363,7 +376,17 @@
           submodule-timeout: '{submodule-timeout}'
           submodule-disable: false
           choosing-strategy: default
-
+          basedir: '{project-name}'
+      - akraino-lf-infra-gerrit-scm:
+          jenkins-ssh-credential: '{jenkins-ssh-credential}'
+          git-url: '{git-url}/kni/installer.git'
+          refspec: 'refs/heads/master'
+          branch: 'master'
+          submodule-recursive: '{submodule-recursive}'
+          submodule-timeout: '{submodule-timeout}'
+          submodule-disable: false
+          choosing-strategy: default
+          basedir: 'installer'
     builders:
       - lf-infra-pre-build
       - config-file-provider:
@@ -374,8 +397,7 @@
               target: akraino-secrets/ssh-pub-key
       - shell: !include-raw-escape:
           - ../shell/install_go.sh
-      - shell: !include-raw-escape:
-          - ../shell/kni_deploy_libvirt.sh
+      - shell: ./installer/ci/kni_deploy_libvirt.sh
 
     publishers:
       - lf-infra-publish