From: Cédric Ollivier <cedric.ollivier@orange.com>
Date: Sun, 27 Jan 2019 19:57:37 +0000 (+0100)
Subject: Generate functest.yaml to verify OS master
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?p=releng.git;a=commitdiff_plain;h=74d117bf8fac8d2059f04d07d8b2c58c62d7f2e1

Generate functest.yaml to verify OS master

Change-Id: If39c18e0b9f5578b0e42b6e57cec10474d0fec5f
Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com>
---

diff --git a/jjb/functest/functest.yaml b/jjb/functest/functest.yaml
index 9afa64ba3..7f64de2b1 100644
--- a/jjb/functest/functest.yaml
+++ b/jjb/functest/functest.yaml
@@ -10,10 +10,6 @@
     tag:
       - latest:
           branch: master
-      - hunter:
-          branch: stable/hunter
-      - gambia:
-          branch: stable/gambia
 
 - parameter:
     name: functest-slave
@@ -98,9 +94,12 @@
           fi
           sudo docker run --rm \
             -v $WORKSPACE/../$JOB_NAME/results:/var/lib/xtesting/results \
-            -e EXTERNAL_NETWORK=public1 \
+            -e EXTERNAL_NETWORK=public \
             -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/tempest_blacklist.yaml:\
+          /usr/lib/python2.7/site-packages/functest/opnfv_tests/openstack/\
+          tempest/custom_tests/blacklist.yaml \ \
             $image run_tests -t {test}
           res=$?
           gsutil -m cp -r $WORKSPACE/ \
@@ -298,6 +297,7 @@
     test:
       - tempest_full
       - tempest_scenario
+      - rally_full
     jobs:
       - 'functest-{repo}-{container}-{tag}-{test}-run'
 
@@ -440,6 +440,8 @@
               <<: *functest-jobs
             - name: 'functest-opnfv-functest-components-{tag}-tempest_scenario-run'
               <<: *functest-jobs
+            - name: 'functest-opnfv-functest-components-{tag}-rally_full-run'
+              <<: *functest-jobs
       - multijob:
           name: opnfv/functest-vnf:{tag}
           projects:
@@ -725,6 +727,8 @@
               <<: *functest-jobs
             - name: 'functest-opnfv-functest-components-{tag}-tempest_scenario-run'
               <<: *functest-jobs
+            - name: 'functest-opnfv-functest-components-{tag}-rally_full-run'
+              <<: *functest-jobs
       - multijob:
           name: opnfv/functest-vnf:{tag}
           projects:
@@ -910,6 +914,8 @@
               <<: *functest-jobs
             - name: 'functest-opnfv-functest-components-{tag}-tempest_scenario-run'
               <<: *functest-jobs
+            - name: 'functest-opnfv-functest-components-{tag}-rally_full-run'
+              <<: *functest-jobs
       - multijob:
           name: opnfv/functest-vnf:{tag}
           projects: