X-Git-Url: https://gerrit.akraino.org/r/gitweb?a=blobdiff_plain;f=jjb%2Fakraino-templates%2Fakraino-ta-common-templates.yaml;h=ca09e1a76e8e6a500790075549f1f41739c392fc;hb=8c467e1302f734f3ba751e490d1000f490f234f9;hp=2484ccbcfa59ef9da71a10c6f754a8f454ca851f;hpb=a2ad6866adcc88915fbef21e9320f6b27db9371f;p=ci-management.git

diff --git a/jjb/akraino-templates/akraino-ta-common-templates.yaml b/jjb/akraino-templates/akraino-ta-common-templates.yaml
index 2484ccb..ca09e1a 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:
@@ -57,6 +59,7 @@
     triggers:
       - ta-trigger-job-{project-type}:
           gerrit-server-name: '{gerrit-server-name}'
+          gerrit-skip-vote: '{gerrit-skip-vote}'
           project: '{project}'
           branch: '{branch}'
 
@@ -66,7 +69,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 +91,7 @@
     project-type: freestyle
     submodule-recursive: true
     node: '{build-node}'
+    gerrit-skip-vote: false
 
     properties:
       - lf-infra-properties:
@@ -100,7 +105,7 @@
           branch: '{branch}'
           lftools-version: '{lftools-version}'
 
-      - ta-parameters-ci-{project-name}
+      - ta-parameters-ci-{project}
 
       - string:
           name: ARCHIVE_ARTIFACTS
@@ -126,11 +131,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 +161,7 @@
     project-type: freestyle
     submodule-recursive: true
     node: '{build-node}'
+    gerrit-skip-vote: false
 
     properties:
       - lf-infra-properties:
@@ -192,6 +199,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 +211,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 +221,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 +259,8 @@
           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"
-
     builders:
+      - lf-display-node-uuid
       - ta-builder-scm:
           git-url: '{git-url}'
           project: 'ta/manifest'