Merge "Docker, change BASE_VERSION to brahmaputra.3"

diff --git a/jjb/functest/functest-ci-jobs.yml b/jjb/functest/functest-ci-jobs.yml
index 52f2f61..8bcf4c9 100644 (file)
--- a/jjb/functest/functest-ci-jobs.yml
+++ b/jjb/functest/functest-ci-jobs.yml
@@ -55,6 +55,9 @@
         - virtual:
             installer: joid
             <<: *brahmaputra
+        - arm-pod1:
+            installer: fuel
+            <<: *brahmaputra
 #--------------------------------
 #        master
 #--------------------------------
@@ -221,7 +224,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 +240,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}"
@@ -289,11 +294,13 @@
             mkdir -p ${dir_result}
             sudo rm -rf ${dir_result}/*
             res_volume="-v ${dir_result}:/home/opnfv/functest/results"
+            custom_params=
+            test -f ${HOME}/opnfv/functest/custom/params_${DOCKER_TAG} && custom_params=$(cat ${HOME}/opnfv/functest/custom/params_${DOCKER_TAG})
 
             echo "Functest: Pulling image opnfv/functest:${DOCKER_TAG}"
             docker pull opnfv/functest:$DOCKER_TAG >${redirect}
 
-            cmd="sudo docker run --privileged=true -id ${envs} ${labconfig} ${sshkey} ${res_volume} opnfv/functest:${DOCKER_TAG} /bin/bash"
+            cmd="sudo docker run --privileged=true -id ${envs} ${labconfig} ${sshkey} ${res_volume} ${custom_params} opnfv/functest:${DOCKER_TAG} /bin/bash"
             echo "Functest: Running docker run command: ${cmd}"
             ${cmd} >${redirect}
             docker ps -a >${redirect}