X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Fjoid%2Fjoid-daily-jobs.yml;h=13ea9b308424cb55b3e030374402e4375e4e8dd5;hb=69331f6c49393aa501d3ee1982870edd97d8e63f;hp=93cad0f0cf428238c77b236a421698c8418f223a;hpb=f1fea787e41f4d9fdbdc6730671e561bcca28684;p=releng.git

diff --git a/jjb/joid/joid-daily-jobs.yml b/jjb/joid/joid-daily-jobs.yml
index 93cad0f0c..13ea9b308 100644
--- a/jjb/joid/joid-daily-jobs.yml
+++ b/jjb/joid/joid-daily-jobs.yml
@@ -20,7 +20,7 @@
     danube: &danube
         stream: danube
         branch: 'stable/{stream}'
-        disabled: true
+        disabled: false
         gs-pathname: '/{stream}'
 #--------------------------------
 # POD, INSTALLER, AND BRANCH MAPPING
@@ -64,13 +64,13 @@
         - 'os-odl_l2-nofeature-ha':
             auto-trigger-name: 'joid-{scenario}-{pod}-{stream}-trigger'
         - 'os-onos-nofeature-ha':
-            auto-trigger-name: 'joid-{scenario}-{pod}-{stream}-trigger'
+            auto-trigger-name: 'daily-trigger-disabled'
         - 'os-odl_l2-nofeature-noha':
             auto-trigger-name: 'daily-trigger-disabled'
         - 'os-onos-nofeature-noha':
             auto-trigger-name: 'daily-trigger-disabled'
         - 'os-onos-sfc-ha':
-            auto-trigger-name: 'joid-{scenario}-{pod}-{stream}-trigger'
+            auto-trigger-name: 'daily-trigger-disabled'
         - 'os-ocl-nofeature-ha':
             auto-trigger-name: 'daily-trigger-disabled'
         - 'os-ocl-nofeature-noha':
@@ -78,7 +78,7 @@
         - 'k8-nosdn-nofeature-noha':
             auto-trigger-name: 'joid-{scenario}-{pod}-{stream}-trigger'
         - 'k8-nosdn-lb-noha':
-            auto-trigger-name: 'daily-trigger-disabled'
+            auto-trigger-name: 'joid-{scenario}-{pod}-{stream}-trigger'
 
     jobs:
         - 'joid-{scenario}-{pod}-daily-{stream}'
@@ -163,17 +163,17 @@
         #   i.e. one tempest smoke ipv6, two vping from functest)
         # 4.not used for release criteria or compliance,
         #   only to debug the dovetail tool bugs with joid
-        - trigger-builds:
-            - project: 'dovetail-joid-{pod}-debug-{stream}'
-              current-parameters: false
-              predefined-parameters:
-                DEPLOY_SCENARIO={scenario}
-              block: true
-              same-node: true
-              block-thresholds:
-                build-step-failure-threshold: 'never'
-                failure-threshold: 'never'
-                unstable-threshold: 'FAILURE'
+        #- trigger-builds:
+        #    - project: 'dovetail-joid-{pod}-proposed_tests-{stream}'
+        #      current-parameters: false
+        #      predefined-parameters:
+        #        DEPLOY_SCENARIO={scenario}
+        #      block: true
+        #      same-node: true
+        #      block-thresholds:
+        #        build-step-failure-threshold: 'never'
+        #        failure-threshold: 'never'
+        #        unstable-threshold: 'FAILURE'
 
 - job-template:
     name: 'joid-deploy-{pod}-daily-{stream}'