Update: new test repositories archives, small fix
* refreshed the k8s/src/ test tools archives
* add clean up orphan fio volumes (not attached)
* updated toolset:latest image paths
Related-PROD: PROD-37187
Change-Id: Ie4986775a3c3d6e3f0e5a95142bfefd272e8f1a9
diff --git a/fio/fio_cleanup.py b/fio/fio_cleanup.py
index 753df87..715e01d 100644
--- a/fio/fio_cleanup.py
+++ b/fio/fio_cleanup.py
@@ -14,6 +14,7 @@
FLAVOR_NAME: Final[str] = conn.FIO_FLAVOR_NAME
KEYPAIR_NAME: Final[str] = conn.FIO_KEYPAIR_NAME
SG_NAME: Final[str] = conn.FIO_SG_NAME
+VOL_NAME_MASK: Final[str] = conn.FIO_VOL_NAME_MASK
ROUTER_NAME: Final[str] = conn.FIO_ROUTER_NAME
NET_NAME: Final[str] = conn.FIO_NET_NAME
@@ -36,13 +37,13 @@
" server.")
conn.delete_volume(vol)
print(f"'{vol.id}' volume has been deleted.")
- conn.delete_server(vm)
- print(f"'{vm.name}' server has been deleted.")
except ResourceFailure as e:
print(
f"Cleanup of '{vm.id}' with volume '{vol.id}' attached "
f"failed with '{e.message}' error.")
conn.delete_volume(vol)
+ conn.delete_server(vm)
+ print(f"'{vm.name}' server has been deleted.")
if __name__ == "__main__":
@@ -92,6 +93,13 @@
network.delete_security_group(sg)
print(f"fio '{sg.id}' security group has been deleted.")
+ # Delete the orphan fio volumes which are not attached (if any)
+ volumes = volume.volumes(VOL_NAME_MASK)
+ for v in volumes:
+ if not v.attachments:
+ volume.delete_volume(v.id)
+ print(f"'{v.id}' volume has been deleted.")
+
# Delete fio server group
server_group = compute.find_server_group(
AA_SERVER_GROUP_NAME, all_projects=True)
diff --git a/k8s/docker-mos-toolset-full b/k8s/docker-mos-toolset-full
index 0ce01e3..b825f7f 100644
--- a/k8s/docker-mos-toolset-full
+++ b/k8s/docker-mos-toolset-full
@@ -6,7 +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 && \
+ apt-get install -y sed 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 && \
@@ -49,6 +49,7 @@
RUN cd /opt/si-tests/ && \
python3 -m venv .sivenv && \
. .sivenv/bin/activate && \
+ pip3 install --upgrade setuptools wheel && \
pip3 install --no-cache-dir -r si_tests/requirements.txt && \
deactivate
diff --git a/k8s/src/mos-checker.tgz b/k8s/src/mos-checker.tgz
index 9c7949a..543da28 100644
--- a/k8s/src/mos-checker.tgz
+++ b/k8s/src/mos-checker.tgz
Binary files differ
diff --git a/k8s/src/mos-spt.tgz b/k8s/src/mos-spt.tgz
index 978a9e6..be7571d 100644
--- a/k8s/src/mos-spt.tgz
+++ b/k8s/src/mos-spt.tgz
Binary files differ
diff --git a/k8s/src/si-tests.tgz b/k8s/src/si-tests.tgz
index c5f69a7..a55d434 100644
--- a/k8s/src/si-tests.tgz
+++ b/k8s/src/si-tests.tgz
Binary files differ
diff --git a/k8s/yamls/qa-toolset-bare.yaml b/k8s/yamls/qa-toolset-bare.yaml
index 2a41b98..03ac7d7 100644
--- a/k8s/yamls/qa-toolset-bare.yaml
+++ b/k8s/yamls/qa-toolset-bare.yaml
@@ -10,8 +10,7 @@
- infinity
imagePullPolicy: IfNotPresent
name: toolset
- #image: savex13/toolset:latest
- image: registry.mirantis.com/osavatieiev/toolset:latest
+ image: registry.mirantis.com/professional-services-qa/toolset:latest
dnsPolicy: ClusterFirst
volumes:
- emptyDir: {}
diff --git a/k8s/yamls/qa-toolset.yaml b/k8s/yamls/qa-toolset.yaml
index 8487ac1..d5e92f0 100644
--- a/k8s/yamls/qa-toolset.yaml
+++ b/k8s/yamls/qa-toolset.yaml
@@ -66,8 +66,7 @@
imagePullPolicy: IfNotPresent
name: toolset
#image: 127.0.0.1:44301/general/external/docker.io/library/ubuntu:bionic-20201119
- #image: savex13/toolset:latest
- image: registry.mirantis.com/osavatieiev/toolset:latest
+ image: registry.mirantis.com/professional-services-qa/toolset:latest
volumeMounts:
- mountPath: /artifacts
name: qa-pv-a