From 5987448148f3d9663ea0182da5dd1cbfc92693d8 Mon Sep 17 00:00:00 2001 From: Morgan Richomme Date: Mon, 2 May 2016 10:45:44 +0200 Subject: use BUILD_TAG rather than branch to execute command Change-Id: If79d4a457712465af1e4be1aca8a51ad270d65fa Signed-off-by: Morgan Richomme --- jjb/functest/functest-ci-jobs.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'jjb') 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}" -- cgit 1.2.3-korg