Updated the code for MOSK 23.3 and OS Antelope
* Base the toolset images on heat:antelope-* image
* Toolset images docker file: intall fio with apt
* Use 0.6.1, 0.6.2 Cirros images instead of 0.5.x
Related-PROD: PROD-37187
Change-Id: I9846fea49f3d65baa50d6afe80210f7443e66aec
diff --git a/k8s/docker-mos-toolset-full b/k8s/docker-mos-toolset-full
index 9df8c2d..011e5e6 100644
--- a/k8s/docker-mos-toolset-full
+++ b/k8s/docker-mos-toolset-full
@@ -1,4 +1,4 @@
-FROM mirantis.azurecr.io/openstack/heat:yoga-focal-20230821170130
+FROM mirantis.azurecr.io/openstack/heat:antelope-jammy-20231204144213
LABEL maintainer="qa-ps@mirantis.com"
@@ -6,13 +6,7 @@
ADD ./src/mos-checker.tgz /opt/cfg-checker/
WORKDIR /opt
RUN apt-get update && \
- apt-get install -y make gcc g++ git libaio-dev libaio1 zlib1g-dev && \
- git clone --depth 1 --branch fio-3.26 https://github.com/axboe/fio.git && \
- cd /opt/fio && \
- ./configure && \
- make && \
- make install && \
- rm -rf /opt/fio && \
+ apt-get install -y make gcc g++ git libaio-dev libaio1 zlib1g-dev fio && \
mkdir /opt/density && \
rm -rf /var/lib/apt/lists/*
@@ -32,7 +26,7 @@
RUN pip3 install --no-cache-dir pyghmi tempestparser
-RUN git clone https://gerrit.mcp.mirantis.com/mcp/cvp-configuration -b 23.2-yoga /opt/res-files && \
+RUN git clone https://gerrit.mcp.mirantis.com/mcp/cvp-configuration -b 23.3-antelope /opt/res-files && \
cd /opt/cfg-checker && \
python3 -m venv .checkervenv && \
. .checkervenv/bin/activate && \
@@ -50,7 +44,6 @@
python3 -m venv .sivenv && \
. .sivenv/bin/activate && \
pip3 install --no-cache-dir -r si_tests/requirements.txt && \
- pip3 install urllib3==1.26.16 && \
deactivate
RUN mkdir /opt/packages/ && \
diff --git a/k8s/docker-mos-toolset-min b/k8s/docker-mos-toolset-min
index 9f9065e..28a9f9a 100644
--- a/k8s/docker-mos-toolset-min
+++ b/k8s/docker-mos-toolset-min
@@ -1,4 +1,4 @@
-FROM mirantis.azurecr.io/openstack/heat:yoga-focal-20230821170130
+FROM mirantis.azurecr.io/openstack/heat:antelope-jammy-20231204144213
LABEL maintainer="qa-ps@mirantis.com"
@@ -8,23 +8,14 @@
ln -snf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone && \
apt-get update && \
apt-get install -y make gcc g++ git libaio-dev libaio1 zlib1g-dev && \
- apt-get install -y python3-pip python3-venv vim iperf3 iperf mtr htop iputils-ping traceroute tcpdump wget iproute2 curl screen && \
- git clone --depth 1 --branch fio-3.26 https://github.com/axboe/fio.git && \
- cd /opt/fio && \
- ./configure && \
- make && \
- make install && \
- cd /opt && \
- rm -rf /opt/fio && \
- apt --yes remove gcc g++ && \
- apt autoremove --yes && \
+ apt-get install -y python3-pip python3-venv vim iperf3 iperf mtr htop iputils-ping traceroute tcpdump wget iproute2 curl screen qemu-utils jq && \
rm -rf /var/lib/apt/lists/*
RUN pip3 install --no-cache-dir tempestparser
RUN mkdir /opt/packages/ && \
cd /opt/packages && \
- apt-get download $(apt-cache depends --recurse --no-recommends --no-suggests --no-conflicts --no-breaks --no-replaces --no-enhances iperf3 iperf | grep "^\w" | sort -u) || true
+ apt-get download $(apt-cache depends --recurse --no-recommends --no-suggests --no-conflicts --no-breaks --no-replaces --no-enhances iperf3 iperf fio | grep "^\w" | sort -u) || true
RUN curl -LO "https://dl.k8s.io/release/$(curl -L -s https://dl.k8s.io/release/stable.txt)/bin/linux/amd64/kubectl" && \
install -o root -g root -m 0755 kubectl /usr/local/bin/kubectl && \
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 7b835e7..c25a583 100644
--- a/k8s/workspace/init-workspace.sh
+++ b/k8s/workspace/init-workspace.sh
@@ -171,8 +171,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 ef477ee..1998169 100644
--- a/k8s/workspace/update-openstack-resources.sh
+++ b/k8s/workspace/update-openstack-resources.sh
@@ -32,12 +32,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/k8s/yamls/qa-toolset-bare.yaml b/k8s/yamls/qa-toolset-bare.yaml
index 4d3ff8c..4146d93 100644
--- a/k8s/yamls/qa-toolset-bare.yaml
+++ b/k8s/yamls/qa-toolset-bare.yaml
@@ -13,7 +13,7 @@
#image: savex13/toolset:latest
#image: registry.mirantis.com/osavatieiev/toolset:latest
#image: registry.mirantis.com/professional-services-qa/toolset:latest
- image: registry.mirantis.com/professional-services-qa/toolset:23.2-yoga
+ image: registry.mirantis.com/professional-services-qa/toolset:23.3-antelope
dnsPolicy: ClusterFirst
volumes:
- emptyDir: {}
diff --git a/k8s/yamls/qa-toolset.yaml b/k8s/yamls/qa-toolset.yaml
index a95eeb7..831dcac 100644
--- a/k8s/yamls/qa-toolset.yaml
+++ b/k8s/yamls/qa-toolset.yaml
@@ -68,7 +68,7 @@
#image: 127.0.0.1:44301/general/external/docker.io/library/ubuntu:bionic-20201119
#image: savex13/toolset:latest
#image: registry.mirantis.com/professional-services-qa/toolset:latest
- image: registry.mirantis.com/professional-services-qa/toolset:23.2-yoga
+ image: registry.mirantis.com/professional-services-qa/toolset:23.3-antelope
volumeMounts:
- mountPath: /artifacts
name: qa-pv-a