X-Git-Url: https://gerrit.akraino.org/r/gitweb?a=blobdiff_plain;f=jjb%2Fakraino-templates%2Fakraino-jjb-kni.yaml;h=1e48683fefcbcbd1433e0f4c301ea6fdeeda92a5;hb=2f1f312557bb1396df3a2430b4841c7210d6b8b2;hp=f4285e4be92532b1cd6afd150a10158668123ec3;hpb=37ee9b6ad5c3bc8d38a05149299f201f8f89d1b8;p=ci-management.git

diff --git a/jjb/akraino-templates/akraino-jjb-kni.yaml b/jjb/akraino-templates/akraino-jjb-kni.yaml
index f4285e4..1e48683 100644
--- a/jjb/akraino-templates/akraino-jjb-kni.yaml
+++ b/jjb/akraino-templates/akraino-jjb-kni.yaml
@@ -14,6 +14,28 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
+
+# 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
 
@@ -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'
@@ -146,41 +188,10 @@
       - shell: !include-raw-escape:
           - ../shell/build_kni_installer.sh
 
-- job-template:
-    id: kni-installer-verify-binary
-    name: '{project-name}-verify-binary'
-    <<: *kni_common
-    build-node: centos7-builder-8c-8g
-
-    gerrit_trigger_file_paths:
-      - compare-type: ANT
-        pattern: 'Makefile'
-      - compare-type: ANT
-        pattern: 'cmd/binary.go'
-
-    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
-      - shell: !include-raw-escape:
-          - ../shell/install_go.sh
-      - shell: !include-raw-escape:
-          - ../shell/build_kni_binary.sh
-
 - job-template:
     id: kni-verify-deploy-aws
     name: 'kni-{project-name}-verify-deploy-aws'
-    build-node: kni-libvirt
+    build-node: kni-cloud
     <<: *kni_common_deploy
 
     gerrit_trigger_file_paths:
@@ -204,7 +215,7 @@
 - job-template:
     id: kni-verify-deploy-gcp
     name: 'kni-{project-name}-verify-deploy-gcp'
-    build-node: kni-libvirt
+    build-node: kni-cloud
     <<: *kni_common_deploy
 
     gerrit_trigger_file_paths:
@@ -230,7 +241,7 @@
     name: 'kni-{project-name}-verify-deploy-baremetal'
     <<: *kni_common_deploy
     build-timeout: 120
-    build-node: kni-libvirt
+    build-node: kni-baremetal
 
     gerrit_trigger_file_paths:
       - compare-type: ANT
@@ -243,7 +254,7 @@
     scm:
       - akraino-lf-infra-gerrit-scm:
           jenkins-ssh-credential: '{jenkins-ssh-credential}'
-          git-url: 'https://github.com/akraino-edge-stack/kni-blueprint-pae'
+          git-url: 'https://gerrit.akraino.org/r/kni/blueprint-pae'
           refspec: '$GERRIT_REFSPEC'
           branch: '$GERRIT_BRANCH'
           submodule-recursive: '{submodule-recursive}'