diff options
| author |   Morgan Richomme <morgan.richomme@orange.com> | 2016-04-29 16:19:03 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@172.30.200.206> | 2016-04-29 16:19:03 +0000 |
| commit | 03c8b7bd40751e2e73ab69ccabdc6f0b2efd6946 (patch) | |
| tree | 4820df9640d5b018534327d14d220ade6dfaa796 /jjb/functest | |
| parent | 1608960c0d06824e15cb26e95ece2d3936bf748f (diff) | |
| parent | 8a74d4b1c29c9aa067c5c5394fd4c545795b8eb4 (diff) | |
Merge "Functest, differenciate commands for stable and for master"
Diffstat (limited to 'jjb/functest')
| -rw-r--r-- | jjb/functest/functest-ci-jobs.yml | 20 |
1 files changed, 17 insertions, 3 deletions
diff --git a/jjb/functest/functest-ci-jobs.yml b/jjb/functest/functest-ci-jobs.yml index 20f5f300e..2b2897471 100644 --- a/jjb/functest/functest-ci-jobs.yml +++ b/jjb/functest/functest-ci-jobs.yml @@ -222,7 +222,12 @@ #!/bin/bash set -e echo "Functest: run $FUNCTEST_SUITE_NAME" - cmd="${FUNCTEST_REPO_DIR}/ci/run_tests.py -t $FUNCTEST_SUITE_NAME" + branch=${GIT_BRANCH##*/} + if [[ "${branch}" == "master" ]]; then + cmd="${FUNCTEST_REPO_DIR}/ci/run_tests.py -t $FUNCTEST_SUITE_NAME" + else: + cmd="${FUNCTEST_REPO_DIR}/docker/run_tests.sh --test $FUNCTEST_SUITE_NAME" + fi container_id=$(docker ps -a | grep opnfv/functest | awk '{print $1}' | head -1) docker exec $container_id $cmd @@ -232,8 +237,13 @@ - shell: | #!/bin/bash set +e + branch=${GIT_BRANCH##*/} [[ "$PUSH_RESULTS_TO_DB" == "true" ]] && flags+="-r" - cmd="${FUNCTEST_REPO_DIR}/ci/run_tests.py -t all ${flags}" + if [[ "${branch}" == "master" ]]; then + cmd="${FUNCTEST_REPO_DIR}/ci/run_tests.py -t all ${flags}" + else: + cmd="${FUNCTEST_REPO_DIR}/docker/run_tests.sh -s ${flags}" + fi container_id=$(docker ps -a | grep opnfv/functest | awk '{print $1}' | head -1) docker exec $container_id $cmd @@ -305,7 +315,11 @@ echo "The container opnfv/functest with ID=${container_id} has not been properly started. Exiting..." exit 1 fi - cmd="python ${FUNCTEST_REPO_DIR}/ci/prepare_env.py start" + if [[ "${branch}" == "master" ]]; then + cmd="python ${FUNCTEST_REPO_DIR}/ci/prepare_env.py start" + else: + cmd="${FUNCTEST_REPO_DIR}/docker/prepare_env.sh" + fi echo "Executing command inside the docker: ${cmd}" docker exec ${container_id} ${cmd} |