diff options
| author |   Morgan Richomme <morgan.richomme@orange.com> | 2016-04-22 06:45:47 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@172.30.200.206> | 2016-04-22 06:45:47 +0000 |
| commit | 601570061a2546bf426a8363eb36f8e02236bada (patch) | |
| tree | 46cac26b60254ce9a1c3847b8c877e247d015da2 /jjb | |
| parent | 17fb8572b65e6e155d752380ee2a29724bcc6dc7 (diff) | |
| parent | b207face83b614cd7a63e6caafd26d021e910cbe (diff) | |
Merge "Use only functest-{testsuite}-builder for the installer daily job builder"
Diffstat (limited to 'jjb')
| -rw-r--r-- | jjb/functest/functest-ci-jobs.yml | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/jjb/functest/functest-ci-jobs.yml b/jjb/functest/functest-ci-jobs.yml index 5e1d972c6..a0a1326ba 100644 --- a/jjb/functest/functest-ci-jobs.yml +++ b/jjb/functest/functest-ci-jobs.yml @@ -149,8 +149,6 @@ branch: '{branch}' builders: - - 'functest-cleanup' - - 'set-functest-env' - 'functest-{testsuite}-builder' ######################## @@ -291,7 +289,7 @@ cmd="sudo docker run --privileged=true -id ${envs} ${labconfig} ${sshkey} ${res_volume} opnfv/functest:${DOCKER_TAG} /bin/bash" echo "Functest: Running docker run command: ${cmd}" ${cmd} >${redirect} - docker ps -a + docker ps -a >${redirect} sleep 5 container_id=$(docker ps | grep "opnfv/functest:${DOCKER_TAG}" | awk '{print $1}' | head -1) echo "Container ID=${container_id}" @@ -303,7 +301,7 @@ echo "Starting the container: docker start ${container_id}" docker start ${container_id} sleep 5 - docker ps + docker ps >${redirect} if [ $(docker ps | grep "opnfv/functest:${DOCKER_TAG}" | wc -l) == 0 ]; then echo "The container opnfv/functest with ID=${container_id} has not been properly started. Exiting..." exit 1 @@ -335,7 +333,7 @@ # Remove existing images if exist if [[ ! -z $(docker images | grep opnfv/functest) ]]; then echo "Docker images to remove:" - docker images | head -1 && docker images | grep opnfv/functest + docker images | head -1 && docker images | grep opnfv/functest >${redirect} image_tags=($(docker images | grep opnfv/functest | awk '{print $2}')) for tag in "${image_tags[@]}"; do echo "Removing docker image opnfv/functest:$tag..." |