From a4d3865fb1566990134fa050e477a441cfde62ed Mon Sep 17 00:00:00 2001 From: Tim Rozet Date: Fri, 10 Aug 2018 12:13:12 -0400 Subject: CPERF: CSIT updates Changes-Include: - OPENSTACK_TOPO is now decided dynamically - Make the containerized start/stop commands more simple - Include CSIT logging in CSIT promotion Change-Id: I4b178cfd95cf45b808ab9e82b317b729e5f3028f Signed-off-by: Tim Rozet --- jjb/apex/apex.yaml | 8 ++++++++ jjb/apex/apex.yaml.j2 | 8 ++++++++ 2 files changed, 16 insertions(+) (limited to 'jjb/apex') diff --git a/jjb/apex/apex.yaml b/jjb/apex/apex.yaml index 89338d822..e2676e034 100644 --- a/jjb/apex/apex.yaml +++ b/jjb/apex/apex.yaml @@ -891,6 +891,7 @@ - multijob: name: csit condition: SUCCESSFUL + execution-type: SEQUENTIALLY projects: - name: cperf-apex-csit-master predefined-parameters: | @@ -901,6 +902,13 @@ ODL_CONTAINERIZED=true OS_VERSION=$OS_VERSION node-parameters: true + kill-phase-on: NEVER + abort-all-job: false + - name: cperf-upload-logs-csit + predefined-parameters: | + ODL_BRANCH=$ODL_BRANCH + OS_VERSION=$OS_VERSION + node-parameters: true kill-phase-on: FAILURE abort-all-job: false - multijob: diff --git a/jjb/apex/apex.yaml.j2 b/jjb/apex/apex.yaml.j2 index 865dc69eb..dacdacacf 100644 --- a/jjb/apex/apex.yaml.j2 +++ b/jjb/apex/apex.yaml.j2 @@ -779,6 +779,7 @@ - multijob: name: csit condition: SUCCESSFUL + execution-type: SEQUENTIALLY projects: - name: cperf-apex-csit-master predefined-parameters: | @@ -789,6 +790,13 @@ ODL_CONTAINERIZED=true OS_VERSION=$OS_VERSION node-parameters: true + kill-phase-on: NEVER + abort-all-job: false + - name: cperf-upload-logs-csit + predefined-parameters: | + ODL_BRANCH=$ODL_BRANCH + OS_VERSION=$OS_VERSION + node-parameters: true kill-phase-on: FAILURE abort-all-job: false - multijob: -- cgit 1.2.3-korg