From: Fatih Degirmenci <fdegir@gmail.com>
Date: Tue, 21 May 2019 12:29:55 +0000 (+0200)
Subject: Move skip-vote from global macros to job templates
X-Git-Url: https://gerrit.nordix.org/gitweb?a=commitdiff_plain;h=refs%2Fchanges%2F56%2F1256%2F1;p=infra%2Fcicd.git

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 80344fda..06408ed2 100644
--- 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 e169b69c..61e93f39 100644
--- 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 53eab051..544c69ca 100644
--- 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 b96a205b..19a92ad2 100644
--- 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 2d2a3605..28eca152 100644
--- 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