From e0d06b8c66cb11c2a305fa446bebcdb42e4faa8d Mon Sep 17 00:00:00 2001 From: Stefan Kobza Date: Thu, 18 Feb 2016 16:35:47 +0100 Subject: [PATCH] Separate VIRL test job; Make VIRL job non-concurrent. Rename csit-vpp-functional to csit-vpp-functional-virl to express the tests are being run on VIRL environment. This one of first steps to separate job runs environments - LF's multi-node VMs and VIRL. Make the VIRL job non-concurrent, as we are working on mechanisms of spawning of VIRL simulations and VPP installation. Change-Id: I0c9f5a1973b7d7764bb192b91d9e8b331f4b40a2 Signed-off-by: Stefan Kobza --- jjb/csit/csit-vpp-functional.yaml | 7 ++++--- ...e-raw-csit-build.sh => include-raw-csit-vpp-functional-virl.sh} | 0 2 files changed, 4 insertions(+), 3 deletions(-) rename jjb/csit/{include-raw-csit-build.sh => include-raw-csit-vpp-functional-virl.sh} (100%) diff --git a/jjb/csit/csit-vpp-functional.yaml b/jjb/csit/csit-vpp-functional.yaml index 8c57df9fe..cb42bfbdd 100644 --- a/jjb/csit/csit-vpp-functional.yaml +++ b/jjb/csit/csit-vpp-functional.yaml @@ -1,5 +1,6 @@ - project: name: csit-vpp-functional + description: 'Run VPP functional tests on VIRL.' jobs: - 'csit-vpp-{functionality}' @@ -7,14 +8,14 @@ project: 'csit' branch: 'master' - functionality: 'functional' + functionality: 'functional-virl' - job-template: name: 'csit-vpp-{functionality}' project-type: freestyle node: verify - concurrent: true + concurrent: false logrotate: daysToKeep: '{build-days-to-keep}' @@ -64,7 +65,7 @@ # allocated IP addresses and injecting as vars into the env. (see Opendaylight script: include-raw-integration-get-slave-addresses.sh # See jjb/integration from ODL - shell: - !include-raw-escape include-raw-csit-build.sh + !include-raw-escape include-raw-csit-vpp-functional-virl.sh publishers: - archive-artifacts: diff --git a/jjb/csit/include-raw-csit-build.sh b/jjb/csit/include-raw-csit-vpp-functional-virl.sh similarity index 100% rename from jjb/csit/include-raw-csit-build.sh rename to jjb/csit/include-raw-csit-vpp-functional-virl.sh -- 2.16.6