diff options
| -rw-r--r-- | jjb/functest/functest-ci-jobs.yml | 12 | ||||
| -rw-r--r-- | jjb/yardstick/yardstick-ci-jobs.yml | 13 |
2 files changed, 12 insertions, 13 deletions
diff --git a/jjb/functest/functest-ci-jobs.yml b/jjb/functest/functest-ci-jobs.yml index 1d43e987d..ee6e7d6b7 100644 --- a/jjb/functest/functest-ci-jobs.yml +++ b/jjb/functest/functest-ci-jobs.yml @@ -188,8 +188,7 @@ - shell: | #!/bin/bash set +e - [[ $CI_DEBUG == true ]] && redirect="" || redirect=">/dev/null" - + [[ $CI_DEBUG == true ]] && redirect="/dev/stdout" || redirect="/dev/null" # labconfig is used only for joid labconfig="" if [[ ${INSTALLER_TYPE} == 'apex' ]]; then @@ -216,7 +215,7 @@ rm -rf ${dir_result}/* res_volume="-v ${dir_result}:/home/opnfv/functest/results" - docker pull opnfv/functest:latest_stable $redirect + docker pull opnfv/functest:latest_stable >$redirect cmd="sudo docker run --privileged=true -id ${envs} ${labconfig} ${sshkey} ${res_volume} opnfv/functest:latest_stable /bin/bash" echo "Functest: Running docker run command: ${cmd}" ${cmd} @@ -252,14 +251,13 @@ builders: - shell: | #!/bin/bash - [[ $CI_DEBUG == true ]] && redirect="" || redirect=">/dev/null" + [[ $CI_DEBUG == true ]] && redirect="/dev/stdout" || redirect="/dev/null" echo "Cleaning up docker containers/images..." # Remove previous running containers if exist if [[ ! -z $(docker ps -a | grep opnfv/functest) ]]; then echo "Removing existing opnfv/functest containers..." - docker ps | grep opnfv/functest | awk '{print $1}' | xargs docker stop $redirect - docker ps -a | grep opnfv/functest | awk '{print $1}' | xargs docker rm $redirect + docker ps -a | grep opnfv/functest | awk '{print $1}' | xargs docker rm -f >$redirect fi # Remove existing images if exist @@ -269,6 +267,6 @@ image_tags=($(docker images | grep opnfv/functest | awk '{print $2}')) for tag in "${image_tags[@]}"; do echo "Removing docker image opnfv/functest:$tag..." - docker rmi opnfv/functest:$tag $redirect + docker rmi opnfv/functest:$tag >$redirect done fi diff --git a/jjb/yardstick/yardstick-ci-jobs.yml b/jjb/yardstick/yardstick-ci-jobs.yml index 0678ef0ef..5159d3026 100644 --- a/jjb/yardstick/yardstick-ci-jobs.yml +++ b/jjb/yardstick/yardstick-ci-jobs.yml @@ -117,7 +117,7 @@ - shell: | #!/bin/bash set -e - [[ $CI_DEBUG == true ]] && redirect="" || redirect=">/dev/null" + [[ $CI_DEBUG == true ]] && redirect="/dev/stdout" || redirect="/dev/null" # labconfig is used only for joid labconfig="" @@ -141,7 +141,7 @@ envs="-e INSTALLER_TYPE=${INSTALLER_TYPE} -e INSTALLER_IP=${INSTALLER_IP} -e NODE_NAME=${NODE_NAME} -e EXTERNAL_NETWORK=${EXTERNAL_NETWORK} -e YARDSTICK_BRANCH=${GIT_BRANCH##origin/}" # Pull the latest image - docker pull opnfv/yardstick $redirect + docker pull opnfv/yardstick >$redirect # Run docker cmd="sudo docker run ${opts} ${envs} ${labconfig} ${sshkey} opnfv/yardstick run_tests.sh ${YARDSTICK_DB_BACKEND} ${YARDSTICK_SUITE_NAME}" @@ -161,14 +161,14 @@ builders: - shell: | #!/bin/bash - [[ $CI_DEBUG == true ]] && redirect="" || redirect=">/dev/null" + [[ $CI_DEBUG == true ]] && redirect="/dev/stdout" || redirect="/dev/null" echo "Cleaning up docker containers/images..." # Remove previous running containers if exist if [[ ! -z $(docker ps -a | grep opnfv/yardstick) ]]; then echo "Removing existing opnfv/yardstick containers..." - docker ps | grep opnfv/yardstick | awk '{print $1}' | xargs docker stop $redirect - docker ps -a | grep opnfv/yardstick | awk '{print $1}' | xargs docker rm $redirect + docker ps -a | grep opnfv/yardstick | awk '{print $1}' | xargs docker rm -f >$redirect + fi # Remove existing images if exist @@ -178,7 +178,8 @@ image_tags=($(docker images | grep opnfv/yardstick | awk '{print $2}')) for tag in "${image_tags[@]}"; do echo "Removing docker image opnfv/yardstick:$tag..." - docker rmi opnfv/yardstick:$tag $redirect + docker rmi opnfv/yardstick:$tag >$redirect + done fi ######################## |