Skip to content

Commit

Permalink
use curl for grpcurl binary install, fix comment on S3 in run_interop.sh
Browse files Browse the repository at this point in the history
  • Loading branch information
omrirh committed Dec 30, 2024
1 parent bb701ea commit aa30ab6
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
2 changes: 1 addition & 1 deletion ods_ci/build/Dockerfile_interop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ RUN dnf install epel-release -y &&\
rm -rf ${HOME}/oc_client.tar.gz && rm /usr/local/bin/README.md && chmod 755 /usr/local/bin/oc && oc version --client && \
curl --proto "=https" -L https://github.com/openshift-online/ocm-cli/releases/download/v0.1.62/ocm-linux-amd64 -o ${HOME}/ocm && \
mv ${HOME}/ocm /usr/local/bin/ && chmod 755 /usr/local/bin/ocm && ocm version && \
wget -sL https://github.com/fullstorydev/grpcurl/releases/download/v1.8.7/grpcurl_1.8.7_linux_x86_64.tar.gz -o grpcurl_1.8.7_linux_x86_64.tar.gz && \
curl -sL https://github.com/fullstorydev/grpcurl/releases/download/v1.8.7/grpcurl_1.8.7_linux_x86_64.tar.gz -o grpcurl_1.8.7_linux_x86_64.tar.gz && \
tar xzf grpcurl_1.8.7_linux_x86_64.tar.gz && \
rm -rf grpcurl_1.8.7_linux_x86_64.tar.gz && \
mv grpcurl /usr/bin/grpcurl && \
Expand Down
2 changes: 1 addition & 1 deletion ods_ci/run_interop.sh
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ yq -i '.ODH_DASHBOARD_URL=env(RHODS_DASHBOARD)' "${TEST_VARIABLES_FILE}"
yq -i '.BROWSER.NAME="firefox"' "${TEST_VARIABLES_FILE}"
yq -i '.S3.AWS_ACCESS_KEY_ID=env(AWS_ACCESS_KEY_ID)' "${TEST_VARIABLES_FILE}"
yq -i '.S3.AWS_SECRET_ACCESS_KEY=env(AWS_SECRET_ACCESS_KEY)' "${TEST_VARIABLES_FILE}"
# TODO: Inject S3 endpoint URL to test-variables file?
# TODO: Consume S3 endpoint URL from test-variables file?

echo "Performing oc login with cluster admin"
username=$(yq eval '.OCP_ADMIN_USER.USERNAME' "${TEST_VARIABLES_FILE}")
Expand Down

0 comments on commit aa30ab6

Please sign in to comment.