diff options
| -rwxr-xr-x | jjb/functest/functest-loop.sh | 2 | ||||
| -rwxr-xr-x | jjb/functest/functest-suite.sh | 2 | ||||
| -rwxr-xr-x | jjb/functest/set-functest-env.sh | 2 |
3 files changed, 6 insertions, 0 deletions
diff --git a/jjb/functest/functest-loop.sh b/jjb/functest/functest-loop.sh index ab97c3579..4528c00d1 100755 --- a/jjb/functest/functest-loop.sh +++ b/jjb/functest/functest-loop.sh @@ -5,6 +5,8 @@ branch=${GIT_BRANCH##*/} [[ "$PUSH_RESULTS_TO_DB" == "true" ]] && flags+="-r" if [[ ${branch} == *"brahmaputra"* ]]; then cmd="${FUNCTEST_REPO_DIR}/docker/run_tests.sh -s ${flags}" +elif [[ ${branch} == *"colorado"* ]]; then + cmd="python ${FUNCTEST_REPO_DIR}/ci/run_tests.py -t all ${flags}" else cmd="python ${FUNCTEST_REPO_DIR}/functest/ci/run_tests.py -t all ${flags}" fi diff --git a/jjb/functest/functest-suite.sh b/jjb/functest/functest-suite.sh index d007c048d..df286569f 100755 --- a/jjb/functest/functest-suite.sh +++ b/jjb/functest/functest-suite.sh @@ -5,6 +5,8 @@ branch=${GIT_BRANCH##*/} echo "Functest: run $FUNCTEST_SUITE_NAME on branch ${branch}" if [[ ${branch} == *"brahmaputra"* ]]; then cmd="${FUNCTEST_REPO_DIR}/docker/run_tests.sh --test $FUNCTEST_SUITE_NAME" +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" fi diff --git a/jjb/functest/set-functest-env.sh b/jjb/functest/set-functest-env.sh index bbd4a889c..bc30ffaf3 100755 --- a/jjb/functest/set-functest-env.sh +++ b/jjb/functest/set-functest-env.sh @@ -82,6 +82,8 @@ if [ $(docker ps | grep "opnfv/functest:${DOCKER_TAG}" | wc -l) == 0 ]; then fi if [[ ${branch} == *"brahmaputra"* ]]; then cmd="${FUNCTEST_REPO_DIR}/docker/prepare_env.sh" +elif [[ ${branch} == *"colorado"* ]]; then + cmd="python ${FUNCTEST_REPO_DIR}/ci/prepare_env.py start" else cmd="python ${FUNCTEST_REPO_DIR}/functest/ci/prepare_env.py start" fi |