diff options
Diffstat (limited to 'jjb/functest/functest-ci-jobs.yml')
| -rw-r--r-- | jjb/functest/functest-ci-jobs.yml | 49 |
1 files changed, 28 insertions, 21 deletions
diff --git a/jjb/functest/functest-ci-jobs.yml b/jjb/functest/functest-ci-jobs.yml index 2e95e9f12..90b5a67d4 100644 --- a/jjb/functest/functest-ci-jobs.yml +++ b/jjb/functest/functest-ci-jobs.yml @@ -13,10 +13,12 @@ stream: master branch: '{stream}' gs-pathname: '' + docker-tag: 'latest' brahmaputra: &brahmaputra stream: brahmaputra branch: 'stable/{stream}' gs-pathname: '/{stream}' + docker-tag: 'brahmaputra.1.0' #-------------------------------- # POD, INSTALLER, AND BRANCH MAPPING #-------------------------------- @@ -26,12 +28,12 @@ - opnfv-jump-1: installer: apex <<: *brahmaputra - - opnfv-jump-2: - installer: fuel - <<: *brahmaputra - intel-pod5: installer: joid <<: *brahmaputra + - orange-pod2: + installer: joid + <<: *brahmaputra - huawei-us-deploy-bare-1: installer: compass <<: *brahmaputra @@ -41,6 +43,9 @@ - ericsson-pod2: installer: fuel <<: *brahmaputra + - opnfv-jump-2: + installer: fuel + <<: *brahmaputra - virtual: installer: fuel <<: *brahmaputra @@ -53,6 +58,9 @@ #-------------------------------- # master #-------------------------------- + - opnfv-jump-2: + installer: fuel + <<: *master - intel-pod6: installer: joid <<: *master @@ -65,9 +73,6 @@ - ericsson-pod1: installer: fuel <<: *master - - ericsson-pod2: - installer: fuel - <<: *master - orange-test1: installer: fuel <<: *master @@ -108,6 +113,9 @@ wrappers: - build-name: name: '$BUILD_NUMBER Suite: $FUNCTEST_SUITE_NAME Scenario: $DEPLOY_SCENARIO' + - timeout: + timeout: 400 + abort: true parameters: - project-parameter: @@ -118,6 +126,10 @@ - string: name: DEPLOY_SCENARIO default: 'os-odl_l2-nofeature-ha' + - string: + name: DOCKER_TAG + default: '{docker-tag}' + description: 'Tag to pull docker image' - functest-parameter: gs-pathname: '{gs-pathname}' @@ -199,12 +211,10 @@ - shell: | #!/bin/bash set +e - flag="" - if [ "${PUSH_RESULTS_TO_DB}" == "true" ]; then - flag="-r" - fi + flags="-s" + [[ "$PUSH_RESULTS_TO_DB" == "true" ]] && flags+=" -r" echo "Functest: run $FUNCTEST_SUITE_NAME" - cmd="${FUNCTEST_REPO_DIR}/docker/run_tests.sh --test $FUNCTEST_SUITE_NAME ${flag}" + cmd="${FUNCTEST_REPO_DIR}/docker/run_tests.sh --test $FUNCTEST_SUITE_NAME ${flags}" container_id=$(docker ps -a | grep opnfv/functest | awk '{print $1}' | head -1) docker exec $container_id $cmd @@ -214,12 +224,9 @@ - shell: | #!/bin/bash set +e - flag="" - if [ "${PUSH_RESULTS_TO_DB}" == "true" ]; then - flag="-r" - fi - echo "Functest: running all the tests" - cmd="${FUNCTEST_REPO_DIR}/docker/run_tests.sh ${flag}" + flags="-s" + [[ "$PUSH_RESULTS_TO_DB" == "true" ]] && flags+=" -r" + cmd="${FUNCTEST_REPO_DIR}/docker/run_tests.sh ${flags}" container_id=$(docker ps -a | grep opnfv/functest | awk '{print $1}' | head -1) docker exec $container_id $cmd @@ -249,14 +256,14 @@ echo "Functest: Start Docker and prepare environment" envs="-e INSTALLER_TYPE=${INSTALLER_TYPE} -e INSTALLER_IP=${INSTALLER_IP} \ -e NODE_NAME=${NODE_NAME} -e DEPLOY_SCENARIO=${DEPLOY_SCENARIO} \ - -e CI_DEBUG=${CI_DEBUG}" - - dir_result="${HOME}/opnfv/functest/results/" + -e BUILD_TAG=${BUILD_TAG} -e CI_DEBUG=${CI_DEBUG}" + branch=${GIT_BRANCH##*/} + dir_result="${HOME}/opnfv/functest/results/${branch}" mkdir -p ${dir_result} sudo rm -rf ${dir_result}/* res_volume="-v ${dir_result}:/home/opnfv/functest/results" - docker pull opnfv/functest:latest >$redirect + docker pull opnfv/functest:$DOCKER_TAG >$redirect cmd="sudo docker run --privileged=true -id ${envs} ${labconfig} ${sshkey} ${res_volume} opnfv/functest:latest /bin/bash" echo "Functest: Running docker run command: ${cmd}" ${cmd} |