summaryrefslogtreecommitdiffstats
path: root/jjb
diff options
context:
space:
mode:
Diffstat (limited to 'jjb')
-rw-r--r--jjb/bottlenecks/bottlenecks-ci-jobs.yml2
-rw-r--r--jjb/cperf/cperf-ci-jobs.yml33
-rw-r--r--jjb/functest/functest-ci-jobs.yml3
-rw-r--r--jjb/yardstick/yardstick-ci-jobs.yml2
4 files changed, 37 insertions, 3 deletions
diff --git a/jjb/bottlenecks/bottlenecks-ci-jobs.yml b/jjb/bottlenecks/bottlenecks-ci-jobs.yml
index 801de4a5b..991497a31 100644
--- a/jjb/bottlenecks/bottlenecks-ci-jobs.yml
+++ b/jjb/bottlenecks/bottlenecks-ci-jobs.yml
@@ -66,7 +66,7 @@
<<: *master
- zte-pod1:
installer: fuel
- disabled: false
+ disabled: true
<<: *master
- orange-pod2:
installer: joid
diff --git a/jjb/cperf/cperf-ci-jobs.yml b/jjb/cperf/cperf-ci-jobs.yml
index 05f4d1946..884352419 100644
--- a/jjb/cperf/cperf-ci-jobs.yml
+++ b/jjb/cperf/cperf-ci-jobs.yml
@@ -105,6 +105,12 @@
- builder:
name: cperf-daily-builder
builders:
+ - 'cperf-cleanup'
+ - 'cperf-robot-cbench'
+
+- builder:
+ name: cperf-robot-cbench
+ builders:
- shell: |
#!/bin/bash
set +e
@@ -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/functest/functest-ci-jobs.yml b/jjb/functest/functest-ci-jobs.yml
index bbdba9fa3..2a788f6ec 100644
--- a/jjb/functest/functest-ci-jobs.yml
+++ b/jjb/functest/functest-ci-jobs.yml
@@ -100,6 +100,9 @@
- arm-pod1:
installer: fuel
<<: *master
+ - zte-pod1:
+ installer: fuel
+ <<: *master
#--------------------------------
testsuite:
diff --git a/jjb/yardstick/yardstick-ci-jobs.yml b/jjb/yardstick/yardstick-ci-jobs.yml
index 82b1a2367..e241cbeef 100644
--- 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