use BUILD_TAG rather than branch to execute command 85/13485/3
authorMorgan Richomme <morgan.richomme@orange.com>
Mon, 2 May 2016 08:45:44 +0000 (10:45 +0200)
committerMorgan Richomme <morgan.richomme@orange.com>
Mon, 2 May 2016 09:37:44 +0000 (11:37 +0200)
Change-Id: If79d4a457712465af1e4be1aca8a51ad270d65fa
Signed-off-by: Morgan Richomme <morgan.richomme@orange.com>
jjb/functest/functest-ci-jobs.yml

index 52f2f61..d593dc3 100644 (file)
         - 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
         - 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}"