X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Ffuel%2Ffuel-daily-jobs.yaml;h=57ed85fccd04a956d409cd837fe40f70ae8dca09;hb=ec61d0dfae55acda30a431f680937018030e5c17;hp=936187ccb90545aca01f4afc402a940dd7661627;hpb=726b96c6746aba86c253a5505561a4d96426115f;p=releng.git

diff --git a/jjb/fuel/fuel-daily-jobs.yaml b/jjb/fuel/fuel-daily-jobs.yaml
index 936187ccb..57ed85fcc 100644
--- a/jjb/fuel/fuel-daily-jobs.yaml
+++ b/jjb/fuel/fuel-daily-jobs.yaml
@@ -16,16 +16,19 @@
       branch: '{stream}'
       disabled: false
       gs-pathname: ''
+      functest_docker_tag: hunter
     fraser: &fraser
       stream: fraser
       branch: 'stable/{stream}'
       disabled: false
       gs-pathname: '/{stream}'
+      functest_docker_tag: '{stream}'
     gambia: &gambia
       stream: gambia
       branch: 'stable/{stream}'
       disabled: false
       gs-pathname: '/{stream}'
+      functest_docker_tag: '{stream}'
     # -------------------------------
     # POD, INSTALLER, AND BRANCH MAPPING
     # -------------------------------
@@ -75,6 +78,8 @@
           auto-trigger-name: 'fuel-{scenario}-{pod}-daily-{stream}-trigger'
       - 'os-odl-sfc-noha':
           auto-trigger-name: 'fuel-{scenario}-{pod}-daily-{stream}-trigger'
+      - 'os-odl-bgpvpn-noha':
+          auto-trigger-name: 'fuel-{scenario}-{pod}-daily-{stream}-trigger'
       - 'os-ovn-nofeature-noha':
           auto-trigger-name: 'fuel-{scenario}-{pod}-daily-{stream}-trigger'
       - 'os-odl-ovs-noha':
@@ -92,6 +97,8 @@
         stream: fraser
       - scenario: os-odl-sfc-noha
         stream: fraser
+      - scenario: os-odl-bgpvpn-noha
+        stream: fraser
       - scenario: os-odl-ovs-noha
         stream: fraser
       - scenario: os-ovn-nofeature-noha
@@ -175,6 +182,7 @@
                   current-parameters: false
                   predefined-parameters:
                     DEPLOY_SCENARIO={scenario}
+                    DOCKER_TAG={functest_docker_tag}
                   same-node: true
                   block: true
                   block-thresholds:
@@ -202,7 +210,7 @@
       # 1.here the stream means the SUT stream, dovetail stream is defined in its own job
       # 2.testsuite default here is for the test cases already added into OVP
       # 3.run default testsuite mandatory test cases against ha scenario
-      # 4.run default testsuite optional test cases against ha scenario
+      # 4.run default testsuite optional test cases against ha scenario twice one week
       # 5.not used for release criteria or compliance, only to debug the dovetail tool bugs
       - conditional-step:
           condition-kind: and
@@ -210,9 +218,6 @@
             - condition-kind: regex-match
               regex: '.*-ha'
               label: '{scenario}'
-            - condition-kind: regex-match
-              regex: 'fraser'
-              label: '{stream}'
           steps:
             - trigger-builds:
                 - project: 'dovetail-fuel-{pod}-default-mandatory-{stream}'
@@ -231,9 +236,12 @@
             - condition-kind: regex-match
               regex: '.*-ha'
               label: '{scenario}'
-            - condition-kind: regex-match
-              regex: 'fraser'
-              label: '{stream}'
+            - condition-kind: day-of-week
+              day-selector: select-days
+              days:
+                MON: true
+                WED: true
+              use-build-time: true
           steps:
             - trigger-builds:
                 - project: 'dovetail-fuel-{pod}-default-optional-{stream}'
@@ -393,6 +401,10 @@
     name: 'fuel-os-odl-sfc-noha-baremetal-daily-master-trigger'
     triggers:
       - timed: ''
+- trigger:
+    name: 'fuel-os-odl-bgpvpn-noha-baremetal-daily-master-trigger'
+    triggers:
+      - timed: ''
 - trigger:
     name: 'fuel-os-ovn-nofeature-noha-baremetal-daily-master-trigger'
     triggers:
@@ -446,6 +458,10 @@
     name: 'fuel-os-odl-sfc-noha-baremetal-daily-gambia-trigger'
     triggers:
       - timed: ''
+- trigger:
+    name: 'fuel-os-odl-bgpvpn-noha-baremetal-daily-gambia-trigger'
+    triggers:
+      - timed: ''
 - trigger:
     name: 'fuel-os-ovn-nofeature-noha-baremetal-daily-gambia-trigger'
     triggers:
@@ -498,6 +514,10 @@
     name: 'fuel-os-odl-sfc-noha-virtual-daily-master-trigger'
     triggers:
       - timed: '5 4 * * *'
+- trigger:
+    name: 'fuel-os-odl-bgpvpn-noha-virtual-daily-master-trigger'
+    triggers:
+      - timed: '5 6 * * *'
 - trigger:
     name: 'fuel-os-ovn-nofeature-noha-virtual-daily-master-trigger'
     triggers:
@@ -565,6 +585,10 @@
     name: 'fuel-os-odl-sfc-noha-virtual-daily-gambia-trigger'
     triggers:
       - timed: '0 4 * * *'
+- trigger:
+    name: 'fuel-os-odl-bgpvpn-noha-virtual-daily-gambia-trigger'
+    triggers:
+      - timed: '0 7 * * *'
 - trigger:
     name: 'fuel-os-ovn-nofeature-noha-virtual-daily-gambia-trigger'
     triggers:
@@ -617,6 +641,10 @@
     name: 'fuel-os-odl-sfc-noha-zte-pod1-daily-master-trigger'
     triggers:
       - timed: ''
+- trigger:
+    name: 'fuel-os-odl-bgpvpn-noha-zte-pod1-daily-master-trigger'
+    triggers:
+      - timed: ''
 - trigger:
     name: 'fuel-os-ovn-nofeature-noha-zte-pod1-daily-master-trigger'
     triggers: