Updated prow Dockerfile for newer versions and defined new variables

Updated prow Dockerfile for newer versions and defined new variables

Updated prow Dockerfile for newer versions and defined new variables

Author: Arpit Sharma

Dockerfile

@@ -8,7 +8,9 @@ RUN dnf group install -y "Development Tools" \
     && dnf install -y podman jq
 
 # Prerequisite for Python installation
-ARG python_full_version=3.14.0
+ARG python_version=3.14
+ARG python_full_version=${python_version}.0
+ENV PYTHON_VERSION=${python_version}
 RUN dnf install -y openssl-devel bzip2-devel wget libffi-devel
 
 # Install Python
@@ -17,11 +19,12 @@ RUN wget https://www.python.org/ftp/python/${python_full_version}/Python-${pytho
     && cd Python-${python_full_version} \
     && ./configure --enable-optimizations \
     && make altinstall \
-    && echo alias python=python3.14 >> ~/.bashrc \
-    && rm -rf Python-${python_full_version}.tgz
+    && echo alias python=python${python_version} >> ~/.bashrc \
+    && cd .. \
+    && rm -rf Python-${python_full_version} Python-${python_full_version}.tgz
 
 # install & run benchmark-runner (--no-cache-dir for take always the latest)
-RUN python3.14 -m pip install --upgrade pip && python3.14 -m pip install --upgrade benchmark-runner
+RUN python${python_version} -m pip install --upgrade pip && python${python_version} -m pip install --upgrade benchmark-runner
 
 # Passed dynamically
 ARG OCP_CLIENT_VERSION
@@ -43,10 +46,12 @@ RUN source ~/.bashrc
 RUN mkdir -p ~/.kube ~/.ssh /tmp/run_artifacts
 
 # download benchmark-operator to /tmp default path
-RUN git clone -b v1.0.4 https://github.com/cloud-bulldozer/benchmark-operator /tmp/benchmark-operator
+ARG BENCHMARK_OPERATOR_VERSION=v1.0.4
+RUN git clone -b ${BENCHMARK_OPERATOR_VERSION} https://github.com/cloud-bulldozer/benchmark-operator /tmp/benchmark-operator
 
 # download clusterbuster to /tmp default path && install cluster-buster dependency
-RUN git clone -b v1.2.2-kata-ci https://github.com/RobertKrawitz/OpenShift4-tools /tmp/OpenShift4-tools \
+ARG OPENSHIFT4_TOOLS_VERSION=v1.2.2-kata-ci
+RUN git clone -b ${OPENSHIFT4_TOOLS_VERSION} https://github.com/RobertKrawitz/OpenShift4-tools /tmp/OpenShift4-tools \
     && dnf install -y hostname bc procps-ng
 
 # Cleanup to reduce image size
@@ -55,8 +60,8 @@ RUN dnf clean all && rm -rf /var/cache/dnf
 # Add main
 COPY benchmark_runner/main/main.py /benchmark_runner/main/main.py
 
-CMD [ "python3.14", "/benchmark_runner/main/main.py"]
+CMD python${PYTHON_VERSION} /benchmark_runner/main/main.py
 
 # How to build the Dockerfile ?
-# sudo podman build --build-arg OCP_CLIENT_VERSION=$OCP_CLIENT_VERSION--build-arg VIRTCTL_VERSION=$VIRTCTL_VERSION -t quay.io/benchmark-runner/benchmark-runner:latest . --no-cache
+# sudo podman build --build-arg OCP_CLIENT_VERSION=$OCP_CLIENT_VERSION --build-arg VIRTCTL_VERSION=$VIRTCTL_VERSION --build-arg BENCHMARK_OPERATOR_VERSION=$BENCHMARK_OPERATOR_VERSION --build-arg OPENSHIFT4_TOOLS_VERSION=$OPENSHIFT4_TOOLS_VERSION -t quay.io/benchmark-runner/benchmark-runner:latest . --no-cache
 # sudo podman run --rm -it -v /root/.kube/:/root/.kube/ -v /etc/hosts:/etc/hosts --privileged quay.io/benchmark-runner/benchmark-runner:latest /bin/bash

prow/Dockerfile

@@ -1,8 +1,11 @@
 FROM quay.io/centos/centos:stream9
 
-ARG python_full_version=3.14.0
-ARG OCP_CLIENT_VERSION=4.19.1
-ARG VIRTCTL_VERSION=1.5.0
+ARG python_version=3.14
+ARG python_full_version=${python_version}.0
+ARG OCP_CLIENT_VERSION=4.21.2
+ARG VIRTCTL_VERSION=1.7.0
+ARG BENCHMARK_OPERATOR_VERSION=v1.0.4
+ARG OPENSHIFT4_TOOLS_VERSION=v1.2.2-kata-ci
 
 RUN dnf update -y --nobest \
     && dnf group install -y "Development Tools" \
@@ -12,11 +15,11 @@ RUN dnf update -y --nobest \
     && cd Python-${python_full_version} \
     && ./configure --enable-optimizations \
     && make altinstall \
-    && echo alias python=python3.14 >> ~/.bashrc \
+    && echo alias python=python${python_version} >> ~/.bashrc \
     && cd .. \
     && rm -rf Python-${python_full_version} Python-${python_full_version}.tgz \
-    && python3.14 -m pip install --upgrade pip \
-    && python3.14 -m pip install --upgrade benchmark-runner \
+    && python${python_version} -m pip install --upgrade pip \
+    && python${python_version} -m pip install --upgrade benchmark-runner \
     && curl -L "https://mirror.openshift.com/pub/openshift-v4/clients/ocp/${OCP_CLIENT_VERSION}/openshift-client-linux-${OCP_CLIENT_VERSION}.tar.gz" -o "/tmp/openshift-client-linux-${OCP_CLIENT_VERSION}.tar.gz" \
     && tar -xzvf /tmp/openshift-client-linux-${OCP_CLIENT_VERSION}.tar.gz -C /tmp/ \
     && mv /tmp/kubectl /usr/local/bin/kubectl \
@@ -25,8 +28,8 @@ RUN dnf update -y --nobest \
     && curl -L "https://github.com/kubevirt/kubevirt/releases/download/v${VIRTCTL_VERSION}/virtctl-v${VIRTCTL_VERSION}-linux-amd64" -o /usr/local/bin/virtctl \
     && chmod +x /usr/local/bin/virtctl \
     && mkdir -p ~/.kube ~/.ssh /tmp/run_artifacts \
-    && git clone -b v1.0.4 https://github.com/cloud-bulldozer/benchmark-operator /tmp/benchmark-operator \
-    && git clone -b v1.2.2-kata-ci https://github.com/RobertKrawitz/OpenShift4-tools /tmp/OpenShift4-tools \
+    && git clone -b ${BENCHMARK_OPERATOR_VERSION} https://github.com/cloud-bulldozer/benchmark-operator /tmp/benchmark-operator \
+    && git clone -b ${OPENSHIFT4_TOOLS_VERSION} https://github.com/RobertKrawitz/OpenShift4-tools /tmp/OpenShift4-tools \
     && dnf clean all \
     && rm -rf /var/cache/dnf