Move skip-vote from global macros to job templates

We want some jobs to be run in none-voting fashion such as
cloud-infra-centos while the work is going on with them.

This change moves skip-vote setting into the job templates
so we can control it per job rather than globally.

Change-Id: Ic654181fc66eafae0079e97b405a94f71a68c25e

diff --git a/jjb/acumos/global-templates-acumos-java.yaml b/jjb/acumos/global-templates-acumos-java.yaml
index 80344fda92c493a12b59eed28742679c8c03ea63..06408ed2556fa3cd816b305ee6d3566b74db95d0 100644 (file)
--- a/jjb/acumos/global-templates-acumos-java.yaml
+++ b/jjb/acumos/global-templates-acumos-java.yaml
@@ -43,6 +43,11 @@
           project: 'acumos/{project}'
           branch: '{branch}'
           files: '**'
+          skip-vote:
+            successful: false
+            failed: false
+            unstable: false
+            notbuilt: false
 
     wrappers:
       - build-timeout:

diff --git a/jjb/cloud-infra/cloud-infra-verify-testfw.yaml b/jjb/cloud-infra/cloud-infra-verify-testfw.yaml
index e169b69ca89e068a0a3c32d8b4dae49cf3c96ff8..61e93f3961a033c7da99ee7138979cb30ac909a1 100644 (file)
--- a/jjb/cloud-infra/cloud-infra-verify-testfw.yaml
+++ b/jjb/cloud-infra/cloud-infra-verify-testfw.yaml
@@ -138,6 +138,11 @@
           project: 'infra\/test'
           branch: '{branch}'
           files: '**'
+          skip-vote:
+            successful: false
+            failed: false
+            unstable: false
+            notbuilt: false
 
     builders:
       - multijob:

diff --git a/jjb/global/global-templates-java.yaml b/jjb/global/global-templates-java.yaml
index 53eab0512625370bab30e441750f819bc87c7b87..544c69ca36855f87838d202156f5dc482b973118 100644 (file)
--- a/jjb/global/global-templates-java.yaml
+++ b/jjb/global/global-templates-java.yaml
@@ -43,6 +43,11 @@
           project: '{project}'
           branch: '{branch}'
           files: '**'
+          skip-vote:
+            successful: false
+            failed: false
+            unstable: false
+            notbuilt: false
 
     wrappers:
       - build-timeout:

diff --git a/jjb/global/jjb-macros.yaml b/jjb/global/jjb-macros.yaml
index b96a205b0fbbf082b06da1588095161cda20b28a..19a92ad2d1db727524e0499c42a288a0ebafd6a1 100644 (file)
--- a/jjb/global/jjb-macros.yaml
+++ b/jjb/global/jjb-macros.yaml
@@ -148,11 +148,6 @@
               file-paths:
                 - compare-type: 'ANT'
                   pattern: '{files}'
-          skip-vote:
-            successful: false
-            failed: false
-            unstable: false
-            notbuilt: false
 
 - trigger:
     name: nordix-gerrit-trigger-change-merged

diff --git a/jjb/infra/jjb-verify-jobs.yaml b/jjb/infra/jjb-verify-jobs.yaml
index 2d2a3605c8ef152f4d96576755bde0faef1b3e67..28eca152613dbb2af26e92793c3019f4c69ad56a 100644 (file)
--- a/jjb/infra/jjb-verify-jobs.yaml
+++ b/jjb/infra/jjb-verify-jobs.yaml
@@ -43,6 +43,11 @@
           project: '{project}'
           branch: '{branch}'
           files: 'jjb/**'
+          skip-vote:
+            successful: false
+            failed: false
+            unstable: false
+            notbuilt: false
 
     wrappers:
       - nordixinfra-jjb-creds-wrapper