Use 0.6.1, 0.6.2 Cirros images instead of 0.5.x
Related-PROD: PROD-37187
Change-Id: Ia3acdbb546e0f2a473fabbe21104a0e47821f101
diff --git a/k8s/rally-files/k8s-mos-scn-i1.yaml b/k8s/rally-files/k8s-mos-scn-i1.yaml
index c14c94a..efe3252 100644
--- a/k8s/rally-files/k8s-mos-scn-i1.yaml
+++ b/k8s/rally-files/k8s-mos-scn-i1.yaml
@@ -1,6 +1,6 @@
{% set image_box = "busybox" %}
{% set image_pause = "mirantis.azurecr.io/general/external/pause:3.1" %}
-{% set image_cirros = "virtlet/download.cirros-cloud.net/0.3.5/cirros-0.3.5-x86_64-disk.img" %}
+{% set image_cirros = "virtlet/download.cirros-cloud.net/0.6.2/cirros-0.6.2-x86_64-disk.img" %}
{% set concurrency = 1 %}
{% set times = 1 %}
{% set replicas = 1 %}
diff --git a/k8s/rally-files/k8s-mos-scn-i100c5.yaml b/k8s/rally-files/k8s-mos-scn-i100c5.yaml
index 137fbbb..c4ad19c 100644
--- a/k8s/rally-files/k8s-mos-scn-i100c5.yaml
+++ b/k8s/rally-files/k8s-mos-scn-i100c5.yaml
@@ -1,7 +1,7 @@
{% set image_box ="127.0.0.1:44301/stacklight/busybox:1.30" %}
{% set image_box = "busybox" %}
{% set image_pause = "mirantis.azurecr.io/general/external/pause:3.1" %}
-{% set image_cirros = "virtlet/download.cirros-cloud.net/0.3.5/cirros-0.3.5-x86_64-disk.img" %}
+{% set image_cirros = "virtlet/download.cirros-cloud.net/0.6.2/cirros-0.6.2-x86_64-disk.img" %}
{% set concurrency = 5 %}
{% set times = 100 %}
{% set replicas = 1 %}
diff --git a/k8s/rally-files/openstack-mos-scn-i1-static-users.json b/k8s/rally-files/openstack-mos-scn-i1-static-users.json
index 0faa558..23748c1 100644
--- a/k8s/rally-files/openstack-mos-scn-i1-static-users.json
+++ b/k8s/rally-files/openstack-mos-scn-i1-static-users.json
@@ -1,12 +1,12 @@
{% set flavor_name = flavor_name or "cvp.tiny" %}
-{% set image_name = image_name or "cvp.cirros.51" %}
+{% set image_name = image_name or "cvp.cirros.61" %}
{% set availability_zone = "nova" %}
{% set concurrency = 1 %}
{% set volume_size = 1 %}
{% set times = 1 %}
{% set users = 1 %}
{% set tenants = 1 %}
-{% set rbd_image = "http://download.cirros-cloud.net/0.3.4/cirros-0.3.4-x86_64-disk.img" %}
+{% set rbd_image = "https://download.cirros-cloud.net/0.6.2/cirros-0.6.2-x86_64-disk.img" %}
{% set heat_template = "/rally/rally-files/default.yaml.template" %}
{% set fixed_net = "id" %}
diff --git a/k8s/rally-files/openstack-mos-scn-i1.json b/k8s/rally-files/openstack-mos-scn-i1.json
index 74c2ed3..05f6847 100644
--- a/k8s/rally-files/openstack-mos-scn-i1.json
+++ b/k8s/rally-files/openstack-mos-scn-i1.json
@@ -1,12 +1,12 @@
{% set flavor_name = flavor_name or "cvp.tiny" %}
-{% set image_name = image_name or "cvp.cirros.51" %}
+{% set image_name = image_name or "cvp.cirros.61" %}
{% set availability_zone = "nova" %}
{% set concurrency = 1 %}
{% set volume_size = 1 %}
{% set times = 1 %}
{% set users = 1 %}
{% set tenants = 1 %}
-{% set rbd_image = "http://download.cirros-cloud.net/0.3.4/cirros-0.3.4-x86_64-disk.img" %}
+{% set rbd_image = "https://download.cirros-cloud.net/0.6.2/cirros-0.6.2-x86_64-disk.img" %}
{% set heat_template = "/rally/rally-files/default.yaml.template" %}
{% set fixed_net = "id" %}
diff --git a/k8s/rally-files/openstack-mos-scn-i100-static-users.json b/k8s/rally-files/openstack-mos-scn-i100-static-users.json
index 4212372..be45eb8 100644
--- a/k8s/rally-files/openstack-mos-scn-i100-static-users.json
+++ b/k8s/rally-files/openstack-mos-scn-i100-static-users.json
@@ -1,12 +1,12 @@
{% set flavor_name = flavor_name or "cvp.tiny" %}
-{% set image_name = image_name or "cvp.cirros.51" %}
+{% set image_name = image_name or "cvp.cirros.61" %}
{% set availability_zone = "nova" %}
{% set concurrency = 10 %}
{% set volume_size = 1 %}
{% set times = 100 %}
{% set users = 5 %}
{% set tenants = 4 %}
-{% set rbd_image = "http://download.cirros-cloud.net/0.3.4/cirros-0.3.4-x86_64-disk.img" %}
+{% set rbd_image = "https://download.cirros-cloud.net/0.6.2/cirros-0.6.2-x86_64-disk.img" %}
{% set heat_template = "/rally/rally-files/default.yaml.template" %}
{% set fixed_net = "id" %}
diff --git a/k8s/rally-files/openstack-mos-scn-i100.json b/k8s/rally-files/openstack-mos-scn-i100.json
index 169dfcd..4d554fb 100644
--- a/k8s/rally-files/openstack-mos-scn-i100.json
+++ b/k8s/rally-files/openstack-mos-scn-i100.json
@@ -5,9 +5,9 @@
{% set tenants = 3 %}
{% set flavor_name = flavor_name or "cvp.tiny" %}
-{% set image_name = image_name or "cvp.cirros.51" %}
+{% set image_name = image_name or "cvp.cirros.61" %}
{% set availability_zone = "nova" %}
-{% set rbd_image = "http://download.cirros-cloud.net/0.3.4/cirros-0.3.4-x86_64-disk.img" %}
+{% set rbd_image = "https://download.cirros-cloud.net/0.6.2/cirros-0.6.2-x86_64-disk.img" %}
{% set heat_template = "/rally/rally-files/default.yaml.template" %}
{% set fixed_net = "fixed-net-id" %}
diff --git a/k8s/rally-files/openstack-mos-scn.json.clean b/k8s/rally-files/openstack-mos-scn.json.clean
index dd5a4f1..81807c4 100644
--- a/k8s/rally-files/openstack-mos-scn.json.clean
+++ b/k8s/rally-files/openstack-mos-scn.json.clean
@@ -5,9 +5,9 @@
{% set tenants = 3 %}
{% set flavor_name = flavor_name or "cvp.tiny" %}
-{% set image_name = image_name or "cvp.cirros.51" %}
+{% set image_name = image_name or "cvp.cirros.61" %}
{% set availability_zone = "nova" %}
-{% set rbd_image = "http://download.cirros-cloud.net/0.3.4/cirros-0.3.4-x86_64-disk.img" %}
+{% set rbd_image = "https://download.cirros-cloud.net/0.6.2/cirros-0.6.2-x86_64-disk.img" %}
{% set heat_template = "/rally/rally-files/default.yaml.template" %}
{% set fixed_net = "fixed-net-id" %}
diff --git a/k8s/workspace/init-workspace.sh b/k8s/workspace/init-workspace.sh
index 1c49be0..5d7b7e3 100644
--- a/k8s/workspace/init-workspace.sh
+++ b/k8s/workspace/init-workspace.sh
@@ -188,8 +188,8 @@
ewriteln "export TEMPEST_CUSTOM_VOLUME_TYPE=${vVOLTYPE}"
# hardcoded values
ewriteln "# export TEMPEST_CUSTOM_FLAVOR=cvp.tiny"
- ewriteln "# export TEMPEST_CUSTOM_IMAGE=cvp.cirros.51"
- ewriteln "# export TEMPEST_CUSTOM_IMAGE_ALT=cvp.cirros.52"
+ ewriteln "# export TEMPEST_CUSTOM_IMAGE=cvp.cirros.61"
+ ewriteln "# export TEMPEST_CUSTOM_IMAGE_ALT=cvp.cirros.62"
#prepare tempest custom yaml
cp /opt/res-files/k8s/yamls/tempest_custom.yaml.clean $MY_PROJFOLDER/yamls/tempest_custom.yaml
ewriteln 'export TEMPEST_CUSTOM_PARAMETERS=$(cat $MY_PROJFOLDER/yamls/tempest_custom.yaml)'
diff --git a/k8s/workspace/update-openstack-resources.sh b/k8s/workspace/update-openstack-resources.sh
index 4713e04..75d1216 100644
--- a/k8s/workspace/update-openstack-resources.sh
+++ b/k8s/workspace/update-openstack-resources.sh
@@ -34,12 +34,12 @@
echo "# Getting network details"
netid=$(kubectl exec toolset --stdin -n qa-space -- openstack network show ${TEMPEST_CUSTOM_PUBLIC_NET} -c id -f value)
subnetid=$(kubectl exec toolset --stdin -n qa-space -- openstack subnet list -f value | grep ${netid} | cut -d' ' -f1)
-#echo "# image_ref_name -> ${cirros51_name}"
-#sed -i "s/image_ref_name/${cirros51_name}/g" $MY_PROJFOLDER/yamls/tempest_custom.yaml
-#echo "# image_ref_uuid -> ${cirros51_id}"
-#sed -i "s/image_ref_uuid/${cirros51_id}/g" $MY_PROJFOLDER/yamls/tempest_custom.yaml
-#echo "# image_ref_alt_uuid -> ${cirros52_id}"
-#sed -i "s/image_ref_alt_uuid/${cirros52_id}/g" $MY_PROJFOLDER/yamls/tempest_custom.yaml
+#echo "# image_ref_name -> ${cirros61_name}"
+#sed -i "s/image_ref_name/${cirros61_name}/g" $MY_PROJFOLDER/yamls/tempest_custom.yaml
+#echo "# image_ref_uuid -> ${cirros61_id}"
+#sed -i "s/image_ref_uuid/${cirros61_id}/g" $MY_PROJFOLDER/yamls/tempest_custom.yaml
+#echo "# image_ref_alt_uuid -> ${cirros62_id}"
+#sed -i "s/image_ref_alt_uuid/${cirros62_id}/g" $MY_PROJFOLDER/yamls/tempest_custom.yaml
echo "# s/public_subnet_uuid/ -> ${subnetid}"
sed -i "s/public_subnet_uuid/${subnetid}/g" $MY_PROJFOLDER/yamls/tempest_custom.yaml
echo "# s/public_net_uuid/ -> ${netid}"
diff --git a/rally/rally_scenarios.json b/rally/rally_scenarios.json
index 60fd3ee..ad60a15 100644
--- a/rally/rally_scenarios.json
+++ b/rally/rally_scenarios.json
@@ -6,7 +6,7 @@
{% set times = 1 %}
{% set users = 1 %}
{% set tenants = 1 %}
-{% set rbd_image = "http://download.cirros-cloud.net/0.3.4/cirros-0.3.4-x86_64-disk.img" %}
+{% set rbd_image = "https://download.cirros-cloud.net/0.6.2/cirros-0.6.2-x86_64-disk.img" %}
{% set heat_template = "/home/rally/default.yaml.template" %}
{% set fixed_net = "${FIXED_NET}" %}
{
diff --git a/rally/rally_scenarios_100.json b/rally/rally_scenarios_100.json
index 07bac67..fc91542 100644
--- a/rally/rally_scenarios_100.json
+++ b/rally/rally_scenarios_100.json
@@ -6,7 +6,7 @@
{% set times = 100 %}
{% set users = 3 %}
{% set tenants = 3 %}
-{% set rbd_image = "http://download.cirros-cloud.net/0.3.4/cirros-0.3.4-x86_64-disk.img" %}
+{% set rbd_image = "https://download.cirros-cloud.net/0.6.2/cirros-0.6.2-x86_64-disk.img" %}
{% set heat_template = "/home/rally/default.yaml.template" %}
{% set fixed_net = "${FIXED_NET}" %}
{
diff --git a/rally/rally_scenarios_manual_full.json b/rally/rally_scenarios_manual_full.json
index 6856881..0bd5ca9 100644
--- a/rally/rally_scenarios_manual_full.json
+++ b/rally/rally_scenarios_manual_full.json
@@ -9,7 +9,7 @@
{% set times = 100 %}
{% set users = 5 %}
{% set tenants = 10 %}
-{% set rbd_image = "http://download.cirros-cloud.net/0.3.4/cirros-0.3.4-x86_64-disk.img" %}
+{% set rbd_image = "https://download.cirros-cloud.net/0.6.2/cirros-0.6.2-x86_64-disk.img" %}
{% set heat_template = "/home/rally/default.yaml.template" %}
{% set block_migration = true %}
{% set ext_net_name = "<NAME>" %}
diff --git a/rally/task_arguments.yaml b/rally/task_arguments.yaml
index a597545..6a29ca5 100644
--- a/rally/task_arguments.yaml
+++ b/rally/task_arguments.yaml
@@ -38,7 +38,7 @@
cinder_quotas_params: { snapshots: -1, volumes: -1}
# Parameters for Glance
- glance_image_location: "https://download.cirros-cloud.net/0.3.5/cirros-0.3.5-i386-disk.img"
+ glance_image_location: "https://download.cirros-cloud.net/0.6.2/cirros-0.6.2-x86_64-disk.img"
glance_number_nova_servers_to_boot: 2
glance_images_per_tenant_before_benchmarking: 4
diff --git a/scripts/cmp_check.sh b/scripts/cmp_check.sh
index 53df0dd..af85717 100644
--- a/scripts/cmp_check.sh
+++ b/scripts/cmp_check.sh
@@ -125,7 +125,7 @@
function vm_create() {
[ ! "$silent" = true ] && set -x
- openstack server create --nic net-id=${fixed_net_left_id} --image ${cirros51_id} --flavor ${flavor_tiny_id} --key-name ${keypair_id} --security-group ${secgroup_all_id} --availability-zone ${zone}:${1} ${2} 2>${tmp_out} >/dev/null
+ openstack server create --nic net-id=${fixed_net_left_id} --image ${cirros61_id} --flavor ${flavor_tiny_id} --key-name ${keypair_id} --security-group ${secgroup_all_id} --availability-zone ${zone}:${1} ${2} 2>${tmp_out} >/dev/null
#openstack server create --nic net-id=${fixed_net_left_id} --image ${ubuntu16_id} --flavor ${flavor_high_id} --key-name ${keypair_id} --security-group ${secgroup_all_id} --availability-zone ${zone}:${1} ${2} 2>${tmp_out} >/dev/null
#openstack server create --nic net-id=${fixed_net_right_id} --image ${ubuntu16_id} --flavor ${flavor_high_id} --key-name ${keypair_id} --security-group ${secgroup_all_id} --availability-zone ${zone}:${1} ${2} 2>${tmp_out} >/dev/null
#openstack server create --nic net-id=${fixed_net_left_id} --image ${ubuntu20_id} --flavor ${flavor_high_id} --key-name ${keypair_id} --security-group ${secgroup_all_id} --availability-zone ${zone}:${1} ${2} 2>${tmp_out} >/dev/null
diff --git a/scripts/manual_create_signed_images.sh b/scripts/manual_create_signed_images.sh
index ee596b5..269c977 100644
--- a/scripts/manual_create_signed_images.sh
+++ b/scripts/manual_create_signed_images.sh
@@ -1,5 +1,4 @@
#!/bin/bash
-
echo "Preparing certs"
openssl genrsa -out image_key.pem 1024
openssl rsa -pubout -in image_key.pem -out image_key.pem.pub
@@ -16,31 +15,29 @@
echo "Converting images to Raw"
qemu-img convert -f qcow2 -O raw -p cvp.ubuntu.2004 /var/tmp/cvp.ubuntu.2004.raw
qemu-img convert -f qcow2 -O raw -p cvp.ubuntu.1604 /var/tmp/cvp.ubuntu.1604.raw
-qemu-img convert -f qcow2 -O raw -p cvp.cirros.51 /var/tmp/cvp.cirros.51.raw
-qemu-img convert -f qcow2 -O raw -p cvp.cirros.52 /var/tmp/cvp.cirros.52.raw
+qemu-img convert -f qcow2 -O raw -p cvp.cirros.61 /var/tmp/cvp.cirros.61.raw
+qemu-img convert -f qcow2 -O raw -p cvp.cirros.62 /var/tmp/cvp.cirros.62.raw
echo "Signing images"
-openssl dgst -sha256 -sign image_key.pem -sigopt rsa_padding_mode:pss -out cvp.cirros.51.raw.signature /var/tmp/cvp.cirros.51.raw
-openssl dgst -sha256 -sign image_key.pem -sigopt rsa_padding_mode:pss -out cvp.cirros.52.raw.signature /var/tmp/cvp.cirros.52.raw
+openssl dgst -sha256 -sign image_key.pem -sigopt rsa_padding_mode:pss -out cvp.cirros.61.raw.signature /var/tmp/cvp.cirros.61.raw
+openssl dgst -sha256 -sign image_key.pem -sigopt rsa_padding_mode:pss -out cvp.cirros.62.raw.signature /var/tmp/cvp.cirros.62.raw
openssl dgst -sha256 -sign image_key.pem -sigopt rsa_padding_mode:pss -out cvp.ubuntu.1604.raw.signature /var/tmp/cvp.ubuntu.1604.raw
openssl dgst -sha256 -sign image_key.pem -sigopt rsa_padding_mode:pss -out cvp.ubuntu.2004.raw.signature /var/tmp/cvp.ubuntu.2004.raw
-
echo "Generating base64 equivalents"
-base64 -w 0 cvp.cirros.51.raw.signature >cvp.cirros.51.raw.signature.b64
-base64 -w 0 cvp.cirros.52.raw.signature >cvp.cirros.52.raw.signature.b64
+base64 -w 0 cvp.cirros.61.raw.signature >cvp.cirros.61.raw.signature.b64
+base64 -w 0 cvp.cirros.62.raw.signature >cvp.cirros.62.raw.signature.b64
base64 -w 0 cvp.ubuntu.1604.raw.signature >cvp.ubuntu.1604.raw.signature.b64
base64 -w 0 cvp.ubuntu.2004.raw.signature >cvp.ubuntu.2004.raw.signature.b64
-
echo "Exporting vars"
-export cirros51_sign=$(cat cvp.cirros.51.raw.signature.b64)
-export cirros52_sign=$(cat cvp.cirros.52.raw.signature.b64)
+export cirros61_sign=$(cat cvp.cirros.61.raw.signature.b64)
+export cirros62_sign=$(cat cvp.cirros.62.raw.signature.b64)
export ubuntu1604_sign=$(cat cvp.ubuntu.1604.raw.signature.b64)
export ubuntu2004_sign=$(cat cvp.ubuntu.2004.raw.signature.b64)
-echo "Uploading 'cvp.cirros.51.raw.signed''"
-glance image-create --name cvp.cirros.51.raw.signed --container-format bare --disk-format raw --property img_signature="$cirros51_sign" --property img_signature_certificate_uuid="$s_uuid" --property img_signature_hash_method='SHA-256' --property img_signature_key_type='RSA-PSS' < /var/tmp/cvp.cirros.51.raw
-echo "Uploading 'cvp.cirros.52.raw.signed''"
-glance image-create --name cvp.cirros.52.raw.signed --container-format bare --disk-format raw --property img_signature="$cirros52_sign" --property img_signature_certificate_uuid="$s_uuid" --property img_signature_hash_method='SHA-256' --property img_signature_key_type='RSA-PSS' < /var/tmp/cvp.cirros.52.raw
+echo "Uploading 'cvp.cirros.61.raw.signed''"
+glance image-create --name cvp.cirros.61.raw.signed --container-format bare --disk-format raw --property img_signature="$cirros61_sign" --property img_signature_certificate_uuid="$s_uuid" --property img_signature_hash_method='SHA-256' --property img_signature_key_type='RSA-PSS' < /var/tmp/cvp.cirros.61.raw
+echo "Uploading 'cvp.cirros.62.raw.signed''"
+glance image-create --name cvp.cirros.62.raw.signed --container-format bare --disk-format raw --property img_signature="$cirros62_sign" --property img_signature_certificate_uuid="$s_uuid" --property img_signature_hash_method='SHA-256' --property img_signature_key_type='RSA-PSS' < /var/tmp/cvp.cirros.62.raw
echo "Uploading 'cvp.ubuntu.1604.raw.signed''"
glance image-create --name cvp.ubuntu.1604.raw.signed --container-format bare --disk-format raw --property img_signature="$ubuntu1604_sign" --property img_signature_certificate_uuid="$s_uuid" --property img_signature_hash_method='SHA-256' --property img_signature_key_type='RSA-PSS' < /var/tmp/cvp.ubuntu.1604.raw
echo "Uploading 'cvp.ubuntu.2004.raw.signed''"
diff --git a/scripts/prepare.sh b/scripts/prepare.sh
index 2a34583..bc43263 100644
--- a/scripts/prepare.sh
+++ b/scripts/prepare.sh
@@ -38,16 +38,14 @@
# Router
router=${name_prefix}.router
-# Images: cirros (3.5, 4.0), ubuntu (16.04)
-cirros51=${name_prefix}.cirros.51
-cirros52=${name_prefix}.cirros.52
+# Images: cirros (6.0, 6.2), ubuntu (16.04, 20.04)
+cirros61=${name_prefix}.cirros.61
+cirros62=${name_prefix}.cirros.62
ubuntu16=${name_prefix}.ubuntu.1604
ubuntu20=${name_prefix}.ubuntu.2004
-#cirros3_link=http://download.cirros-cloud.net/0.3.5/cirros-0.3.5-x86_64-disk.img
-#cirros4_link=http://download.cirros-cloud.net/0.4.0/cirros-0.4.0-aarch64-disk.img
-cirros51_link=https://download.cirros-cloud.net/0.5.1/cirros-0.5.1-x86_64-disk.img
-cirros52_link=https://download.cirros-cloud.net/0.5.2/cirros-0.5.2-x86_64-disk.img
+cirros61_link=https://download.cirros-cloud.net/0.6.1/cirros-0.6.1-x86_64-disk.img
+cirros62_link=https://download.cirros-cloud.net/0.6.2/cirros-0.6.2-x86_64-disk.img
ubuntu16_link=https://cloud-images.ubuntu.com/xenial/current/xenial-server-cloudimg-amd64-disk1.img
ubuntu20_link=https://cloud-images.ubuntu.com/focal/current/focal-server-cloudimg-amd64.img
@@ -147,10 +145,10 @@
put volume_id $(ol1 volume ${volume})
# images
- put cirros51_name ${cirros51}
- put cirros51_id $(ol1 image ${cirros51})
- put cirros52_name ${cirros52}
- put cirros52_id $(ol1 image ${cirros52})
+ put cirros61_name ${cirros61}
+ put cirros61_id $(ol1 image ${cirros61})
+ put cirros62_name ${cirros62}
+ put cirros62_id $(ol1 image ${cirros62})
put ubuntu16_name ${ubuntu16}
put ubuntu16_id $(ol1 image ${ubuntu16})
put ubuntu20_name ${ubuntu20}
@@ -403,8 +401,8 @@
create_fixed_nets
# images
-create_image cirros51
-create_image cirros52
+create_image cirros61
+create_image cirros62
create_image ubuntu16
create_image ubuntu20
diff --git a/tempest/tempest_ext.conf b/tempest/tempest_ext.conf
index 6a18040..e095319 100644
--- a/tempest/tempest_ext.conf
+++ b/tempest/tempest_ext.conf
@@ -35,7 +35,7 @@
fixed_subnet_name = cvp.subnet.1
disable_ssl_certificate_validation = True
image_ref = cvp.tiny
-minimal_image_ref = cvp.cirros.35
+minimal_image_ref = cvp.cirros.61
fixed_network_name = cvp.net.1
build_timeout = 180
ssh_timeout = 30