Functest: add support to pass custom parameters to docker

[releng.git] / jjb / functest / functest-ci-jobs.yml

diff --git a/jjb/functest/functest-ci-jobs.yml b/jjb/functest/functest-ci-jobs.yml
index 2b28974..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
 #--------------------------------
@@ -194,7 +197,7 @@
             description: "Push the results of all the tests to the resultDB"
         - string:
             name: CI_DEBUG
-            default: 'false'
+            default: 'true'
             description: "Show debug output information"
 ########################
 # trigger macros
@@ -221,12 +224,12 @@
         - shell: |
             #!/bin/bash
             set -e
-            echo "Functest: run $FUNCTEST_SUITE_NAME"
             branch=${GIT_BRANCH##*/}
-            if [[ "${branch}" == "master" ]]; then
-                cmd="${FUNCTEST_REPO_DIR}/ci/run_tests.py -t $FUNCTEST_SUITE_NAME"
-            else:
+            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
+                cmd="python ${FUNCTEST_REPO_DIR}/ci/run_tests.py -t $FUNCTEST_SUITE_NAME"
             fi
             container_id=$(docker ps -a | grep opnfv/functest | awk '{print $1}' | head -1)
             docker exec $container_id $cmd
@@ -239,10 +242,10 @@
             set +e
             branch=${GIT_BRANCH##*/}
             [[ "$PUSH_RESULTS_TO_DB" == "true" ]] && flags+="-r"
-            if [[ "${branch}" == "master" ]]; then
-                cmd="${FUNCTEST_REPO_DIR}/ci/run_tests.py -t all ${flags}"
-            else:
+            if [[ ${branch} == *"brahmaputra"* ]]; then
                 cmd="${FUNCTEST_REPO_DIR}/docker/run_tests.sh -s ${flags}"
+            else
+                cmd="python ${FUNCTEST_REPO_DIR}/ci/run_tests.py -t all ${flags}"
             fi
             container_id=$(docker ps -a | grep opnfv/functest | awk '{print $1}' | head -1)
             docker exec $container_id $cmd
@@ -291,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}
@@ -315,10 +320,10 @@
                 echo "The container opnfv/functest with ID=${container_id} has not been properly started. Exiting..."
                 exit 1
             fi
-            if [[ "${branch}" == "master" ]]; then
-                cmd="python ${FUNCTEST_REPO_DIR}/ci/prepare_env.py start"
-            else:
+            if [[ ${branch} == *"brahmaputra"* ]]; then
                 cmd="${FUNCTEST_REPO_DIR}/docker/prepare_env.sh"
+            else
+                cmd="python ${FUNCTEST_REPO_DIR}/ci/prepare_env.py start"
             fi
             echo "Executing command inside the docker: ${cmd}"
             docker exec ${container_id} ${cmd}