Merge "Temporarily disable bottlenecks CI job on zte-pod1."

diff --git a/jjb/cperf/cperf-ci-jobs.yml b/jjb/cperf/cperf-ci-jobs.yml
index 05f4d19..8843524 100644 (file)
--- a/jjb/cperf/cperf-ci-jobs.yml
+++ b/jjb/cperf/cperf-ci-jobs.yml
@@ -104,6 +104,12 @@
 ########################
 - builder:
     name: cperf-daily-builder
+    builders:
+        - 'cperf-cleanup'
+        - 'cperf-robot-cbench'
+
+- builder:
+    name: cperf-robot-cbench
     builders:
         - shell: |
             #!/bin/bash
@@ -113,4 +119,29 @@
             robot_cmd="pybot -e exclude -v ODL_SYSTEM_IP:${CONTROLLER_IP} -v switch_count:100 -v loops:10 \
                               -v TOOLS_SYSTEM_IP:localhost -v duration_in_seconds:60"
             robot_suite="/home/opnfv/repos/test/csit/suites/openflowplugin/Performance/010_Cbench.robot"
-            sudo docker run -t -i opnfv/cperf:$DOCKER_TAG ${robot_cmd} ${robot_suite}
+            sudo docker run opnfv/cperf:$DOCKER_TAG ${robot_cmd} ${robot_suite}
+
+- builder:
+    name: cperf-cleanup
+    builders:
+        - shell: |
+            #!/bin/bash
+            [[ $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/cperf) ]]; then
+                echo "Removing existing opnfv/cperf containers..."
+                docker ps -a | grep opnfv/cperf | awk '{print $1}' | xargs docker rm -f >${redirect}
+            fi
+
+            # Remove existing images if exist
+            if [[ ! -z $(docker images | grep opnfv/cperf) ]]; then
+                echo "Docker images to remove:"
+                docker images | head -1 && docker images | grep opnfv/cperf >${redirect}
+                image_tags=($(docker images | grep opnfv/cperf | awk '{print $2}'))
+                for tag in "${image_tags[@]}"; do
+                    echo "Removing docker image opnfv/cperf:$tag..."
+                    docker rmi opnfv/cperf:$tag >/dev/null
+                done
+            fi

diff --git a/jjb/yardstick/yardstick-ci-jobs.yml b/jjb/yardstick/yardstick-ci-jobs.yml
index 82b1a23..e241cbe 100644 (file)
--- a/jjb/yardstick/yardstick-ci-jobs.yml
+++ b/jjb/yardstick/yardstick-ci-jobs.yml
@@ -218,7 +218,7 @@
 
     publishers:
         - email:
-            recipients: ana.cunha@ericsson.com jorgen.w.karlsson@ericsson.com
+            recipients: ana.cunha@ericsson.com
 
 ########################
 # builder macros