For the functest change we use the new cli which provides us
with comma seperation of the test cases.
Change-Id: Id6c88bd3e13ecce7bf5a738ead8ad98df4e00b5a
Signed-off-by: Nikolas Hermanns <nikolas.hermanns@ericsson.com>
- 'create-apex-vms':
slave-label: 'ericsson-virtual5'
- 'install-netvirt':
- 'create-apex-vms':
slave-label: 'ericsson-virtual5'
- 'install-netvirt':
- slave-label: 'ericsson-virtual6'
+ slave-label: 'odl-netvirt-virtual'
- slave-label: 'ericsson-virtual6'
+ slave-label: 'odl-netvirt-virtual'
- slave-label: 'ericsson-virtual6'
+ slave-label: 'odl-netvirt-virtual'
#####################################
# jobs
#####################################
#####################################
# jobs
#####################################
- string:
name: NETVIRT_ARTIFACT
default: $WORKSPACE/distribution-karaf.tar.gz
- string:
name: NETVIRT_ARTIFACT
default: $WORKSPACE/distribution-karaf.tar.gz
- - 'ericsson-virtual6-defaults'
+ - 'odl-netvirt-virtual-defaults'
name: functest
condition: SUCCESSFUL
projects:
name: functest
condition: SUCCESSFUL
projects:
- - name: 'odl-netvirt-verify-virtual-functest-{stream}'
- current-parameters: false
+ - name: 'functest-netvirt-virtual-suite-{stream}'
- 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
node-parameters: true
kill-phase-on: FAILURE
- multijob:
name: postprocess
- multijob:
name: postprocess
projects:
- name: 'odl-netvirt-verify-virtual-postprocess-{stream}'
current-parameters: false
projects:
- name: 'odl-netvirt-verify-virtual-postprocess-{stream}'
current-parameters: false
elif [[ ${branch} == *"colorado"* ]]; then
cmd="python ${FUNCTEST_REPO_DIR}/ci/run_tests.py -t $FUNCTEST_SUITE_NAME"
else
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
fi
container_id=$(docker ps -a | grep opnfv/functest | awk '{print $1}' | head -1)
docker exec $container_id $cmd
default: https://git.opendaylight.org/gerrit/p/$PROJECT.git
description: 'Git URL to use on this Jenkins Slave'
- parameter:
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
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: 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
#####################################################
#####################################################
# These slaves are just dummy slaves for sandbox jobs
#####################################################