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=e207263a08a5bc2f2685d0527edcbeed77bc9cf6;hp=1194fe947252f79b20afd50cf441516c3e81c4e5;hb=b724c8dc7c9e7f44cd1a2c4457d9597ee7eae5e3;hpb=78a67a4f50165fdd093e6ac2638f3f184dd56b84

diff --git a/jjb/akraino-templates/akraino-jjb-kni.yaml b/jjb/akraino-templates/akraino-jjb-kni.yaml
index 1194fe9..e207263 100644
--- a/jjb/akraino-templates/akraino-jjb-kni.yaml
+++ b/jjb/akraino-templates/akraino-jjb-kni.yaml
@@ -181,18 +181,16 @@
       - lf-infra-publish
 
 - job-template:
-    id: kni-installer-merge-deploy-aws
-    name: '{project-name}-merge-deploy-aws'
+    id: kni-blueprint-pae-verify-deploy-aws
+    name: '{project-name}-verify-deploy-aws'
 
     ######################
     # Default parameters #
     ######################
 
-    archive-artifacts: >
-      **/*.log
     build-days-to-keep: 30
     build-timeout: 60
-    build-node: centos7-builder-8c-8g
+    build-node: kni-libvirt
     submodule-recursive: true
 
     #####################
@@ -206,6 +204,9 @@
       - lf-infra-properties:
           build-days-to-keep: '{build-days-to-keep}'
 
+    archive-artifacts: >
+      **/*.log
+
     parameters:
       - lf-infra-parameters:
           project: '{project}'
@@ -228,12 +229,18 @@
 
     gerrit_trigger_file_paths:
       - compare-type: REG_EXP
-        pattern: '.*'
+        pattern: 'profiles/production.aws/*'
+      - compare-type: REG_EXP
+        pattern: 'sites/testing.aws.edge-sites.net/*'
 
-    gerrit_merge_triggers:
-      - change-merged-event
+    gerrit_verify_triggers:
+      - patchset-created-event:
+          exclude-drafts: true
+          exclude-trivial-rebase: false
+          exclude-no-code-change: false
+      - draft-published-event
       - comment-added-contains-event:
-          comment-contains-value: remerge$
+          comment-contains-value: '^Patch Set[ ]+[0-9]+:([ ]+|[\n]+)(recheck|reverify)$'
 
     scm:
       - lf-infra-gerrit-scm:
@@ -249,7 +256,7 @@
     triggers:
       - gerrit:
           server-name: '{gerrit-server-name}'
-          trigger-on: '{obj:gerrit_merge_triggers}'
+          trigger-on: '{obj:gerrit_verify_triggers}'
           projects:
             - project-compare-type: ANT
               project-pattern: '{project}'
@@ -262,14 +269,8 @@
       - lf-infra-pre-build
       - config-file-provider:
           files:
-            - file-id: kni-aws-access-key-id
-              target: akraino-secrets/aws-access-key-id
-            - file-id: kni-aws-secret-access-key
-              target: akraino-secrets/aws-secret-access-key
             - file-id: kni-coreos-pull-secret
               target: akraino-secrets/coreos-pull-secret
-            - file-id: kni-ssh-pub-key
-              target: akraino-secrets/ssh-pub-key
       - shell: !include-raw-escape:
           - ../shell/install_go.sh
       - shell: !include-raw-escape:
@@ -279,15 +280,13 @@
       - lf-infra-publish
 
 - job-template:
-    id: kni-installer-merge-deploy-libvirt
-    name: '{project-name}-merge-deploy-libvirt'
+    id: kni-blueprint-pae-verify-deploy-libvirt
+    name: '{project-name}-verify-deploy-libvirt'
 
     ######################
     # Default parameters #
     ######################
 
