diff options
author | Morgan Richomme <morgan.richomme@orange.com> | 2016-05-02 10:45:44 +0200 |
---|---|---|
committer | Morgan Richomme <morgan.richomme@orange.com> | 2016-05-02 11:37:44 +0200 |
commit | 5987448148f3d9663ea0182da5dd1cbfc92693d8 (patch) | |
tree | 2d5a25fff685c936f10db19fc3f53e781c548e52 | |
parent | 63ece054671bdd98247e2d89e7ebd72b69078731 (diff) |
use BUILD_TAG rather than branch to execute command
Change-Id: If79d4a457712465af1e4be1aca8a51ad270d65fa
Signed-off-by: Morgan Richomme <morgan.richomme@orange.com>
-rw-r--r-- | jjb/functest/functest-ci-jobs.yml | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/jjb/functest/functest-ci-jobs.yml b/jjb/functest/functest-ci-jobs.yml index 52f2f61bc..d593dc3df 100644 --- a/jjb/functest/functest-ci-jobs.yml +++ b/jjb/functest/functest-ci-jobs.yml @@ -221,7 +221,8 @@ - shell: | #!/bin/bash set -e - echo "Functest: run $FUNCTEST_SUITE_NAME" + 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" else @@ -236,6 +237,7 @@ - shell: | #!/bin/bash set +e + branch=${GIT_BRANCH##*/} [[ "$PUSH_RESULTS_TO_DB" == "true" ]] && flags+="-r" if [[ ${branch} == *"brahmaputra"* ]]; then cmd="${FUNCTEST_REPO_DIR}/docker/run_tests.sh -s ${flags}" |