summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--jjb/3rd_party_ci/odl-netvirt.yaml26
-rwxr-xr-xjjb/cperf/cperf-robot-netvirt-csit.sh1
2 files changed, 2 insertions, 25 deletions
diff --git a/jjb/3rd_party_ci/odl-netvirt.yaml b/jjb/3rd_party_ci/odl-netvirt.yaml
index 4453ee250..98c85db19 100644
--- a/jjb/3rd_party_ci/odl-netvirt.yaml
+++ b/jjb/3rd_party_ci/odl-netvirt.yaml
@@ -150,9 +150,9 @@
abort-all-job: true
- multijob:
name: csit
- condition: ALWAYS
+ condition: SUCCESSFUL
projects:
- - name: cperf-apex-csit-{stream}
+ - name: cperf-apex-csit-master
predefined-parameters: |
ODL_BRANCH=$BRANCH
RC_FILE_PATH=$SNAP_CACHE/overcloudrc
@@ -161,28 +161,6 @@
ODL_CONTAINERIZED=false
OS_VERSION=$OS_VERSION
node-parameters: true
- kill-phase-on: NEVER
- abort-all-job: false
- - shell: |
- if echo $OS_VERSION | grep queens &> /dev/null; then
- echo 'REPO=opnfv' > functest_repo
- else
- echo 'REPO=ollivier' > functest_repo
- fi
- - inject:
- properties-file: functest_repo
- - multijob:
- name: functest
- condition: SUCCESSFUL
- projects:
- - name: 'functest-netvirt-virtual-suite-master'
- predefined-parameters: |
- DEPLOY_SCENARIO=os-odl-nofeature-$TOPOLOGY
- FUNCTEST_MODE=testcase
- FUNCTEST_SUITE_NAME=tempest_smoke
- RC_FILE_PATH=$HOME/cloner-info/overcloudrc
- REPO=$REPO
- node-parameters: true
kill-phase-on: FAILURE
abort-all-job: false
- multijob:
diff --git a/jjb/cperf/cperf-robot-netvirt-csit.sh b/jjb/cperf/cperf-robot-netvirt-csit.sh
index 5e7825061..3d943e1be 100755
--- a/jjb/cperf/cperf-robot-netvirt-csit.sh
+++ b/jjb/cperf/cperf-robot-netvirt-csit.sh
@@ -77,7 +77,6 @@ LOGS_LOCATION=/tmp/robot_results
robot_cmd="pybot \
--removekeywords wuks \
--xunit robotxunit.xml \
- -c critical \
-e exclude \
-d $LOGS_LOCATION \
-v BUNDLEFOLDER:/opt/opendaylight \