From: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
Date: Mon, 6 May 2019 11:50:49 +0000 (+0000)
Subject: Merge "[armband] Cleanup Fraser jobs, sync with Fuel"
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=a15c6cb8fc93125d025a462c40b9961bb969e9ec;hp=412cc2526ce1b8a4206e0355fc31792796ed4f5d;p=releng.git

Merge "[armband] Cleanup Fraser jobs, sync with Fuel"
---

diff --git a/jjb/fuel/fuel-daily-jobs.yaml b/jjb/fuel/fuel-daily-jobs.yaml
index 3e83502a3..96e65fbca 100644
--- a/jjb/fuel/fuel-daily-jobs.yaml
+++ b/jjb/fuel/fuel-daily-jobs.yaml
@@ -166,67 +166,6 @@
               build-step-failure-threshold: 'never'
               failure-threshold: 'never'
               unstable-threshold: 'FAILURE'
-      # 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 twice one week
-      # 5.run proposed_tests testsuite optional test cases against ha scenario
-      # 6.not used for release criteria or compliance, only to debug the dovetail tool bugs
-      - conditional-step:
-          condition-kind: and
-          condition-operands:
-            - condition-kind: regex-match
-              regex: '.*-ha'
-              label: '{scenario}'
-          steps:
-            - trigger-builds:
-                - project: 'dovetail-fuel-{pod}-default-mandatory-{stream}'
-                  current-parameters: false
-                  predefined-parameters: |
-                    DEPLOY_SCENARIO={scenario}
-                    INSTALLER_VERSION={stream}
-                  block: true
-                  same-node: true
-                  block-thresholds:
-                    build-step-failure-threshold: 'never'
-                    failure-threshold: 'never'
-                    unstable-threshold: 'FAILURE'
-                - project: 'dovetail-fuel-{pod}-proposed_tests-optional-{stream}'
-                  current-parameters: false
-                  predefined-parameters: |
-                    DEPLOY_SCENARIO={scenario}
-                    INSTALLER_VERSION={stream}
-                  block: true
-                  same-node: true
-                  block-thresholds:
-                    build-step-failure-threshold: 'never'
-                    failure-threshold: 'never'
-                    unstable-threshold: 'FAILURE'
-      - conditional-step:
-          condition-kind: and
-          condition-operands:
-            - condition-kind: regex-match
-              regex: '.*-ha'
-              label: '{scenario}'
-            - 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}'
-                  current-parameters: false
-                  predefined-parameters: |
-                    DEPLOY_SCENARIO={scenario}
-                    INSTALLER_VERSION={stream}
-                  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
diff --git a/jjb/functest/functest.yaml b/jjb/functest/functest.yaml
index 3f3b1ae2e..074ad737b 100644
--- a/jjb/functest/functest.yaml
+++ b/jjb/functest/functest.yaml
@@ -106,6 +106,8 @@
             -e DEBUG=true \
             -v /home/opnfv/functest/openstack.creds:/home/opnfv/functest/conf/env_file \
             -v /home/opnfv/functest/images:/home/opnfv/functest/images \
+            -v /home/opnfv/functest/blacklist.yaml:/usr/lib/python2.7/\
+          site-packages/functest/opnfv_tests/openstack/rally/blacklist.yaml \
             $image run_tests -t {test}
           res=$?
           gsutil -m cp -r $WORKSPACE/ \