From: Aric Gardner <agardner@linuxfoundation.org>
Date: Mon, 28 Jan 2019 22:07:27 +0000 (+0000)
Subject: Merge "[release] fuel, armband: opnfv-7.2.0"
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=cd667ba9cbc52aa2476bd5379f4a3039683c2f67;hp=3bc3a1ea607b88651e5272ebfa5e0c2acb5d5aea;p=releng.git

Merge "[release] fuel, armband: opnfv-7.2.0"
---

diff --git a/jjb/functest/functest.yaml b/jjb/functest/functest.yaml
index 9afa64ba3..d24ee120b 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,7 +94,7 @@
           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 \
             $image run_tests -t {test}
@@ -298,6 +294,7 @@
     test:
       - tempest_full
       - tempest_scenario
+      - rally_full
     jobs:
       - 'functest-{repo}-{container}-{tag}-{test}-run'
 
@@ -440,6 +437,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 +724,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 +911,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: