Add missing base path on deploy jobs

[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 8c28d8b..2632beb 100644 (file)
--- a/jjb/akraino-templates/akraino-jjb-kni.yaml
+++ b/jjb/akraino-templates/akraino-jjb-kni.yaml
@@ -62,6 +62,7 @@
           branch: '$GERRIT_BRANCH'
           submodule-recursive: '{submodule-recursive}'
           submodule-timeout: '{submodule-timeout}'
+          submodule-disable: false
           choosing-strategy: default
 
     gerrit_verify_triggers:
@@ -154,6 +155,7 @@
           branch: '$GERRIT_BRANCH'
           submodule-recursive: '{submodule-recursive}'
           submodule-timeout: '{submodule-timeout}'
+          submodule-disable: false
           choosing-strategy: default
 
     triggers:
@@ -179,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
 
     #####################
@@ -204,6 +204,9 @@
       - lf-infra-properties:
           build-days-to-keep: '{build-days-to-keep}'
 
+    archive-artifacts: >
+      **/*.log
+
     parameters:
       - lf-infra-parameters:
           project: '{project}'
@@ -226,12 +229,20 @@
 
     gerrit_trigger_file_paths:
       - compare-type: REG_EXP
-        pattern: '.*'
+        pattern: 'profiles/production.aws/*'
+      - compare-type: REG_EXP
+        pattern: 'sites/testing.aws.edge-sites.net/*'
+      - compare-type: REG_EXP
+        pattern: 'base/*'
 
-    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:
@@ -241,12 +252,13 @@
           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}'
+          trigger-on: '{obj:gerrit_verify_triggers}'
           projects:
             - project-compare-type: ANT
               project-pattern: '{project}'
@@ -259,14 +271,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:
@@ -276,8 +282,8 @@
       - lf-infra-publish
 
 - job-template:
-    id: kni-templates-verify-deploy-aws
-    name: '{project-name}-verify-deploy-aws'
+    id: kni-blueprint-pae-verify-deploy-libvirt
+    name: '{project-name}-verify-deploy-libvirt'
 
     ######################
     # Default parameters #
@@ -285,7 +291,7 @@
 
     build-days-to-keep: 30
     build-timeout: 60
-    build-node: centos7-builder-8c-8g
+    build-node: kni-libvirt
     submodule-recursive: true
 
     #####################
@@ -305,6 +311,13 @@
           branch: '{branch}'
           stream: '{stream}'
           lftools-version: '{lftools-version}'
+      - string:
+          name: ARCHIVE_ARTIFACTS
+          default: '{archive-artifacts}'
+          description: Artifacts to archive to the logs server.
+
+    archive-artifacts: >
+      **/*.log
 
     wrappers:
       - lf-infra-wrappers:
@@ -317,17 +330,11 @@
 
     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}'
-          choosing-strategy: default
+        pattern: 'profiles/testing.libvirt/*'
+      - compare-type: REG_EXP
+        pattern: 'sites/testing.virt.edge-sites.net/*'
+      - compare-type: REG_EXP
+        pattern: 'base/*'
 
     gerrit_verify_triggers:
       - patchset-created-event:
@@ -350,14 +357,21 @@
                   branch-pattern: '**/{branch}'
               file-paths: '{obj:gerrit_trigger_file_paths}'
 
+    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
+
     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
@@ -365,4 +379,79 @@
       - shell: !include-raw-escape:
           - ../shell/install_go.sh
       - shell: !include-raw-escape:
-          - ../shell/kni_deploy_aws.sh
+          - ../shell/kni_deploy_libvirt.sh
+
+    publishers:
+      - lf-infra-publish
+
+- job-template:
+    id: kni-installer-publish-openshift-install-libvirt-binary
+    name: '{project-name}-publish-openshift-install-libvirt-binary'
+
+    ######################
+    # Default parameters #
+    ######################
+
+    build-days-to-keep: 200
+    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}'
+
+    wrappers:
+      - lf-infra-wrappers:
+          build-timeout: '{build-timeout}'
+          jenkins-ssh-credential: '{jenkins-ssh-credential}'
+
+    gerrit_build_triggers:
+      - comment-added-contains-event:
+          comment-contains-value: '^build-binary'
+
+    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_build_triggers}'
+          projects:
+            - project-compare-type: ANT
+              project-pattern: '{project}'
+              branches:
+                - branch-compare-type: ANT
+                  branch-pattern: '**/{branch}'
+
+    builders:
+      - lf-infra-pre-build
+      - shell: !include-raw-escape:
+          - ../shell/install_go.sh
+      - shell: !include-raw-escape:
+          - ../shell/build_openshift_install_libvirt_binary.sh
+
+    publishers:
+      - lf-infra-publish