From aa30ab607da4f54fa3719bfe1ef88d205e09f2a8 Mon Sep 17 00:00:00 2001 From: Omri Bar-Haim Date: Mon, 30 Dec 2024 15:15:45 +0200 Subject: [PATCH] use curl for grpcurl binary install, fix comment on S3 in run_interop.sh --- ods_ci/build/Dockerfile_interop | 2 +- ods_ci/run_interop.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/ods_ci/build/Dockerfile_interop b/ods_ci/build/Dockerfile_interop index df887a13a..233dc3005 100644 --- a/ods_ci/build/Dockerfile_interop +++ b/ods_ci/build/Dockerfile_interop @@ -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 && \ diff --git a/ods_ci/run_interop.sh b/ods_ci/run_interop.sh index 6515a048e..745a726fe 100644 --- a/ods_ci/run_interop.sh +++ b/ods_ci/run_interop.sh @@ -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}")