From 479b47a9de27d70423dcc639585281bfb8a0f8e7 Mon Sep 17 00:00:00 2001
From: Cédric Ollivier <cedric.ollivier@orange.com>
Date: Thu, 31 Jan 2019 16:44:04 +0100
Subject: Stop running rally_jobs and neutron-tempest-plugin-api in //
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

It moves rally_jobs into a separate multijob step.
The next two testcases can raise timeout (1 min) if Routers related workloads
are executed at the same time [1].
  - test_routers.RoutersIpV6Test.test_router_interface_status
  - test_routers.RoutersTest.test_router_interface_status

[1] http://artifacts.opnfv.org/functest/functest-opnfv-functest-smoke-latest-neutron-tempest-plugin-api-run-35/results/neutron-tempest-plugin-api/tempest-report.html

Change-Id: Id631a9d9b27effe67cd7a0e7cba3943f9e734278
Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com>
---
 jjb/functest/functest.yaml | 31 ++++++++++++++++++++++++-------
 1 file changed, 24 insertions(+), 7 deletions(-)

diff --git a/jjb/functest/functest.yaml b/jjb/functest/functest.yaml
index d24ee120b..29f25a0f4 100644
--- a/jjb/functest/functest.yaml
+++ b/jjb/functest/functest.yaml
@@ -266,7 +266,6 @@
       - tempest_smoke
       - neutron-tempest-plugin-api
       - rally_sanity
-      - rally_jobs
       - refstack_defcore
       - patrole
       - snaps_smoke
@@ -277,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
@@ -407,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'
@@ -423,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:
@@ -694,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'
@@ -710,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:
@@ -881,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'
@@ -897,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:
-- 
cgit 1.2.3-korg