Added nokia-pod1 slave defaults

[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 01e1885..57f4810 100644 (file)
--- a/jjb/functest/functest-ci-jobs.yml
+++ b/jjb/functest/functest-ci-jobs.yml
@@ -88,6 +88,12 @@
         - virtual:
             installer: joid
             <<: *master
+        - huawei-us-deploy-bare-2:
+            installer: compass
+            <<: *master
+        - nokia-pod1:
+            installer: apex
+            <<: *master
 #--------------------------------
 
     testsuite:
@@ -211,12 +217,10 @@
         - shell: |
             #!/bin/bash
             set +e
-            flag=""
-            if [ "${PUSH_RESULTS_TO_DB}" == "true" ]; then
-                flag="-r"
-            fi
+            flags="-s"
+            [[ "$PUSH_RESULTS_TO_DB" == "true" ]] && flags+=" -r"
             echo "Functest: run $FUNCTEST_SUITE_NAME"
-            cmd="${FUNCTEST_REPO_DIR}/docker/run_tests.sh --test $FUNCTEST_SUITE_NAME ${flag}"
+            cmd="${FUNCTEST_REPO_DIR}/docker/run_tests.sh --test $FUNCTEST_SUITE_NAME ${flags}"
             container_id=$(docker ps -a | grep opnfv/functest | awk '{print $1}' | head -1)
             docker exec $container_id $cmd
 
@@ -226,11 +230,9 @@
         - shell: |
             #!/bin/bash
             set +e
-            flag=""
-            if [ "${PUSH_RESULTS_TO_DB}" == "true" ]; then
-                flag="-r"
-            fi
-            cmd="${FUNCTEST_REPO_DIR}/docker/run_tests.sh ${flag}"
+            flags="-s"
+            [[ "$PUSH_RESULTS_TO_DB" == "true" ]] && flags+=" -r"
+            cmd="${FUNCTEST_REPO_DIR}/docker/run_tests.sh ${flags}"
             container_id=$(docker ps -a | grep opnfv/functest | awk '{print $1}' | head -1)
             docker exec $container_id $cmd
 
@@ -260,7 +262,7 @@
             echo "Functest: Start Docker and prepare environment"
             envs="-e INSTALLER_TYPE=${INSTALLER_TYPE} -e INSTALLER_IP=${INSTALLER_IP} \
                 -e NODE_NAME=${NODE_NAME} -e DEPLOY_SCENARIO=${DEPLOY_SCENARIO} \
-                -e CI_DEBUG=${CI_DEBUG}"
+                -e BUILD_TAG=${BUILD_TAG} -e CI_DEBUG=${CI_DEBUG}"
             branch=${GIT_BRANCH##*/}
             dir_result="${HOME}/opnfv/functest/results/${branch}"
             mkdir -p ${dir_result}