Skip to content

Commit

Permalink
Merge pull request #21 from Conjur-Enterprise/CNJR-0000-pin-oc-version
Browse files Browse the repository at this point in the history
Pin OC CLI version in test env
  • Loading branch information
imheresamir authored and GitHub Enterprise committed Jul 16, 2024
2 parents 00c43ba + 4cfb066 commit 20b8a98
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
2 changes: 1 addition & 1 deletion bin/test-workflow/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ RUN curl -LO https://dl.k8s.io/release/v"${KUBECTL_VERSION:-1.21.3}"/bin/linux/a

# Install OpenShift oc CLI
ARG OPENSHIFT_CLI_URL
RUN wget -O oc.tar.gz "${OPENSHIFT_CLI_URL:-https://mirror.openshift.com/pub/openshift-v4/clients/ocp/stable/openshift-client-linux.tar.gz}" && \
RUN wget -O oc.tar.gz "${OPENSHIFT_CLI_URL:-https://mirror.openshift.com/pub/openshift-v4/clients/ocp/4.15.0/openshift-client-linux.tar.gz}" && \
tar xvf oc.tar.gz && \
mv oc /usr/local/bin/oc && \
rm -rf oc.tar.gz
Expand Down
2 changes: 1 addition & 1 deletion bin/test-workflow/secrets.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ openshift:
PLATFORM: openshift
# For the 3.x Openshift
# OPENSHIFT_CLI_URL: https://github.com/openshift/origin/releases/download/v3.11.0/openshift-origin-client-tools-v3.11.0-0cbc58b-linux-64bit.tar.gz
OPENSHIFT_CLI_URL: https://mirror.openshift.com/pub/openshift-v4/clients/ocp/stable/openshift-client-linux.tar.gz
OPENSHIFT_CLI_URL: https://mirror.openshift.com/pub/openshift-v4/clients/ocp/4.15.0/openshift-client-linux.tar.gz
OPENSHIFT_URL: !var $ENV/openshift/$VER/api-url
OPENSHIFT_USERNAME: !var $ENV/openshift/$VER/username
OPENSHIFT_PASSWORD: !var $ENV/openshift/$VER/password
Expand Down

0 comments on commit 20b8a98

Please sign in to comment.