Secret OCP and Operators Versions

Author: ebattat

.github/workflows/Perf_Env_Build_Test_CI.yml

@@ -255,10 +255,8 @@ jobs:
         run: |
           pip install setuptools
           version=$(python3 setup.py --version)
-          sudo docker build --build-arg VERSION=$version -t ${{ secrets.QUAY_PRIVATE_BENCHMARK_RUNNER_REPOSITORY }}:v$version .
-          sudo docker build --build-arg VERSION=latest -t ${{ secrets.QUAY_PRIVATE_BENCHMARK_RUNNER_REPOSITORY }}:latest .
+          sudo docker build --build-arg OCP_CLIENT_VERSION=${{ secrets.PERF_OCP_CLIENT_VERSION }} -t ${{ secrets.QUAY_PRIVATE_BENCHMARK_RUNNER_REPOSITORY }}:latest .
           sudo docker login quay.io -u ${{ secrets.QUAY_ROBOT_USER }} -p ${{ secrets.QUAY_ROBOT_PASSWORD }}
-          sudo docker push ${{ secrets.QUAY_PRIVATE_BENCHMARK_RUNNER_REPOSITORY }}:v$version
           sudo docker push ${{ secrets.QUAY_PRIVATE_BENCHMARK_RUNNER_REPOSITORY }}:latest
           echo '⌛ Wait 30 sec till image will be updated in quay.io'
           sleep 30
@@ -278,7 +276,7 @@ jobs:
           python-version: ${{ matrix.python-version }}
       - name: ⌛ Build and Upload 🐋 to quay.io
         run: |
-          sudo docker build --build-arg VERSION=latest -t ${{ secrets.QUAY_BENCHMARK_RUNNER_REPOSITORY }}:latest .
+          sudo docker build --build-arg OCP_CLIENT_VERSION=${{ secrets.PERF_OCP_CLIENT_VERSION }} -t ${{ secrets.QUAY_BENCHMARK_RUNNER_REPOSITORY }}:latest .
           sudo docker login quay.io -u ${{ secrets.QUAY_ROBOT_BENCHMARK_RUNNER_USER }} -p ${{ secrets.QUAY_ROBOT_BENCHMARK_RUNNER_PASSWORD }}
           sudo docker push ${{ secrets.QUAY_BENCHMARK_RUNNER_REPOSITORY }}:latest
           echo '⌛ Wait 30 sec till image will be updated in quay.io'

.github/workflows/Weekly_Perf_Env_Installer_CI.yml

@@ -56,8 +56,8 @@ jobs:
           END
       - name: ▶ OCP assisted installer
         env:
-          INSTALL_OCP_VERSION: "latest-4.17"
-          OCP_CLIENT_VERSION: "4.17.0"
+          INSTALL_OCP_VERSION: ${{ secrets.PERF_INSTALL_OCP_VERSION }}
+          OCP_CLIENT_VERSION: ${{ secrets.PERF_OCP_CLIENT_VERSION }}
           IBM_API_KEY: ${{ secrets.IBM_API_KEY }}
           GIT_TOKEN: ${{ secrets.GIT_TOKEN }}
           WORKER_IDS: ${{ secrets.PERF_WORKER_IDS }}
@@ -80,8 +80,8 @@ jobs:
           echo '>>>>>>>>>>>>>>>>>>>>>>>>>> OCP end step: ${{ matrix.step }}   >>>>>>>>>>>>>>>>>>>>>>>>>>>>'
       - name: ▶ Rerun OCP assisted install after failure
         env:
-          INSTALL_OCP_VERSION: "latest-4.17"
-          OCP_CLIENT_VERSION: "4.17.0"
+          INSTALL_OCP_VERSION: ${{ secrets.PERF_INSTALL_OCP_VERSION }}
+          OCP_CLIENT_VERSION: ${{ secrets.PERF_OCP_CLIENT_VERSION }}
           IBM_API_KEY: ${{ secrets.IBM_API_KEY }}
           GIT_TOKEN: ${{ secrets.GIT_TOKEN }}
           WORKER_IDS: ${{ secrets.PERF_WORKER_IDS }}

.github/workflows/Weekly_Perf_Env_Operator_CI.yml

@@ -77,11 +77,11 @@ jobs:
           sudo tee -a /etc/hosts <<< "$OCP_HOSTS" > /dev/null
       - name: ☉ install ${{ matrix.resource }} Operator
         env:
-          CNV_VERSION: "4.17"
-          ODF_VERSION: "4.17"
-          LSO_VERSION: "4.17"
-          NUM_ODF_DISK: "0"
-          KATA_CSV: ""
+          CNV_VERSION: ${{ secrets.PERF_CNV_VERSION }}
+          ODF_VERSION: ${{ secrets.PERF_ODF_VERSION}}
+          LSO_VERSION: ${{ secrets.PERF_LSO_VERSION }}
+          NUM_ODF_DISK: ${{ secrets.PERF_NUM_ODF_DISK }}
+          KATA_CSV: ${{ secrets.PERF_KATA_VERSION }}
           QUAY_USERNAME: ${{ secrets.QUAY_USERNAME }}
           QUAY_PASSWORD: ${{ secrets.QUAY_PASSWORD }}
           IBM_API_KEY: ${{ secrets.IBM_API_KEY }}

Dockerfile

@@ -1,8 +1,5 @@
 FROM quay.io/centos/centos:stream9
 
-# benchmark-runner latest version
-ARG VERSION
-
 # Update and use not only best candidate packages (avoiding failures)
 RUN dnf update -y --nobest
 
@@ -26,8 +23,8 @@ RUN wget https://www.python.org/ftp/python/${python_full_version}/Python-${pytho
 # install & run benchmark-runner (--no-cache-dir for take always the latest)
 RUN python3.12 -m pip install --upgrade pip && python3.12 -m pip install --upgrade benchmark-runner
 
-# Must update every OCP version !!!
-ARG OCP_CLIENT_VERSION="4.18.0-rc.9"
+# OCP client version passed dynamically
+ARG OCP_CLIENT_VERSION
 RUN  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 \