diff options
| author |   jose.lausuch <jose.lausuch@ericsson.com> | 2016-04-21 14:42:43 +0200 |
|---|---|---|
| committer | jose.lausuch <jose.lausuch@ericsson.com> | 2016-04-21 14:42:43 +0200 |
| commit | b207face83b614cd7a63e6caafd26d021e910cbe (patch) | |
| tree | ddd91c0de1f501833525639771da1e15139a6629 | |
| parent | b0c0366a5747c03365bc96c6ae5e1f7c3dc7a618 (diff) | |
Use only functest-{testsuite}-builder for the installer daily job builder
Change-Id: I29b7f0537bce698d57ece88abf1b148954a76dc0
Signed-off-by: jose.lausuch <jose.lausuch@ericsson.com>
| -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 1e16fcfb8..b7a75e836 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' ######################## @@ -287,7 +285,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}" @@ -299,7 +297,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 @@ -331,7 +329,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..." |