summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTim Rozet <trozet@redhat.com>2018-07-25 11:14:35 -0400
committerTim Rozet <trozet@redhat.com>2018-07-25 11:14:35 -0400
commit7815be76119cc79e187b3a3014778475c9c56f73 (patch)
treeeba2444e3f1f1c37174117e34f5ba1cfd838dc46
parent2d19c30a4d2c8d67b38fce6ba8ed110e076c1295 (diff)
CPERF: Upload cirros image for CSIT
CSIT does not have the ability to upload cirros image yet, so this patch uploads it to the overcloud as a workaround. Change-Id: I277e37ae28d613771969dca984ef8692e1312fbd Signed-off-by: Tim Rozet <trozet@redhat.com>
-rw-r--r--jjb/cperf/cirros-upload.yaml.ansible17
-rwxr-xr-xjjb/cperf/cperf-robot-netvirt-csit.sh7
2 files changed, 23 insertions, 1 deletions
diff --git a/jjb/cperf/cirros-upload.yaml.ansible b/jjb/cperf/cirros-upload.yaml.ansible
new file mode 100644
index 000000000..bdf5c55c0
--- /dev/null
+++ b/jjb/cperf/cirros-upload.yaml.ansible
@@ -0,0 +1,17 @@
+---
+- hosts: all
+ tasks:
+ - copy:
+ src: "{{ item }}"
+ dest: "/home/heat-admin/{{ item }}"
+ owner: heat-admin
+ group: heat-admin
+ mode: 0775
+ with_items:
+ - cirros-0.3.5-x86_64-disk.img
+ - overcloudrc
+ - name: Upload cirros glance image
+ shell: >
+ source /home/heat-admin/overcloudrc && openstack image create cirros
+ --public --file /home/heat-admin/cirros-0.3.5-x86_64-disk.img
+ --disk-format qcow2 --container-format bare
diff --git a/jjb/cperf/cperf-robot-netvirt-csit.sh b/jjb/cperf/cperf-robot-netvirt-csit.sh
index 4c4f47732..9abb4ad7f 100755
--- a/jjb/cperf/cperf-robot-netvirt-csit.sh
+++ b/jjb/cperf/cperf-robot-netvirt-csit.sh
@@ -66,6 +66,11 @@ else
-v NODE_FREEZE_COMMAND:\"sudo docker stop opendaylight_api\" "
fi
+# FIXME(trozet) remove this once it is fixed in csit
+# Upload glance image into openstack
+wget -O ${WORKSPACE}/cirros-0.3.5-x86_64-disk.img http://download.cirros-cloud.net/0.3.5/cirros-0.3.5-x86_64-disk.img
+ansible-playbook -i ${CONTROLLER_1_IP}, -u heat-admin --key-file ${WORKSPACE}/id_rsa ${REL_PATH}/cirros-upload.yaml.ansible -vvv
+
LOGS_LOCATION=/tmp/robot_results
robot_cmd="pybot \
@@ -121,4 +126,4 @@ docker run -i --net=host \
UPLOAD_LOCATION=artifacts.opnfv.org/cperf/cperf-apex-csit-${ODL_BRANCH}/${BUILD_NUMBER}/
echo "Uploading robot logs to ${UPLOAD_LOCATION}"
-gsutil -m cp -r -v ${LOGS_LOCATION} gs://${UPLOAD_LOCATION} > gsutil.latest_logs.log \ No newline at end of file
+gsutil -m cp -r -v ${LOGS_LOCATION} gs://${UPLOAD_LOCATION} > gsutil.latest_logs.log