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

diff --git a/jjb/akraino-templates/akraino-jjb-kni.yaml b/jjb/akraino-templates/akraino-jjb-kni.yaml
index e207263..f031301 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:
@@ -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: 'blueprint-pae'
+      - 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,8 +285,7 @@
               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
@@ -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: 'blueprint-pae'
+      - 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