X-Git-Url: https://gerrit.linuxfoundation.org/infra/gitweb?a=blobdiff_plain;f=jjb%2Flf-ci-jobs.yaml;h=74eaee0c4baa364c0989da846bedd02aae2a6aec;hb=724167b0fc12efba132bed0033ef1d98d68d940f;hp=6a3b6b12112be6a420b938f64dbc7827917c37b3;hpb=851b0b6d0cfe84e986548fd596a9b2f18413fefd;p=releng%2Fglobal-jjb.git

diff --git a/jjb/lf-ci-jobs.yaml b/jjb/lf-ci-jobs.yaml
index 6a3b6b12..74eaee0c 100644
--- a/jjb/lf-ci-jobs.yaml
+++ b/jjb/lf-ci-jobs.yaml
@@ -31,6 +31,24 @@
       - compare-type: ANT
         pattern: '**/*.yaml'
 
+- lf_jjb_merge_builders: &lf_jjb_merge_builders
+    name: lf-jjb-merge-builders
+    builders:
+      - lf-infra-jjbini
+      - shell: !include-raw-escape:
+          - ../shell/jjb-install.sh
+          - ../shell/jjb-merge-job.sh
+
+- lf_jjb_verify_builders: &lf_jjb_verify_builders
+    name: lf-jjb-verfy-builders
+    builders:
+      - lf-infra-jjbini
+      - shell: !include-raw-escape:
+          - ../shell/jjb-install.sh
+          - ../shell/jjb-verify-job.sh
+          - ../shell/jjb-check-unicode.sh
+      - gpg-verify-git-signature
+
 - parameter:
     name: lf-infra-jjb-parameters
     parameters:
@@ -43,8 +61,10 @@
 # Job Templates #
 #################
 
-- job-template:
-    name: '{project-name}-jjb-merge'
+# JJB verify and merge jobs are the same except for their scm, trigger, and
+# builders definition. This anchor is the common template
+- lf_jjb_verify_merge: &lf_jjb_verify_merge
+    name: lf-jjb-verify-merge
     project-type: freestyle
 
     node: '{build-node}'
@@ -72,6 +92,20 @@
       - lf-infra-jjb-parameters:
           jjb-version: '{jjb-version}'
 
+    wrappers:
+      - lf-infra-wrappers:
+          build-timeout: 10
+          jenkins-ssh-credential: '{jenkins-ssh-credential}'
+
+    publishers:
+      - lf-infra-publish
+
+- job-template:
+    name: '{project-name}-jjb-merge'
+    <<: *lf_jjb_verify_merge
+    # yamllint disable-line rule:key-duplicates
+    <<: *lf_jjb_merge_builders
+
     scm:
       - lf-infra-gerrit-scm:
           jenkins-ssh-credential: '{jenkins-ssh-credential}'
@@ -80,18 +114,13 @@
           submodule-recursive: '{submodule-recursive}'
           choosing-strategy: default
 
-    wrappers:
-      - lf-infra-wrappers:
-          build-timeout: 10
-          jenkins-ssh-credential: '{jenkins-ssh-credential}'
-
     triggers:
       - gerrit:
           server-name: '{gerrit-server-name}'
           trigger-on:
             - change-merged-event
             - comment-added-contains-event:
-                comment-contains-value: ^remerge$
+                comment-contains-value: remerge$
           projects:
             - project-compare-type: ANT
               project-pattern: '{project}'
@@ -100,44 +129,12 @@
                   branch-pattern: '**/{branch}'
               <<: *lf_jjb_file_paths
 
-    builders:
-      - lf-infra-jjbini
-      - shell: !include-raw-escape:
-          - ../shell/jjb-install.sh
-          - ../shell/jjb-merge-job.sh
-
-    publishers:
-      - lf-infra-publish
-
 - job-template:
     name: '{project-name}-jjb-verify'
-    project-type: freestyle
-
-    node: '{build-node}'
     concurrent: true
-
-    ######################
-    # Default parameters #
-    ######################
-
-    branch: master
-    submodule-recursive: true
-
-    #####################
-    # Job Configuration #
-    #####################
-
-    properties:
-      - lf-infra-properties:
-          project: '{project}'
-          build-days-to-keep: 7
-
-    parameters:
-      - lf-infra-parameters:
-          project: '{project}'
-          branch: '{branch}'
-      - lf-infra-jjb-parameters:
-          jjb-version: '{jjb-version}'
+    <<: *lf_jjb_verify_merge
+    # yamllint disable-line rule:key-duplicates
+    <<: *lf_jjb_verify_builders
 
     scm:
       - lf-infra-gerrit-scm:
@@ -147,11 +144,6 @@
           choosing-strategy: gerrit
           jenkins-ssh-credential: '{jenkins-ssh-credential}'
 
-    wrappers:
-      - lf-infra-wrappers:
-          build-timeout: 10
-          jenkins-ssh-credential: '{jenkins-ssh-credential}'
-
     triggers:
       - gerrit:
           server-name: '{gerrit-server-name}'
@@ -162,7 +154,7 @@
                 exclude-no-code-change: false
             - draft-published-event
             - comment-added-contains-event:
-                comment-contains-value: ^recheck$
+                comment-contains-value: recheck$
           projects:
             - project-compare-type: ANT
               project-pattern: '{project}'
@@ -170,14 +162,3 @@
                 - branch-compare-type: ANT
                   branch-pattern: '**/{branch}'
               <<: *lf_jjb_file_paths
-
-    builders:
-      - lf-infra-jjbini
-      - shell: !include-raw-escape:
-          - ../shell/jjb-install.sh
-          - ../shell/jjb-verify-job.sh
-          - ../shell/jjb-check-unicode.sh
-      - gpg-verify-git-signature
-
-    publishers:
-      - lf-infra-publish