Change installer/binary jobs from merge to verify

The value of these jobs is to launch a brief test each time
a patch lands, they do not provide any value on merge. So changing
the naming and the behaviour to achieve that.

Signed-off-by: Yolanda Robla <yroblamo@redhat.com>
Change-Id: I4c2f42ecdac9abdb9c3696ce62d870f632529293

diff --git a/jjb/akraino-templates/akraino-jjb-kni.yaml b/jjb/akraino-templates/akraino-jjb-kni.yaml
index 31429fb..8c28d8b 100644 (file)
--- a/jjb/akraino-templates/akraino-jjb-kni.yaml
+++ b/jjb/akraino-templates/akraino-jjb-kni.yaml
@@ -15,8 +15,8 @@
 # limitations under the License.
 #
 - job-template:
 # limitations under the License.
 #
 - job-template:

-    id: kni-installer-build-installer
-    name: '{project-name}-build-installer'
+    id: kni-installer-verify-installer
+    name: '{project-name}-verify-installer'

 
     ######################
     # Default parameters #
 
     ######################
     # Default parameters #


@@ -50,11 +50,6 @@
           build-timeout: '{build-timeout}'
           jenkins-ssh-credential: '{jenkins-ssh-credential}'
 
           build-timeout: '{build-timeout}'
           jenkins-ssh-credential: '{jenkins-ssh-credential}'
 

-    gerrit_merge_triggers:
-      - change-merged-event
-      - comment-added-contains-event:
-          comment-contains-value: remerge$
-

     gerrit_trigger_file_paths:
       - compare-type: ANT
         pattern: '**'
     gerrit_trigger_file_paths:
       - compare-type: ANT
         pattern: '**'


@@ -69,10 +64,19 @@
           submodule-timeout: '{submodule-timeout}'
           choosing-strategy: default
 
           submodule-timeout: '{submodule-timeout}'
           choosing-strategy: default
 

+    gerrit_verify_triggers:
+      - patchset-created-event:
+          exclude-drafts: true
+          exclude-trivial-rebase: false
+          exclude-no-code-change: false
+      - draft-published-event
+      - comment-added-contains-event:
+          comment-contains-value: '^Patch Set[ ]+[0-9]+:([ ]+|[\n]+)(recheck|reverify)$'
+

     triggers:
       - gerrit:
           server-name: '{gerrit-server-name}'
     triggers:
       - gerrit:
           server-name: '{gerrit-server-name}'

-          trigger-on: '{obj:gerrit_merge_triggers}'
+          trigger-on: '{obj:gerrit_verify_triggers}'

           projects:
             - project-compare-type: ANT
               project-pattern: '{project}'
           projects:
             - project-compare-type: ANT
               project-pattern: '{project}'


@@ -92,8 +96,8 @@
       - lf-infra-publish
 
 - job-template:
       - lf-infra-publish
 
 - job-template:

-    id: kni-installer-build-binary
-    name: '{project-name}-build-binary'
+    id: kni-installer-verify-binary
+    name: '{project-name}-verify-binary'

 
     ######################
     # Default parameters #
 
     ######################
     # Default parameters #


@@ -127,17 +131,21 @@
           build-timeout: '{build-timeout}'
           jenkins-ssh-credential: '{jenkins-ssh-credential}'
 
           build-timeout: '{build-timeout}'
           jenkins-ssh-credential: '{jenkins-ssh-credential}'
 

-    gerrit_merge_triggers:
-      - change-merged-event
-      - comment-added-contains-event:
-          comment-contains-value: remerge$
-

     gerrit_trigger_file_paths:
       - compare-type: REG_EXP
         pattern: 'Makefile'
       - compare-type: REG_EXP
         pattern: 'cmd/binary.go'
 
     gerrit_trigger_file_paths:
       - compare-type: REG_EXP
         pattern: 'Makefile'
       - compare-type: REG_EXP
         pattern: 'cmd/binary.go'
 

+    gerrit_verify_triggers:
+      - patchset-created-event:
+          execlude-drafts: true
+          exclude-trivial-rebase: false
+          exclude-no-code-change: false
+      - draft-published-event
+      - comment-added-contains-event:
+          comment-contains-value: '^Patch Set[ ]+[0-9]+:([ ]+|[\n]+)(recheck|reverify)$'
+

     scm:
       - lf-infra-gerrit-scm:
           jenkins-ssh-credential: '{jenkins-ssh-credential}'
     scm:
       - lf-infra-gerrit-scm:
           jenkins-ssh-credential: '{jenkins-ssh-credential}'


@@ -151,16 +159,14 @@
     triggers:
       - gerrit:
           server-name: '{gerrit-server-name}'
     triggers:
       - gerrit:
           server-name: '{gerrit-server-name}'

-          trigger-on:
-            - patchset-created-event:
-                exclude-drafts: 'false'
-                exclude-trivial-rebase: 'false'
-                exclude-no-code-change: 'false'
-            - change-merged-event
-            - comment-added-contains-event:
-                comment-contains-value: 'recheck'
-            - comment-added-contains-event:
-                comment-contains-value: 'reverify'
+          trigger-on: '{obj:gerrit_verify_triggers}'
+          projects:
+            - project-compare-type: ANT
+              project-pattern: '{project}'
+              branches:
+                - branch-compare-type: ANT
+                  branch-pattern: '**/{branch}'
+              file-paths: '{obj:gerrit_trigger_file_paths}'

 
     builders:
       - lf-infra-pre-build
 
     builders:
       - lf-infra-pre-build


@@ -169,6 +175,9 @@
       - shell: !include-raw-escape:
           - ../shell/build_kni_binary.sh
 
       - shell: !include-raw-escape:
           - ../shell/build_kni_binary.sh
 

+    publishers:
+      - lf-infra-publish
+

 - job-template:
     id: kni-installer-merge-deploy-aws
     name: '{project-name}-merge-deploy-aws'
 - job-template:
     id: kni-installer-merge-deploy-aws
     name: '{project-name}-merge-deploy-aws'

diff --git a/jjb/kni/kni_installer.yaml b/jjb/kni/kni_installer.yaml
index 90dfca1..8a0e7ba 100644 (file)
--- a/jjb/kni/kni_installer.yaml
+++ b/jjb/kni/kni_installer.yaml
@@ -6,8 +6,8 @@
     stream: master
     branch: master
     jobs:
     stream: master
     branch: master
     jobs:

-      - kni-installer-build-installer
-      - kni-installer-build-binary
+      - kni-installer-verify-installer
+      - kni-installer-verify-binary

       - kni-installer-merge-deploy-aws
 - project:
     name: kni-templates
       - kni-installer-merge-deploy-aws
 - project:
     name: kni-templates