summaryrefslogtreecommitdiffstats
path: root/jjb
diff options
context:
space:
mode:
Diffstat (limited to 'jjb')
-rw-r--r--jjb/3rd_party_ci/odl-netvirt.yml24
-rwxr-xr-xjjb/dovetail/dovetail-run.sh2
-rwxr-xr-xjjb/functest/functest-suite.sh2
-rw-r--r--jjb/global/slave-params.yml8
4 files changed, 13 insertions, 23 deletions
diff --git a/jjb/3rd_party_ci/odl-netvirt.yml b/jjb/3rd_party_ci/odl-netvirt.yml
index 0948353aa..3dd4c0b44 100644
--- a/jjb/3rd_party_ci/odl-netvirt.yml
+++ b/jjb/3rd_party_ci/odl-netvirt.yml
@@ -19,11 +19,11 @@
- 'create-apex-vms':
slave-label: 'ericsson-virtual5'
- 'install-netvirt':
- slave-label: 'ericsson-virtual6'
+ slave-label: 'odl-netvirt-virtual'
- 'functest':
- slave-label: 'ericsson-virtual6'
+ slave-label: 'odl-netvirt-virtual'
- 'postprocess':
- slave-label: 'ericsson-virtual6'
+ slave-label: 'odl-netvirt-virtual'
#####################################
# jobs
#####################################
@@ -57,7 +57,7 @@
- string:
name: NETVIRT_ARTIFACT
default: $WORKSPACE/distribution-karaf.tar.gz
- - 'ericsson-virtual6-defaults'
+ - 'odl-netvirt-virtual-defaults'
triggers:
- gerrit:
@@ -119,22 +119,16 @@
name: functest
condition: SUCCESSFUL
projects:
- - name: 'odl-netvirt-verify-virtual-functest-{stream}'
- current-parameters: false
+ - name: 'functest-netvirt-virtual-suite-{stream}'
predefined-parameters: |
- GERRIT_BRANCH=$GERRIT_BRANCH
- GERRIT_REFSPEC=$GERRIT_REFSPEC
- GERRIT_CHANGE_NUMBER=$GERRIT_CHANGE_NUMBER
- GERRIT_CHANGE_ID=$GERRIT_CHANGE_ID
- GERRIT_PATCHSET_NUMBER=$GERRIT_PATCHSET_NUMBER
- GERRIT_PATCHSET_REVISION=$GERRIT_PATCHSET_REVISION
- NETVIRT_ARTIFACT=$NETVIRT_ARTIFACT
+ FUNCTEST_SUITE_NAME=vping_userdata,bgpvpn
+ RC_FILE_PATH=/home/jenkins/cloner-info/overcloudrc
node-parameters: true
kill-phase-on: FAILURE
- abort-all-job: true
+ abort-all-job: false
- multijob:
name: postprocess
- condition: SUCCESSFUL
+ condition: ALWAYS
projects:
- name: 'odl-netvirt-verify-virtual-postprocess-{stream}'
current-parameters: false
diff --git a/jjb/dovetail/dovetail-run.sh b/jjb/dovetail/dovetail-run.sh
index a41a989fb..4082c34fe 100755
--- a/jjb/dovetail/dovetail-run.sh
+++ b/jjb/dovetail/dovetail-run.sh
@@ -66,7 +66,7 @@ if [ $(docker ps | grep "opnfv/dovetail:${DOCKER_TAG}" | wc -l) == 0 ]; then
exit 1
fi
-exec_cmd="python ${DOVETAIL_REPO_DIR}/dovetail/run.py --testsuite ${TESTSUITE}"
+exec_cmd="python ${DOVETAIL_REPO_DIR}/dovetail/run.py --testsuite ${TESTSUITE} -d true"
echo "Container exec command: ${exec_cmd}"
docker exec ${container_id} ${exec_cmd}
diff --git a/jjb/functest/functest-suite.sh b/jjb/functest/functest-suite.sh
index df286569f..a30fb5973 100755
--- a/jjb/functest/functest-suite.sh
+++ b/jjb/functest/functest-suite.sh
@@ -8,7 +8,7 @@ if [[ ${branch} == *"brahmaputra"* ]]; then
elif [[ ${branch} == *"colorado"* ]]; then
cmd="python ${FUNCTEST_REPO_DIR}/ci/run_tests.py -t $FUNCTEST_SUITE_NAME"
else
- cmd="python ${FUNCTEST_REPO_DIR}/functest/ci/run_tests.py -t $FUNCTEST_SUITE_NAME"
+ cmd="functest testcase run $FUNCTEST_SUITE_NAME"
fi
container_id=$(docker ps -a | grep opnfv/functest | awk '{print $1}' | head -1)
docker exec $container_id $cmd
diff --git a/jjb/global/slave-params.yml b/jjb/global/slave-params.yml
index a8dae739a..252611191 100644
--- a/jjb/global/slave-params.yml
+++ b/jjb/global/slave-params.yml
@@ -681,19 +681,15 @@
default: https://git.opendaylight.org/gerrit/p/$PROJECT.git
description: 'Git URL to use on this Jenkins Slave'
- parameter:
- name: 'ericsson-virtual6-defaults'
+ name: 'odl-netvirt-virtual-defaults'
parameters:
- label:
name: SLAVE_LABEL
- default: 'ericsson-virtual6'
+ default: 'odl-netvirt-virtual'
- string:
name: GIT_BASE
default: https://git.opendaylight.org/gerrit/p/$PROJECT.git
description: 'Git URL to use on this Jenkins Slave'
- - string:
- name: APEX_ENV_NUMBER
- default: '"0"'
- description: 'The number of the Apex environment on the machine'
#####################################################
# These slaves are just dummy slaves for sandbox jobs
#####################################################