X-Git-Url: https://gerrit.akraino.org/r/gitweb?a=blobdiff_plain;f=jjb%2Fakraino-templates%2Fakraino-jjb-kni.yaml;h=a9fc7d9e4d5d998d5f8d3f71d1d4f5330ed3852e;hb=f7bdddeeb790b42e37846288bd22e4515eebb6e5;hp=aacb6e773186302c931f0c0e47d2be7c733a457f;hpb=d12a6f76fd88e24762623b65142d0de36c610bae;p=ci-management.git

diff --git a/jjb/akraino-templates/akraino-jjb-kni.yaml b/jjb/akraino-templates/akraino-jjb-kni.yaml
index aacb6e7..a9fc7d9 100644
--- a/jjb/akraino-templates/akraino-jjb-kni.yaml
+++ b/jjb/akraino-templates/akraino-jjb-kni.yaml
@@ -14,14 +14,36 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
-- kni_common: &kni_common
+
+# A builder to ship logs from a bare metal Akraino deploy test node.
+# Similar to lf-infra-ship-logs without python-tools-install.sh and
+# job-cost.sh.
+- builder:
+    name: kni-deploy-ship-logs
+    builders:
+      # Ensure no pre-existing .netrc files are overriding logs config
+      - lf-provide-maven-settings-cleanup
+      - config-file-provider:
+          files:
+            - file-id: "jenkins-log-archives-settings"
+              variable: "SETTINGS_FILE"
+      - lf-infra-create-netrc:
+          server-id: logs
+      - shell: !include-raw:
+          - ../../global-jjb/shell/logs-deploy.sh
+      - shell: !include-raw:
+          - ../../global-jjb/shell/logs-clear-credentials.sh
+      - description-setter:
+          regexp: "(^(Nexus|S3) build logs: .*)"
+
+- _kni_common: &kni_common
     name: kni-common
 
     ######################
     # Default parameters #
     ######################
 
-    build-node: "{build-node}"
+    build-node: ""
     build-days-to-keep: 30
     build-timeout: 60
     submodule-recursive: true
@@ -58,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:
@@ -83,7 +105,7 @@
     publishers:
       - lf-infra-publish
 
-- kni_common_deploy: &kni_common_deploy
+- _kni_common_deploy: &kni_common_deploy
     name: kni-common-deploy
     <<: *kni_common
     archive-artifacts: >
@@ -117,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}'
@@ -130,6 +152,26 @@
           choosing-strategy: default
           basedir: 'installer'
 
+    publishers:
+      - postbuildscript:
+          builders:
+            - role: BOTH
+              build-on:
+                - ABORTED
+                - FAILURE
+                - NOT_BUILT
+                - SUCCESS
+                - UNSTABLE
+              build-steps:
+                - kni-deploy-ship-logs
+          mark-unstable-if-failed: true
+      - workspace-cleanup:
+          exclude:
+            # Do not clean up *.jenkins-trigger files for jobs that use a
+            # properties file as input for triggering another build.
+            - "**/*.jenkins-trigger"
+          fail-build: false
+
 - job-template:
     id: kni-installer-verify-installer
     name: '{project-name}-verify-installer'
@@ -149,7 +191,7 @@
 - job-template:
     id: kni-verify-deploy-aws
     name: 'kni-{project-name}-verify-deploy-aws'
-    build-node: kni-job
+    build-node: kni-cloud
     <<: *kni_common_deploy
 
     gerrit_trigger_file_paths:
@@ -173,14 +215,40 @@
 - job-template:
     id: kni-verify-deploy-gcp
     name: 'kni-{project-name}-verify-deploy-gcp'
-    build-node: kni-job
+    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
 
     gerrit_trigger_file_paths:
       - 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/**'
 
@@ -192,14 +260,39 @@
               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
     name: 'kni-{project-name}-verify-deploy-baremetal'
     <<: *kni_common_deploy
     build-timeout: 120
-    build-node: kni-job
+    build-node: kni-baremetal
 
     gerrit_trigger_file_paths:
       - compare-type: ANT
@@ -218,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}'