Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix missing gcloud command in e2e script #361

Merged
merged 1 commit into from
Jun 23, 2018
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 4 additions & 2 deletions Dockerfile.e2e-test
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,10 @@

FROM debian:9

COPY cmd/e2e-test/run.sh /run.sh
ADD bin/ARG_ARCH/ARG_BIN /ARG_BIN
RUN apt-get update && apt-get update && apt-get install curl -y

COPY cmd/e2e-test/run.sh /run.sh
RUN apt-get update && apt-get install -y curl python
RUN curl https://dl.google.com/dl/cloudsdk/channels/rapid/downloads/google-cloud-sdk-206.0.0-linux-x86_64.tar.gz | tar -zxf -

ENTRYPOINT ["/run.sh"]
4 changes: 3 additions & 1 deletion cmd/e2e-test/run.sh
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@
# run.sh manages the settings required for running containerized in a
# Kubernetes cluster.
echo '--- BEGIN ---'

for ATTEMPT in $(seq 60); do
PROJECT=$(curl -H'Metadata-Flavor:Google' metadata.google.internal/computeMetadata/v1/project/project-id 2>/dev/null)
if [[ -n "$PROJECT" ]]; then
Expand Down Expand Up @@ -44,11 +45,12 @@ echo
${CMD} "$@" 2>&1
echo

GCLOUD=/google-cloud-sdk/bin/gcloud
RESOURCES="forwarding-rules target-http-proxies target-https-proxies url-maps backend-services"
for RES in ${RESOURCES}; do
echo ==============================================================================
echo "GCP RESOURCE: ${RES}"
gcloud compute ${RES} list --project ${PROJECT} --format yaml
${GCLOUD} compute ${RES} list --quiet --project ${PROJECT} --format yaml 2>&1
done

echo ==============================================================================
Expand Down