Stop running rally_jobs and neutron-tempest-plugin-api in //

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

diff --git a/jjb/functest/functest.yaml b/jjb/functest/functest.yaml
index 9afa64b..29f25a0 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,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}
@@ -270,7 +266,6 @@
       - tempest_smoke
       - neutron-tempest-plugin-api
       - rally_sanity
-      - rally_jobs
       - refstack_defcore
       - patrole
       - snaps_smoke
@@ -281,6 +276,15 @@
     jobs:
       - 'functest-{repo}-{container}-{tag}-{test}-run'
 
+- project:
+    name: 'functest-opnfv-functest-smoke-2'
+    <<: *functest-params
+    container: 'functest-smoke'
+    test:
+      - rally_jobs
+    jobs:
+      - 'functest-{repo}-{container}-{tag}-{test}-run'
+
 - project:
     name: 'functest-opnfv-functest-benchmarking'
     <<: *functest-params
@@ -298,6 +302,7 @@
     test:
       - tempest_full
       - tempest_scenario
+      - rally_full
     jobs:
       - 'functest-{repo}-{container}-{tag}-{test}-run'
 
@@ -410,8 +415,6 @@
               <<: *functest-jobs
             - name: 'functest-opnfv-functest-smoke-{tag}-rally_sanity-run'
               <<: *functest-jobs
-            - name: 'functest-opnfv-functest-smoke-{tag}-rally_jobs-run'
-              <<: *functest-jobs
             - name: 'functest-opnfv-functest-smoke-{tag}-refstack_defcore-run'
               <<: *functest-jobs
             - name: 'functest-opnfv-functest-smoke-{tag}-patrole-run'
@@ -426,6 +429,11 @@
               <<: *functest-jobs
             - name: 'functest-opnfv-functest-smoke-{tag}-barbican-run'
               <<: *functest-jobs
+      - multijob:
+          name: opnfv/functest-smoke:{tag}
+          projects:
+            - name: 'functest-opnfv-functest-smoke-{tag}-rally_jobs-run'
+              <<: *functest-jobs
       - multijob:
           name: opnfv/functest-benchmarking:{tag}
           projects:
@@ -440,6 +448,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:
@@ -695,8 +705,6 @@
               <<: *functest-jobs
             - name: 'functest-opnfv-functest-smoke-{tag}-rally_sanity-run'
               <<: *functest-jobs
-            - name: 'functest-opnfv-functest-smoke-{tag}-rally_jobs-run'
-              <<: *functest-jobs
             - name: 'functest-opnfv-functest-smoke-{tag}-refstack_defcore-run'
               <<: *functest-jobs
             - name: 'functest-opnfv-functest-smoke-{tag}-patrole-run'
@@ -711,6 +719,11 @@
               <<: *functest-jobs
             - name: 'functest-opnfv-functest-smoke-{tag}-barbican-run'
               <<: *functest-jobs
+      - multijob:
+          name: opnfv/functest-smoke:{tag}
+          projects:
+            - name: 'functest-opnfv-functest-smoke-{tag}-rally_jobs-run'
+              <<: *functest-jobs
       - multijob:
           name: opnfv/functest-benchmarking:{tag}
           projects:
@@ -725,6 +738,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:
@@ -880,8 +895,6 @@
               <<: *functest-jobs
             - name: 'functest-opnfv-functest-smoke-{tag}-rally_sanity-run'
               <<: *functest-jobs
-            - name: 'functest-opnfv-functest-smoke-{tag}-rally_jobs-run'
-              <<: *functest-jobs
             - name: 'functest-opnfv-functest-smoke-{tag}-refstack_defcore-run'
               <<: *functest-jobs
             - name: 'functest-opnfv-functest-smoke-{tag}-patrole-run'
@@ -896,6 +909,11 @@
               <<: *functest-jobs
             - name: 'functest-opnfv-functest-smoke-{tag}-barbican-run'
               <<: *functest-jobs
+      - multijob:
+          name: opnfv/functest-smoke:{tag}
+          projects:
+            - name: 'functest-opnfv-functest-smoke-{tag}-rally_jobs-run'
+              <<: *functest-jobs
       - multijob:
           name: opnfv/functest-benchmarking:{tag}
           projects:
@@ -910,6 +928,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: