diff options
Diffstat (limited to 'jjb/functest/functest.yml')
| -rw-r--r-- | jjb/functest/functest.yml | 56 |
1 files changed, 4 insertions, 52 deletions
diff --git a/jjb/functest/functest.yml b/jjb/functest/functest.yml index f6cd15cac..96b770ba2 100644 --- a/jjb/functest/functest.yml +++ b/jjb/functest/functest.yml @@ -57,8 +57,6 @@ - job-template: name: set-functest-env-{pod} - project-type: freestyle - node: '{pod}' logrotate: @@ -70,13 +68,9 @@ builders: - 'set-functest-env' - - - job-template: name: clean-functest-env-{pod} - project-type: freestyle - node: '{pod}' logrotate: @@ -88,12 +82,9 @@ builders: - 'functest-cleanup' - - job-template: name: set-functest-env-{installer}-{stream} - project-type: freestyle - node: '{node}' logrotate: @@ -105,12 +96,9 @@ builders: - 'set-functest-env' - - job-template: name: clean-functest-env-{installer}-{stream} - project-type: freestyle - node: '{node}' logrotate: @@ -125,8 +113,6 @@ - job-template: name: functest-openstack-bench-test-{pod} - project-type: freestyle - node: '{pod}' logrotate: @@ -138,12 +124,9 @@ builders: - 'functest-rally-bench' - - job-template: name: functest-openstack-tempest-smoke-test-{pod} - project-type: freestyle - node: '{pod}' logrotate: @@ -158,8 +141,6 @@ - job-template: name: functest-odl-test-{pod} - project-type: freestyle - node: '{pod}' logrotate: @@ -172,12 +153,9 @@ - shell: | - 'functest-odl' - - job-template: name: functest-vping-test-{pod} - project-type: freestyle - node: '{pod}' logrotate: @@ -189,12 +167,9 @@ builders: - 'functest-vping' - - job-template: name: functest-{pod} - project-type: freestyle - node: '{pod}' parameters: @@ -232,8 +207,6 @@ - job-template: name: functest-{installer}-{stream} - project-type: freestyle - node: '{node}' parameters: @@ -274,8 +247,6 @@ - job-template: name: functest-vims-{installer}-{stream} - project-type: freestyle - node: '{node}' parameters: @@ -313,15 +284,12 @@ - job-template: name: 'functest-daily-{stream}' - node: master - # Job template for daily builders # # Required Variables: # stream: branch with - in place of / (eg. stable) # branch: branch (eg. stable) - project-type: freestyle varsetabove: '{somevar}' logrotate: @@ -358,10 +326,6 @@ - job-template: name: 'functest-verify-{stream}' - node: master - - project-type: freestyle - logrotate: daysToKeep: 30 numToKeep: 10 @@ -405,14 +369,10 @@ - job-template: name: 'functest-merge-{stream}' - node: master - # builder-merge job to run JJB update # # This job's purpose is to update all the JJB - project-type: freestyle - logrotate: daysToKeep: 30 numToKeep: 40 @@ -515,7 +475,6 @@ container_id=$(docker ps -a | grep opnfv/functest | awk '{print $1}' | head -1) docker exec $container_id $cmd - - builder: name: set-functest-env builders: @@ -552,7 +511,6 @@ echo "Executing command inside the docker: ${cmd}" docker exec ${container_id} ${cmd} - - builder: name: functest-vping builders: @@ -590,8 +548,6 @@ container_id=$(docker ps -a | grep opnfv/functest | awk '{print $1}' | head -1) docker exec $container_id $cmd - - - builder: name: functest-rally-bench builders: @@ -604,7 +560,6 @@ container_id=$(docker ps -a | grep opnfv/functest | awk '{print $1}' | head -1) docker exec $container_id $cmd - - builder: name: functest-vims builders: @@ -617,8 +572,6 @@ container_id=$(docker ps -a | grep opnfv/functest | awk '{print $1}' | head -1) docker exec $container_id $cmd - - - builder: name: functest-store-results builders: @@ -636,17 +589,16 @@ # 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 - docker ps -a | grep opnfv/functest | awk '{{print $1}}' | xargs docker rm + docker ps | grep opnfv/functest | awk '{print $1}' | xargs docker stop + docker ps -a | grep opnfv/functest | awk '{print $1}' | xargs docker rm fi - # 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 - image_tags=($(docker images | grep opnfv/functest | awk '{{print $2}}')) - for tag in "${{image_tags[@]}}"; do + 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 done |