X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Ffuel%2Ffuel-daily-jobs.yaml;h=73d33d63b3582e918e4a81020e66b160d3466143;hb=c04f88ca91b7612c70bcae9c8a70a98d5bd46c6e;hp=4bc813cf15232a22914411bea75c3c58d0f73cd2;hpb=83f55993f33da0a7e9be4a28104d20546fefcde8;p=releng.git

diff --git a/jjb/fuel/fuel-daily-jobs.yaml b/jjb/fuel/fuel-daily-jobs.yaml
index 4bc813cf1..73d33d63b 100644
--- a/jjb/fuel/fuel-daily-jobs.yaml
+++ b/jjb/fuel/fuel-daily-jobs.yaml
@@ -21,11 +21,6 @@
       branch: 'stable/{stream}'
       disabled: false
       gs-pathname: '/{stream}'
-    danube: &danube
-      stream: danube
-      branch: 'stable/{stream}'
-      disabled: false
-      gs-pathname: '/{stream}'
     # -------------------------------
     # POD, INSTALLER, AND BRANCH MAPPING
     # -------------------------------
@@ -78,29 +73,14 @@
           auto-trigger-name: 'fuel-{scenario}-{pod}-daily-{stream}-trigger'
       - 'os-nosdn-vpp-noha':
           auto-trigger-name: 'fuel-{scenario}-{pod}-daily-{stream}-trigger'
-      # danube scenario for Dovetail only
-      - 'os-odl_l2-bgpvpn-ha':
-          auto-trigger-name: 'fuel-{scenario}-{pod}-daily-{stream}-trigger'
 
     exclude:
-      - scenario: os-odl_l2-bgpvpn-ha
-        stream: master
-      - scenario: os-odl_l2-bgpvpn-ha
-        stream: fraser
-      - scenario: os-ovn-nofeature-noha
-        stream: danube
-      - scenario: os-ovn-nofeature-ha
-        stream: danube
       - scenario: os-odl-ovs-noha
         stream: fraser
       - scenario: os-nosdn-vpp-ha
         stream: fraser
       - scenario: os-nosdn-vpp-noha
         stream: fraser
-      - scenario: os-nosdn-vpp-ha
-        stream: danube
-      - scenario: os-nosdn-vpp-noha
-        stream: danube
 
     jobs:
       - 'fuel-{scenario}-{pod}-daily-{stream}'
@@ -223,24 +203,17 @@
                     build-step-failure-threshold: 'never'
                     failure-threshold: 'never'
                     unstable-threshold: 'FAILURE'
-      - conditional-step:
-          condition-kind: not
-          condition-operand:
-            condition-kind: regex-match
-            regex: 'danube'
-            label: '{stream}'
-          steps:
-            - trigger-builds:
-                - project: 'fuel-collect-logs-{pod}-daily-{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: 'fuel-collect-logs-{pod}-daily-{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'
 
     publishers:
       - email-fuel-ptl
@@ -290,8 +263,6 @@
       - description-setter:
           description: "Built on $NODE_NAME"
       - track-begin-timestamp
-      - shell:
-          !include-raw-escape: ./fuel-download-artifact.sh
       - shell:
           !include-raw-escape: ./fuel-deploy.sh