X-Git-Url: https://gerrit.akraino.org/r/gitweb?p=ci-management.git;a=blobdiff_plain;f=jjb%2Fakraino-templates%2Fakraino-ta-common-templates.yaml;h=57571892620d550c3960bdccde8c4d6f49a320a7;hp=426ab1262209594e7b4ab776d9139c9d94f7eea5;hb=0aba9396c42c50960f71ba9114ff2e65e4c6b90f;hpb=9895e7fd200b0c092968fab6194345bfc9328bcb

diff --git a/jjb/akraino-templates/akraino-ta-common-templates.yaml b/jjb/akraino-templates/akraino-ta-common-templates.yaml
index 426ab12..5757189 100644
--- a/jjb/akraino-templates/akraino-ta-common-templates.yaml
+++ b/jjb/akraino-templates/akraino-ta-common-templates.yaml
@@ -18,6 +18,8 @@
     project-type: freestyle
     submodule-recursive: true
     node: '{build-node}'
+    arch: amd64
+    gerrit-skip-vote: false
 
     properties:
       - lf-infra-properties:
@@ -44,19 +46,19 @@
           jenkins-ssh-credential: '{jenkins-ssh-credential}'
 
     scm:
-      - ta-lf-infra-gerrit-scm:
+      - ta-lf-infra-gerrit-scm-{project-type}:
           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}'
-          choosing-strategy: 'gerrit'
           basedir: '$GERRIT_PROJECT'
 
     triggers:
       - ta-trigger-job-{project-type}:
           gerrit-server-name: '{gerrit-server-name}'
+          gerrit-skip-vote: '{gerrit-skip-vote}'
           project: '{project}'
           branch: '{branch}'
 
@@ -66,7 +68,8 @@
           git-url: '{git-url}'
 
     publishers:
-      - ta-publisher-job-{project-type}
+      - ta-publisher-job-{project-type}:
+          arch: '{arch}'
 
 - job-template:
     id: akraino-project-stream-type-ta-rpmbuilder
@@ -87,6 +90,7 @@
     project-type: freestyle
     submodule-recursive: true
     node: '{build-node}'
+    gerrit-skip-vote: false
 
     properties:
       - lf-infra-properties:
@@ -100,7 +104,7 @@
           branch: '{branch}'
           lftools-version: '{lftools-version}'
 
-      - ta-parameters-ci-{project-name}
+      - ta-parameters-ci-{project}
 
       - string:
           name: ARCHIVE_ARTIFACTS
@@ -126,11 +130,12 @@
     triggers:
       - ta-trigger-job-{project-type}:
           gerrit-server-name: '{gerrit-server-name}'
+          gerrit-skip-vote: '{gerrit-skip-vote}'
           project: '{project}'
           branch: '{branch}'
 
     builders:
-      - ta-builder-job-{project-type}-{project-name}:
+      - ta-builder-job-{project-type}-{project}:
           git-url: '{git-url}'
 
     publishers:
@@ -155,6 +160,7 @@
     project-type: freestyle
     submodule-recursive: true
     node: '{build-node}'
+    gerrit-skip-vote: false
 
     properties:
       - lf-infra-properties:
@@ -192,6 +198,7 @@
     triggers:
       - ta-trigger-job-{project-type}:
           gerrit-server-name: '{gerrit-server-name}'
+          gerrit-skip-vote: '{gerrit-skip-vote}'
           project: '{project}'
           branch: '{branch}'
 
@@ -203,9 +210,8 @@
       - lf-infra-publish
 
 - job-template:
-    # TODO: This is untested draft to start testing ISO build from
     id: akraino-project-release-ta-build
-    name: 'ta-ci-build'
+    name: '{name}'
     archive-artifacts: >
       work/**/*.spec
       work/**/*.repo
@@ -214,6 +220,11 @@
       work/**/*.log
       work/**/*.txt
       work/**/*.json
+      work/results/bin_checksum/**
+      work/results/repo/**
+      work/results/repo_files/**
+      work/results/rpmlists/**
+      work/results/src_repo/**
     build-days-to-keep: 30
     build-timeout: 60
     branch: master
@@ -247,12 +258,25 @@
           build-timeout: '{build-timeout}'
           jenkins-ssh-credential: '{jenkins-ssh-credential}'
 
-    # TODO: define how it should be triggered
-    # Ideally should build whenever RPM is uploaded to nexus
     triggers:
-      - timed: "@daily"
+      - gerrit:
+          server-name: '{gerrit-server-name}'
+          trigger-on:
+            - ref-updated-event
+          projects:
+            - project-compare-type: 'ANT'
+              project-pattern: 'ta/manifest'
+              branches:
+                - branch-compare-type: 'ANT'
+                  branch-pattern: '**/{branch}'
+            - project-compare-type: 'ANT'
+              project-pattern: 'ta/build-tools'
+              branches:
+                - branch-compare-type: 'ANT'
+                  branch-pattern: '**/{branch}'
 
     builders:
+      - lf-display-node-uuid
       - ta-builder-scm:
           git-url: '{git-url}'
           project: 'ta/manifest'
@@ -262,8 +286,8 @@
           project: 'ta/build-tools'
           ref: '$SCM_REFSPEC_BUILD_TOOLS'
       - ta-builder-install-docker
+      - ta-builder-install-build-tools
       - shell: |2-
-          sudo yum -y install createrepo
           ta/build-tools/build_images.sh -m ta/manifest -w work
           find work
       - ta-lf-infra-ship-isos