X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Fauto%2Fauto.yaml;h=ccf723f01ca9ed20e5345757478d122a5d40a09d;hb=17599a1f9597b676bc2536de08a1ce091ee34e7d;hp=5c2af043ca493094273cf28af4ea74426d835d51;hpb=2a32f9cd7a843c6af8486f49a9d5833e5b6726c2;p=releng.git

diff --git a/jjb/auto/auto.yaml b/jjb/auto/auto.yaml
index 5c2af043c..ccf723f01 100644
--- a/jjb/auto/auto.yaml
+++ b/jjb/auto/auto.yaml
@@ -7,16 +7,19 @@
     # -------------------------------
     # BRANCH ANCHORS
     # -------------------------------
-    master: &master
-      stream: master
-      branch: '{stream}'
-      gs-pathname: ''
-      disabled: false
-    fraser: &fraser
-      stream: fraser
-      branch: 'stable/{stream}'
-      gs-pathname: '/{stream}'
-      disabled: false
+    stream:
+      - master:
+          branch: '{stream}'
+          gs-pathname: ''
+          disabled: false
+      - gambia:
+          branch: 'stable/{stream}'
+          gs-pathname: '/{stream}'
+          disabled: false
+      - fraser:
+          branch: 'stable/{stream}'
+          gs-pathname: '/{stream}'
+          disabled: false
     # -------------------------------
     # DEPLOY TYPE ANCHORS
     # -------------------------------
@@ -28,20 +31,9 @@
     # -------------------------------
     # CI POD's
     # -------------------------------
-    #        fraser
-    # -------------------------------
     pod:
-      # yamllint disable rule:key-duplicates
-      - auto-baremetal:
-          <<: *baremetal
-          <<: *fraser
-      # -------------------------------
-      #        master
-      # -------------------------------
       - auto-baremetal:
           <<: *baremetal
-          <<: *master
-    # yamllint enable rule:key-duplicates
     # -------------------------------
     #       scenarios
     # -------------------------------
@@ -53,7 +45,9 @@
     jobs:
       - '{installer}-{scenario}-{pod}-auto-daily-{stream}'
       - '{installer}-deploy-{pod}-daily-{stream}'
-      - '{project}-verify-basic'
+      - 'auto-daily-{stream}'
+      - 'auto-verify-{stream}'
+      - 'auto-merge-{stream}'
 
 ########################
 # job templates
@@ -76,7 +70,7 @@
           use-build-blocker: true
           blocking-jobs:
             - '{installer}-os-.*?-{pod}-auto-daily-.*'
-          block-level: 'NODE'
+          blocking-level: 'NODE'
 
     wrappers:
       - build-name:
@@ -96,20 +90,136 @@
       - string:
           name: DEPLOY_SCENARIO
           default: '{scenario}'
-      - string:
-          name: PROJECT
-          default: '{project}'
 
     builders:
       - trigger-builds:
           - project: '{installer}-deploy-{pod}-daily-{stream}'
             current-parameters: false
-            predefined-parameters:
-              DEPLOY_SCENARIO='os-nosdn-nofeature-ha'
-              PROJECT='armband'
+            predefined-parameters: |
+              DEPLOY_SCENARIO=os-nosdn-nofeature-ha
+              PROJECT=armband
             same-node: true
             block: true
 
+- job-template:
+    name: 'auto-daily-{stream}'
+
+    disabled: '{obj:disabled}'
+
+    properties:
+      - logrotate-default
+      - build-blocker:
+          use-build-blocker: true
+          blocking-jobs:
+            - 'auto-daily-.*'
+          blocking-level: 'NODE'
+
+    parameters:
+      - project-parameter:
+          project: '{project}'
+          branch: '{branch}'
+      - 'intel-pod18-defaults'
+
+    triggers:
+      - timed: '0 16 * * *'
+
+    builders:
+      - shell: |
+          pwd
+          ./ci/build-auto.sh daily
+
+- job-template:
+    name: 'auto-verify-{stream}'
+
+    disabled: '{obj:disabled}'
+
+    project-type: freestyle
+
+    concurrent: true
+
+    properties:
+      - logrotate-default
+
+    parameters:
+      - project-parameter:
+          project: '{project}'
+          branch: '{branch}'
+      - 'opnfv-build-ubuntu-defaults'
+
+    scm:
+      - git-scm-gerrit
+
+    triggers:
+      - gerrit:
+          server-name: 'gerrit.opnfv.org'
+          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: 'ANT'
+              project-pattern: '{project}'
+              branches:
+                - branch-compare-type: 'ANT'
+                  branch-pattern: '**/{branch}'
+              forbidden-file-paths:
+                - compare-type: ANT
+                  pattern: 'docs/**'
+
+    builders:
+      - shell: |
+          pwd
+          ./ci/build-auto.sh verify
+
+- job-template:
+    name: 'auto-merge-{stream}'
+
+    disabled: '{obj:disabled}'
+
+    project-type: freestyle
+
+    concurrent: true
+
+    properties:
+      - logrotate-default
+
+    parameters:
+      - project-parameter:
+          project: '{project}'
+          branch: '{branch}'
+      - 'opnfv-build-ubuntu-defaults'
+
+    scm:
+      - git-scm
+
+    triggers:
+      - gerrit:
+          server-name: 'gerrit.opnfv.org'
+          trigger-on:
+            - change-merged-event
+            - comment-added-contains-event:
+                comment-contains-value: 'remerge'
+          projects:
+            - project-compare-type: 'ANT'
+              project-pattern: '{project}'
+              branches:
+                - branch-compare-type: 'ANT'
+                  branch-pattern: '**/{branch}'
+              forbidden-file-paths:
+                - compare-type: ANT
+                  pattern: 'docs/**'
+
+    builders:
+      - shell: |
+          pwd
+          ./ci/build-auto.sh merge
+
 ########################
 # trigger macros
 ########################
@@ -120,7 +230,7 @@
 - trigger:
     name: 'fuel-os-nosdn-onap-ha-auto-baremetal-master-trigger'
     triggers:
-      - timed: '0 1 * * *'
+      - timed: ''
 # ---------------------------------------------------------------------
 # Auto CI Baremetal Triggers running against fraser branch
 # ---------------------------------------------------------------------
@@ -128,3 +238,10 @@
     name: 'fuel-os-nosdn-onap-ha-auto-baremetal-fraser-trigger'
     triggers:
       - timed: ''
+# ---------------------------------------------------------------------
+# Auto CI Baremetal Triggers running against gambia branch
+# ---------------------------------------------------------------------
+- trigger:
+    name: 'fuel-os-nosdn-onap-ha-auto-baremetal-gambia-trigger'
+    triggers:
+      - timed: ''