-    archive-artifacts: >
-      **/*.log
     build-days-to-keep: 30
     build-timeout: 60
     build-node: kni-libvirt
@@ -315,93 +314,8 @@
           default: '{archive-artifacts}'
           description: Artifacts to archive to the logs server.
 
-    wrappers:
-      - lf-infra-wrappers:
-          build-timeout: '{build-timeout}'
-          jenkins-ssh-credential: '{jenkins-ssh-credential}'
-      - credentials-binding:
-          - ssh-user-private-key:
-              credential-id: kni-secrets
-              key-file-variable: KNI_KEY_PATH
-
-    gerrit_trigger_file_paths:
-      - compare-type: REG_EXP
-        pattern: '.*'
-
-    gerrit_merge_triggers:
-      - change-merged-event
-      - comment-added-contains-event:
-          comment-contains-value: remerge$
-
-    scm:
-      - lf-infra-gerrit-scm:
-          jenkins-ssh-credential: '{jenkins-ssh-credential}'
-          git-url: '{git-url}/{project}.git'
-          refspec: '$GERRIT_REFSPEC'
-          branch: '$GERRIT_BRANCH'
-          submodule-recursive: '{submodule-recursive}'
-          submodule-timeout: '{submodule-timeout}'
-          submodule-disable: false
-          choosing-strategy: default
-
-    triggers:
-      - gerrit:
-          server-name: '{gerrit-server-name}'
-          trigger-on: '{obj:gerrit_merge_triggers}'
-          projects:
-            - project-compare-type: ANT
-              project-pattern: '{project}'
-              branches:
-                - branch-compare-type: ANT
-                  branch-pattern: '**/{branch}'
-              file-paths: '{obj:gerrit_trigger_file_paths}'
-
-    builders:
-      - lf-infra-pre-build
-      - config-file-provider:
-          files:
-            - file-id: kni-coreos-pull-secret
-              target: akraino-secrets/coreos-pull-secret
-            - file-id: kni-ssh-pub-key
-              target: akraino-secrets/ssh-pub-key
-      - shell: !include-raw-escape:
-          - ../shell/install_go.sh
-      - shell: !include-raw-escape:
-          - ../shell/kni_deploy_libvirt.sh
-
-    publishers:
-      - lf-infra-publish
-
-- job-template:
-    id: kni-templates-verify-deploy-aws
-    name: '{project-name}-verify-deploy-aws'
-
-    ######################
-    # Default parameters #
-    ######################
-
-    build-days-to-keep: 30
-    build-timeout: 60
-    build-node: centos7-builder-8c-8g
-    submodule-recursive: true
-
-    #####################
-    # Job Configuration #
-    #####################
-
-    project-type: freestyle
-    node: '{build-node}'
-
-    properties:
-      - lf-infra-properties:
-          build-days-to-keep: '{build-days-to-keep}'
-
-    parameters:
-      - lf-infra-parameters:
-          project: '{project}'
-          branch: '{branch}'
-          stream: '{stream}'
-          lftools-version: '{lftools-version}'
+    archive-artifacts: >
+      **/*.log
 
     wrappers:
       - lf-infra-wrappers:
@@ -414,18 +328,9 @@
 
     gerrit_trigger_file_paths:
       - compare-type: REG_EXP
-        pattern: 'aws/*'
-
-    scm:
-      - lf-infra-gerrit-scm:
-          jenkins-ssh-credential: '{jenkins-ssh-credential}'
-          git-url: '{git-url}/kni/installer.git'
-          refspec: '$GERRIT_REFSPEC'
-          branch: '$GERRIT_BRANCH'
-          submodule-recursive: '{submodule-recursive}'
-          submodule-timeout: '{submodule-timeout}'
-          submodule-disable: false
-          choosing-strategy: default
+        pattern: 'profiles/testing.libvirt/*'
+      - compare-type: REG_EXP
+        pattern: 'sites/testing.virt.edge-sites.net/*'
 
     gerrit_verify_triggers:
       - patchset-created-event:
@@ -448,74 +353,10 @@
                   branch-pattern: '**/{branch}'
               file-paths: '{obj:gerrit_trigger_file_paths}'
 
-    builders:
-      - lf-infra-pre-build
-      - config-file-provider:
-          files:
-            - file-id: kni-aws-access-key-id
-              target: akraino-secrets/aws-access-key-id
-            - file-id: kni-aws-secret-access-key
-              target: akraino-secrets/aws-secret-access-key
-            - file-id: kni-coreos-pull-secret
-              target: akraino-secrets/coreos-pull-secret
-            - file-id: kni-ssh-pub-key
-              target: akraino-secrets/ssh-pub-key
-      - shell: !include-raw-escape:
-          - ../shell/install_go.sh
-      - shell: !include-raw-escape:
-          - ../shell/kni_deploy_aws.sh
-
-    publishers:
-      - lf-infra-publish
-
-- job-template:
-    id: kni-templates-verify-deploy-libvirt
-    name: '{project-name}-verify-deploy-libvirt'
-
-    ######################
-    # Default parameters #
-    ######################
-
-    build-days-to-keep: 30
-    build-timeout: 60
-    build-node: kni-libvirt
-    submodule-recursive: true
-
-    #####################
-    # Job Configuration #
-    #####################
-
-    project-type: freestyle
-    node: '{build-node}'
-
-    properties:
-      - lf-infra-properties:
-          build-days-to-keep: '{build-days-to-keep}'
-
-    parameters:
-      - lf-infra-parameters:
-          project: '{project}'
-          branch: '{branch}'
-          stream: '{stream}'
-          lftools-version: '{lftools-version}'
-
-    wrappers:
-      - lf-infra-wrappers:
-          build-timeout: '{build-timeout}'
-          jenkins-ssh-credential: '{jenkins-ssh-credential}'
-      - credentials-binding:
-          - ssh-user-private-key:
-              credential-id: kni-secrets
-              key-file-variable: KNI_KEY_PATH
-
-    gerrit_trigger_file_paths:
-      - compare-type: REG_EXP
-        pattern: 'aws/*'
-
     scm:
       - lf-infra-gerrit-scm:
           jenkins-ssh-credential: '{jenkins-ssh-credential}'
-          git-url: '{git-url}/kni/installer.git'
+          git-url: '{git-url}/{project}.git'
           refspec: '$GERRIT_REFSPEC'
           branch: '$GERRIT_BRANCH'
           submodule-recursive: '{submodule-recursive}'
@@ -523,27 +364,6 @@
           submodule-disable: false
           choosing-strategy: default
 
-    gerrit_verify_triggers:
-      - patchset-created-event:
-          exclude-drafts: true
-          exclude-trivial-rebase: false
-          exclude-no-code-change: false
-      - draft-published-event
-      - comment-added-contains-event:
-          comment-contains-value: '^Patch Set[ ]+[0-9]+:([ ]+|[\n]+)(recheck|reverify)$'
-
-    triggers:
-      - gerrit:
-          server-name: '{gerrit-server-name}'
-          trigger-on: '{obj:gerrit_verify_triggers}'
-          projects:
-            - project-compare-type: ANT
-              project-pattern: '{project}'
-              branches:
-                - branch-compare-type: ANT
-                  branch-pattern: '**/{branch}'
-              file-paths: '{obj:gerrit_trigger_file_paths}'
-
     builders:
       - lf-infra-pre-build
       - config-file-provider: