xci: Introduce XCI_LOOP variable to control what to do properly

[releng.git] / jjb / xci / xci-daily-jobs.yml

diff --git a/jjb/xci/xci-daily-jobs.yml b/jjb/xci/xci-daily-jobs.yml
index f9fbc1d..64e13d3 100644 (file)
--- a/jjb/xci/xci-daily-jobs.yml
+++ b/jjb/xci/xci-daily-jobs.yml
@@ -94,8 +94,8 @@
                 - '^xci-os.*'
                 - '^xci-deploy.*'
                 - '^xci-functest.*'
-                - '^bifrost-periodic-.*'
-                - '^osa-periodic-.*'
+                - '^bifrost-.*periodic.*'
+                - '^osa-.*periodic.*'
             block-level: 'NODE'
         - logrotate-default
 
@@ -109,6 +109,9 @@
         - label:
             name: SLAVE_LABEL
             default: '{slave-label}'
+        - string:
+            name: XCI_LOOP
+            default: 'daily'
 
     triggers:
         - '{auto-trigger-name}'
@@ -125,6 +128,7 @@
               predefined-parameters: |
                 DEPLOY_SCENARIO=$DEPLOY_SCENARIO
                 XCI_FLAVOR=$XCI_FLAVOR
+                XCI_LOOP=$XCI_LOOP
               same-node: true
               block: true
         - trigger-builds:
@@ -133,6 +137,7 @@
               predefined-parameters: |
                 DEPLOY_SCENARIO=$DEPLOY_SCENARIO
                 XCI_FLAVOR=$XCI_FLAVOR
+                XCI_LOOP=$XCI_LOOP
               same-node: true
               block: true
               block-thresholds:
@@ -157,8 +162,8 @@
             blocking-jobs:
                 - '^xci-deploy.*'
                 - '^xci-functest.*'
-                - '^bifrost-periodic-.*'
-                - '^osa-periodic-.*'
+                - '^bifrost-.*periodic.*'
+                - '^osa-.*periodic.*'
             block-level: 'NODE'
         - logrotate-default
 
@@ -172,6 +177,9 @@
         - project-parameter:
             project: '{project}'
             branch: '{opnfv-releng-version}'
+        - string:
+            name: GIT_BASE
+            default: https://gerrit.opnfv.org/gerrit/$PROJECT
         - string:
             name: DEPLOY_SCENARIO
             default: 'os-nosdn-nofeature-ha'
@@ -202,6 +210,9 @@
         - string:
             name: ANSIBLE_VERBOSITY
             default: ''
+        - string:
+            name: XCI_LOOP
+            default: 'daily'
 
     builders:
         - description-setter: