Fix a nit

[releng.git] / jjb / functest / functest.yaml

diff --git a/jjb/functest/functest.yaml b/jjb/functest/functest.yaml
index 7d6cd7c..544021b 100644 (file)
--- 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,6 +94,12 @@
           fi
           sudo docker run --rm \
             -v $WORKSPACE/../$JOB_NAME/results:/var/lib/xtesting/results \
+            -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/ \
@@ -321,7 +323,6 @@
       - bgpvpn
       - functest-odl-sfc
       - barometercollectd
-      - fds
       - vgpu
       - stor4nfv_os
     jobs:
@@ -465,8 +466,6 @@
               <<: *functest-jobs
             - name: 'functest-opnfv-functest-features-{tag}-barometercollectd-run'
               <<: *functest-jobs
-            - name: 'functest-opnfv-functest-features-{tag}-fds-run'
-              <<: *functest-jobs
             - name: 'functest-opnfv-functest-features-{tag}-vgpu-run'
               <<: *functest-jobs
             - name: 'functest-opnfv-functest-features-{tag}-stor4nfv_os-run'
@@ -754,8 +753,6 @@
               <<: *functest-jobs
             - name: 'functest-opnfv-functest-features-{tag}-barometercollectd-run'
               <<: *functest-jobs
-            - name: 'functest-opnfv-functest-features-{tag}-fds-run'
-              <<: *functest-jobs
             - name: 'functest-opnfv-functest-features-{tag}-vgpu-run'
               <<: *functest-jobs
             - name: 'functest-opnfv-functest-features-{tag}-stor4nfv_os-run'
@@ -943,8 +940,6 @@
               <<: *functest-jobs
             - name: 'functest-opnfv-functest-features-{tag}-barometercollectd-run'
               <<: *functest-jobs
-            - name: 'functest-opnfv-functest-features-{tag}-fds-run'
-              <<: *functest-jobs
             - name: 'functest-opnfv-functest-features-{tag}-vgpu-run'
               <<: *functest-jobs
             - name: 'functest-opnfv-functest-features-{tag}-stor4nfv_os-run'