Skip to content

Commit 65b796c

Browse files
ebattatebattat
authored
Install OCP 4.14.GA (redhat-performance#688)
1 parent 94f0b99 commit 65b796c

5 files changed

+32
-32
lines changed

‎.github/workflows/Perf_Env_Build_Test_CI.yml

+8-8
Original file line numberDiff line numberDiff line change
@@ -67,13 +67,13 @@ jobs:
6767
IBM_BUCKET: ${{ secrets.IBM_BUCKET }}
6868
IBM_KEY: ${{ secrets.IBM_KEY }}
6969
RUN_ARTIFACTS_URL: ${{ secrets.PERF_RUN_ARTIFACTS_URL }}
70-
OC_CLIENT_VERSION: ${{ secrets.PERF_OC_CLIENT_VERSION }}
70+
OCP_CLIENT_VERSION: ${{ secrets.PERF_OCP_CLIENT_VERSION }}
7171
run: |
7272
# Install Dockerfile content for pytest
7373
# install oc/kubectl
74-
curl -L "https://mirror.openshift.com/pub/openshift-v4/clients/ocp/${OC_CLIENT_VERSION}/openshift-client-linux-${OC_CLIENT_VERSION}.tar.gz" -o "$RUNNER_PATH/openshift-client-linux-${OC_CLIENT_VERSION}.tar.gz"
75-
tar -xzvf $RUNNER_PATH/openshift-client-linux-${OC_CLIENT_VERSION}.tar.gz -C $RUNNER_PATH/
76-
rm $RUNNER_PATH/openshift-client-linux-${OC_CLIENT_VERSION}.tar.gz
74+
curl -L "https://mirror.openshift.com/pub/openshift-v4/clients/ocp/${OCP_CLIENT_VERSION}/openshift-client-linux-${OCP_CLIENT_VERSION}.tar.gz" -o "$RUNNER_PATH/openshift-client-linux-${OCP_CLIENT_VERSION}.tar.gz"
75+
tar -xzvf $RUNNER_PATH/openshift-client-linux-${OCP_CLIENT_VERSION}.tar.gz -C $RUNNER_PATH/
76+
rm $RUNNER_PATH/openshift-client-linux-${OCP_CLIENT_VERSION}.tar.gz
7777
cp $RUNNER_PATH/kubectl /usr/local/bin/kubectl
7878
cp $RUNNER_PATH/oc /usr/local/bin/oc
7979
@@ -138,13 +138,13 @@ jobs:
138138
GRAFANA_URL: ${{ secrets.PERF_GRAFANA_URL }}
139139
GRAFANA_API_KEY: ${{ secrets.PERF_GRAFANA_API_KEY }}
140140
GRAFANA_JSON: ${{ secrets.PERF_GRAFANA_JSON }}
141-
OC_CLIENT_VERSION: ${{ secrets.PERF_OC_CLIENT_VERSION }}
141+
OCP_CLIENT_VERSION: ${{ secrets.PERF_OCP_CLIENT_VERSION }}
142142
run: |
143143
# Install Dockerfile content for pytest
144144
# install oc/kubectl
145-
curl -L "https://mirror.openshift.com/pub/openshift-v4/clients/ocp/${OC_CLIENT_VERSION}/openshift-client-linux-${OC_CLIENT_VERSION}.tar.gz" -o "$RUNNER_PATH/openshift-client-linux-${OC_CLIENT_VERSION}.tar.gz"
146-
tar -xzvf $RUNNER_PATH/openshift-client-linux-${OC_CLIENT_VERSION}.tar.gz -C $RUNNER_PATH/
147-
rm $RUNNER_PATH/openshift-client-linux-${OC_CLIENT_VERSION}.tar.gz
145+
curl -L "https://mirror.openshift.com/pub/openshift-v4/clients/ocp/${OCP_CLIENT_VERSION}/openshift-client-linux-${OCP_CLIENT_VERSION}.tar.gz" -o "$RUNNER_PATH/openshift-client-linux-${OCP_CLIENT_VERSION}.tar.gz"
146+
tar -xzvf $RUNNER_PATH/openshift-client-linux-${OCP_CLIENT_VERSION}.tar.gz -C $RUNNER_PATH/
147+
rm $RUNNER_PATH/openshift-client-linux-${OCP_CLIENT_VERSION}.tar.gz
148148
cp $RUNNER_PATH/kubectl /usr/local/bin/kubectl
149149
cp $RUNNER_PATH/oc /usr/local/bin/oc
150150
rm -rf $RUNNER_PATH/kubectl

‎.github/workflows/Perf_Env_PR_Test_CI.yml

+12-12
Original file line numberDiff line numberDiff line change
@@ -78,13 +78,13 @@ jobs:
7878
IBM_BUCKET: ${{ secrets.IBM_BUCKET }}
7979
IBM_KEY: ${{ secrets.IBM_KEY }}
8080
RUN_ARTIFACTS_URL: ${{ secrets.PERF_RUN_ARTIFACTS_URL }}
81-
OC_CLIENT_VERSION: ${{ secrets.PERF_OC_CLIENT_VERSION }}
81+
OCP_CLIENT_VERSION: ${{ secrets.PERF_OCP_CLIENT_VERSION }}
8282
run: |
8383
# Install Dockerfile content for pytest
8484
# install oc/kubectl
85-
curl -L "https://mirror.openshift.com/pub/openshift-v4/clients/ocp/${OC_CLIENT_VERSION}/openshift-client-linux-${OC_CLIENT_VERSION}.tar.gz" -o "$RUNNER_PATH/openshift-client-linux-${OC_CLIENT_VERSION}.tar.gz"
86-
tar -xzvf $RUNNER_PATH/openshift-client-linux-${OC_CLIENT_VERSION}.tar.gz -C $RUNNER_PATH/
87-
rm $RUNNER_PATH/openshift-client-linux-${OC_CLIENT_VERSION}.tar.gz
85+
curl -L "https://mirror.openshift.com/pub/openshift-v4/clients/ocp/${OCP_CLIENT_VERSION}/openshift-client-linux-${OCP_CLIENT_VERSION}.tar.gz" -o "$RUNNER_PATH/openshift-client-linux-${OCP_CLIENT_VERSION}.tar.gz"
86+
tar -xzvf $RUNNER_PATH/openshift-client-linux-${OCP_CLIENT_VERSION}.tar.gz -C $RUNNER_PATH/
87+
rm $RUNNER_PATH/openshift-client-linux-${OCP_CLIENT_VERSION}.tar.gz
8888
cp $RUNNER_PATH/kubectl /usr/local/bin/kubectl
8989
cp $RUNNER_PATH/oc /usr/local/bin/oc
9090
@@ -151,13 +151,13 @@ jobs:
151151
GRAFANA_URL: ${{ secrets.PERF_GRAFANA_URL }}
152152
GRAFANA_API_KEY: ${{ secrets.PERF_GRAFANA_API_KEY }}
153153
GRAFANA_JSON_PATH: ${{ secrets.PERF_GRAFANA_JSON_PATH }}
154-
OC_CLIENT_VERSION: ${{ secrets.PERF_OC_CLIENT_VERSION }}
154+
OCP_CLIENT_VERSION: ${{ secrets.PERF_OCP_CLIENT_VERSION }}
155155
run: |
156156
# Install Dockerfile content for pytest
157157
# install oc/kubectl
158-
curl -L "https://mirror.openshift.com/pub/openshift-v4/clients/ocp/${OC_CLIENT_VERSION}/openshift-client-linux-${OC_CLIENT_VERSION}.tar.gz" -o "$RUNNER_PATH/openshift-client-linux-${OC_CLIENT_VERSION}.tar.gz"
159-
tar -xzvf $RUNNER_PATH/openshift-client-linux-${OC_CLIENT_VERSION}.tar.gz -C $RUNNER_PATH/
160-
rm $RUNNER_PATH/openshift-client-linux-${OC_CLIENT_VERSION}.tar.gz
158+
curl -L "https://mirror.openshift.com/pub/openshift-v4/clients/ocp/${OCP_CLIENT_VERSION}/openshift-client-linux-${OCP_CLIENT_VERSION}.tar.gz" -o "$RUNNER_PATH/openshift-client-linux-${OCP_CLIENT_VERSION}.tar.gz"
159+
tar -xzvf $RUNNER_PATH/openshift-client-linux-${OCP_CLIENT_VERSION}.tar.gz -C $RUNNER_PATH/
160+
rm $RUNNER_PATH/openshift-client-linux-${OCP_CLIENT_VERSION}.tar.gz
161161
cp $RUNNER_PATH/kubectl /usr/local/bin/kubectl
162162
cp $RUNNER_PATH/oc /usr/local/bin/oc
163163
@@ -217,13 +217,13 @@ jobs:
217217
ELASTICSEARCH_PORT: ${{ secrets.PERF_ELASTICSEARCH_PORT }}
218218
ELASTICSEARCH_USER: ${{ secrets.PERF_ELASTICSEARCH_USER }}
219219
ELASTICSEARCH_PASSWORD: ${{ secrets.PERF_ELASTICSEARCH_PASSWORD }}
220-
OC_CLIENT_VERSION: ${{ secrets.PERF_OC_CLIENT_VERSION }}
220+
OCP_CLIENT_VERSION: ${{ secrets.PERF_OCP_CLIENT_VERSION }}
221221
run: |
222222
# Install Dockerfile content for pytest
223223
# install oc/kubectl
224-
curl -L "https://mirror.openshift.com/pub/openshift-v4/clients/ocp/${OC_CLIENT_VERSION}/openshift-client-linux-${OC_CLIENT_VERSION}.tar.gz" -o "$RUNNER_PATH/openshift-client-linux-${OC_CLIENT_VERSION}.tar.gz"
225-
tar -xzvf $RUNNER_PATH/openshift-client-linux-${OC_CLIENT_VERSION}.tar.gz -C $RUNNER_PATH/
226-
rm $RUNNER_PATH/openshift-client-linux-${OC_CLIENT_VERSION}.tar.gz
224+
curl -L "https://mirror.openshift.com/pub/openshift-v4/clients/ocp/${OCP_CLIENT_VERSION}/openshift-client-linux-${OCP_CLIENT_VERSION}.tar.gz" -o "$RUNNER_PATH/openshift-client-linux-${OCP_CLIENT_VERSION}.tar.gz"
225+
tar -xzvf $RUNNER_PATH/openshift-client-linux-${OCP_CLIENT_VERSION}.tar.gz -C $RUNNER_PATH/
226+
rm $RUNNER_PATH/openshift-client-linux-${OCP_CLIENT_VERSION}.tar.gz
227227
cp $RUNNER_PATH/kubectl /usr/local/bin/kubectl
228228
cp $RUNNER_PATH/oc /usr/local/bin/oc
229229

‎.github/workflows/Weekly_Func_Env_Installer_CI.yml

+4-4
Original file line numberDiff line numberDiff line change
@@ -64,8 +64,8 @@ jobs:
6464
END
6565
- name: ▶ OCP assisted installer
6666
env:
67-
INSTALL_OCP_VERSION: "latest-4.14.0-rc"
68-
OC_CLIENT_VERSION: "4.14.0-rc.0"
67+
INSTALL_OCP_VERSION: "latest-4.14"
68+
OCP_CLIENT_VERSION: "4.14.1"
6969
IBM_API_KEY: ${{ secrets.IBM_API_KEY }}
7070
GITHUB_TOKEN: ${{ secrets.GIT_TOKEN }}
7171
WORKER_IDS: ${{ secrets.PERF_WORKER_IDS }}
@@ -88,8 +88,8 @@ jobs:
8888
echo '>>>>>>>>>>>>>>>>>>>>>>>>>> OCP end step: ${{ matrix.step }} >>>>>>>>>>>>>>>>>>>>>>>>>>>>'
8989
- name: ▶ Rerun OCP assisted install after failure
9090
env:
91-
INSTALL_OCP_VERSION: "latest-4.14.0-rc"
92-
OC_CLIENT_VERSION: "4.14.0-rc.0"
91+
INSTALL_OCP_VERSION: "latest-4.14"
92+
OCP_CLIENT_VERSION: "4.14.1"
9393
IBM_API_KEY: ${{ secrets.IBM_API_KEY }}
9494
GITHUB_TOKEN: ${{ secrets.GIT_TOKEN }}
9595
WORKER_IDS: ${{ secrets.PERF_WORKER_IDS }}

‎.github/workflows/Weekly_Perf_Env_Installer_CI.yml

+4-4
Original file line numberDiff line numberDiff line change
@@ -64,8 +64,8 @@ jobs:
6464
END
6565
- name: ▶ OCP assisted installer
6666
env:
67-
INSTALL_OCP_VERSION: "latest-4.14.0-rc"
68-
OC_CLIENT_VERSION: "4.14.0-rc.0"
67+
INSTALL_OCP_VERSION: "latest-4.14"
68+
OCP_CLIENT_VERSION: "4.14.1"
6969
IBM_API_KEY: ${{ secrets.IBM_API_KEY }}
7070
GITHUB_TOKEN: ${{ secrets.GIT_TOKEN }}
7171
WORKER_IDS: ${{ secrets.PERF_WORKER_IDS }}
@@ -88,8 +88,8 @@ jobs:
8888
echo '>>>>>>>>>>>>>>>>>>>>>>>>>> OCP end step: ${{ matrix.step }} >>>>>>>>>>>>>>>>>>>>>>>>>>>>'
8989
- name: ▶ Rerun OCP assisted install after failure
9090
env:
91-
INSTALL_OCP_VERSION: "latest-4.14.0-rc"
92-
OC_CLIENT_VERSION: "4.14.0-rc.0"
91+
INSTALL_OCP_VERSION: "latest-4.14"
92+
OCP_CLIENT_VERSION: "4.14.1"
9393
IBM_API_KEY: ${{ secrets.IBM_API_KEY }}
9494
GITHUB_TOKEN: ${{ secrets.GIT_TOKEN }}
9595
WORKER_IDS: ${{ secrets.PERF_WORKER_IDS }}

‎Dockerfile

+4-4
Original file line numberDiff line numberDiff line change
@@ -31,12 +31,12 @@ RUN wget https://www.python.org/ftp/python/${python_full_version}/Python-${pytho
3131
RUN python3.10 -m pip --no-cache-dir install --upgrade pip && pip --no-cache-dir install benchmark-runner --upgrade
3232

3333
# install oc/kubectl client tools for OpenShift/Kubernetes
34-
ARG oc_client_version="4.14.0-rc.0"
35-
RUN curl -L "https://mirror.openshift.com/pub/openshift-v4/clients/ocp/${oc_client_version}/openshift-client-linux-${oc_client_version}.tar.gz" -o "/tmp/openshift-client-linux-${oc_client_version}.tar.gz" \
36-
&& tar -xzvf /tmp/openshift-client-linux-${oc_client_version}.tar.gz -C /tmp/ \
34+
ARG OCP_CLIENT_VERSION="4.14.1"
35+
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" \
36+
&& tar -xzvf /tmp/openshift-client-linux-${OCP_CLIENT_VERSION}.tar.gz -C /tmp/ \
3737
&& mv /tmp/kubectl /usr/local/bin/kubectl \
3838
&& mv /tmp/oc /usr/local/bin/oc \
39-
&& rm -rf /tmp/openshift-client-linux-${oc_client_version}.tar.gz /tmp/kubectl /tmp/oc
39+
&& rm -rf /tmp/openshift-client-linux-${OCP_CLIENT_VERSION}.tar.gz /tmp/kubectl /tmp/oc
4040

4141
# Install virtctl for VNC
4242
ARG virtctl_version="1.0.0"

0 commit comments

Comments
 (0)