Fix skip-vote by not using gerrit-trigger macro

It seems gerrit-trigger skip-vote is not overriden correctly
so this change rolls the changes made as part of [1] and instead
uses full gerrit-trigger configuration in cloud-infra-verify-engine
jjb.

[1] https://gerrit.nordix.org/#/c/1256/

Change-Id: I29e76c627a80819f86677515e8d508cc974ebdd5

diff --git a/jjb/acumos/global-templates-acumos-java.yaml b/jjb/acumos/global-templates-acumos-java.yaml
index 06408ed2556fa3cd816b305ee6d3566b74db95d0..80344fda92c493a12b59eed28742679c8c03ea63 100644 (file)
--- a/jjb/acumos/global-templates-acumos-java.yaml
+++ b/jjb/acumos/global-templates-acumos-java.yaml
@@ -43,11 +43,6 @@
           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-engine.yaml b/jjb/cloud-infra/cloud-infra-verify-engine.yaml
index c4d4fe6708d049c75c6f10ae616f10ba1c1ee80c..84908e6451060a364741e846339aa2c9b8d10f25 100644 (file)
--- a/jjb/cloud-infra/cloud-infra-verify-engine.yaml
+++ b/jjb/cloud-infra/cloud-infra-verify-engine.yaml
@@ -147,16 +147,33 @@
           refspec: $GERRIT_REFSPEC
 
     triggers:
-      - nordix-gerrit-trigger-patchset-created:
-          project: 'infra\/engine'
-          branch: '{branch}'
-          files: '**'
-          custom-url: '* $JOB_NAME $BUILD_URL'
+      - gerrit:
+          server-name: 'Nordix Gerrit'
+          trigger-on:
+            - patchset-created-event:
+                exclude-drafts: 'false'
+                exclude-trivial-rebase: 'false'
+                exclude-no-code-change: 'false'
+            - draft-published-event
+            - comment-added-contains-event:
+                comment-contains-value: 'recheck'
+            - comment-added-contains-event:
+                comment-contains-value: 'reverify'
+          projects:
+            - project-compare-type: 'REG_EXP'
+              project-pattern: 'infra\/engine'
+              branches:
+                - branch-compare-type: 'ANT'
+                  branch-pattern: '**/{branch}'
+              file-paths:
+                - compare-type: 'ANT'
+                  pattern: '**'
           skip-vote:
             successful: '{obj:successful}'
             failed: '{obj:failed}'
             unstable: '{obj:unstable}'
             notbuilt: '{obj:notbuilt}'
+          custom-url: '* $JOB_NAME $BUILD_URL'
 
     builders:
       - 'cloud-infra-determine-scenario-macro'

diff --git a/jjb/cloud-infra/cloud-infra-verify-testfw.yaml b/jjb/cloud-infra/cloud-infra-verify-testfw.yaml
index 61e93f3961a033c7da99ee7138979cb30ac909a1..e169b69ca89e068a0a3c32d8b4dae49cf3c96ff8 100644 (file)
--- a/jjb/cloud-infra/cloud-infra-verify-testfw.yaml
+++ b/jjb/cloud-infra/cloud-infra-verify-testfw.yaml
@@ -138,11 +138,6 @@
           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 544c69ca36855f87838d202156f5dc482b973118..53eab0512625370bab30e441750f819bc87c7b87 100644 (file)
--- a/jjb/global/global-templates-java.yaml
+++ b/jjb/global/global-templates-java.yaml
@@ -43,11 +43,6 @@
           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 204ef5c05a6e79c2892801df6d7427ec4150a1a2..1a2f8d2b5a0f74c9fec2d05c2fdf6e41dd333fa2 100644 (file)
--- a/jjb/global/jjb-macros.yaml
+++ b/jjb/global/jjb-macros.yaml
@@ -164,6 +164,11 @@
               file-paths:
                 - compare-type: 'ANT'
                   pattern: '{files}'
+          skip-vote:
+            successful: false
+            failed: false
+            unstable: false
+            notbuilt: false
 
 - trigger:
     name: nordix-gerrit-trigger-change-merged