Initial version of the k0rdent toolset
Main changes:
* fixed init-workspace.sh to be executed on k0rdent
* fixed running of cfg-checker for nets and pings
* removed some openstack-related scripts
* created the Dockerfile docker-container-toolset-full
Related-PROD: K0RQA-15
Change-Id: Ib57a3b2a1d47e3a0f48951eb3def71839322a46d
diff --git a/k8s/docker-mos-toolset-full b/k8s/docker-mos-toolset-full
index 6e17739..7f2bd4c 100644
--- a/k8s/docker-mos-toolset-full
+++ b/k8s/docker-mos-toolset-full
@@ -10,11 +10,11 @@
apt-get download $(apt-cache depends --recurse --no-recommends --no-suggests --no-conflicts --no-breaks --no-replaces --no-enhances iperf3 iperf fio nfs-utils | grep "^\w" | sort -u) || true && \
rm -rf /var/lib/apt/lists/*
-FROM mirantis.azurecr.io/openstack/heat:caracal-jammy-20250314195424
+FROM ubuntu:22.04
LABEL maintainer="qa-ps@mirantis.com"
-ADD k8s/src/si-tests.tgz /opt/si-tests/
+ADD k8s/src/ksi.tgz /opt/ksi/
ADD k8s/src/mos-checker.tgz /opt/cfg-checker/
WORKDIR /opt
@@ -22,27 +22,27 @@
COPY --from=download-packages-1804 /opt/packages-1804 /opt/packages-1804
RUN apt-get clean && apt-get update && \
- apt-get install -y make gcc g++ git libaio-dev libaio1 zlib1g-dev fio && \
- mkdir /opt/density && \
+ apt-get install -y make gcc g++ git libaio-dev libaio1 zlib1g-dev software-properties-common fio && \
rm -rf /var/lib/apt/lists/*
RUN export TZ="America/Chicago" && \
ln -snf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone && \
+ add-apt-repository ppa:rmescandon/yq && \
apt-get clean && apt-get update && \
- apt-get install -y python3-pip python3-venv vim git iperf3 iperf mtr htop iputils-ping traceroute tcpdump wget iproute2 curl screen qemu-utils jq && \
+ apt-get install -y python3-pip python3-venv vim git iperf3 iperf mtr htop iputils-ping traceroute tcpdump wget iproute2 curl screen qemu-utils jq yq && \
rm -rf /var/lib/apt/lists/*
RUN apt-get update && \
- curl https://baltocdn.com/helm/signing.asc | apt-key add - && \
- apt-get install apt-transport-https --yes && \
- echo "deb https://baltocdn.com/helm/stable/debian/ all main" | tee /etc/apt/sources.list.d/helm-stable-debian.list && \
+ apt-get install curl gpg apt-transport-https --yes && \
+ curl -fsSL https://packages.buildkite.com/helm-linux/helm-debian/gpgkey | gpg --dearmor | tee /usr/share/keyrings/helm.gpg > /dev/null && \
+ echo "deb [signed-by=/usr/share/keyrings/helm.gpg] https://packages.buildkite.com/helm-linux/helm-debian/any/ any main" | tee /etc/apt/sources.list.d/helm-stable-debian.list && \
apt-get update && \
apt-get install -y helm && \
rm -rf /var/lib/apt/lists/*
RUN pip3 install --no-cache-dir pyghmi tempestparser
-RUN git clone https://gerrit.mcp.mirantis.com/mcp/cvp-configuration -b 25.1-caracal /opt/res-files && \
+RUN git clone --single-branch https://gerrit.mcp.mirantis.com/mcp/cvp-configuration -b k0rdent /opt/res-files && \
cd /opt/cfg-checker && \
python3 -m venv .checkervenv && \
. .checkervenv/bin/activate && \
@@ -56,9 +56,9 @@
rm -rf /opt/res-files/.git && \
rm -rf /opt/cfg-checker/.git
-RUN cd /opt/si-tests/ && \
- python3 -m venv .sivenv && \
- . .sivenv/bin/activate && \
+RUN cd /opt/ksi/ && \
+ python3 -m venv .ksivenv && \
+ . .ksivenv/bin/activate && \
pip3 install --no-cache-dir -r si_tests/requirements.txt && \
deactivate
@@ -73,17 +73,7 @@
pip3 install --no-cache-dir -r requirements.txt && \
deactivate
-ADD k8s/src/openstack-refapp.tgz /opt/density/openstack-refapp/
-
-RUN cd /opt/density/openstack-refapp/ && \
- python3 -m venv .refapp-venv && \
- . .refapp-venv/bin/activate && \
- pip3 install --no-cache-dir -r requirements.txt && \
- deactivate && \
- cp /opt/res-files/scripts/prepare-refapp.sh /opt/density/openstack-refapp/ && \
- cp /opt/res-files/scripts/run-refapp-density.sh /opt/density/openstack-refapp/
-
-RUN printf "LABELS:\n IMAGE_TAG: 25.1-caracal" > /dockerimage_metadata
+RUN printf "LABELS:\n IMAGE_TAG: k0rdent" > /dockerimage_metadata
ENTRYPOINT ["sleep infinite"]