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.

Sign up for GitHub

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

Jump to bottom

Suppress output of certain commands from Makefile #1342

Merged
merged 1 commit into from
Jul 23, 2019
Merged

Suppress output of certain commands from Makefile #1342

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
16 changes: 8 additions & 8 deletions build/ci/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ vault-aws-creds:

ci-pr: check-license-header
docker build -f Dockerfile -t cloud-on-k8s-ci-pr .
docker run --rm -t \
@ docker run --rm -t \
-v /var/run/docker.sock:/var/run/docker.sock \
-v $(ROOT_DIR):$(GO_MOUNT_PATH) \
-w $(GO_MOUNT_PATH) \
Expand All @@ -86,7 +86,7 @@ ci-pr: check-license-header

ci-release: vault-public-key vault-docker-creds
docker build -f Dockerfile -t cloud-on-k8s-ci-release .
docker run --rm -t \
@ docker run --rm -t \
-v /var/run/docker.sock:/var/run/docker.sock \
-v $(ROOT_DIR):$(GO_MOUNT_PATH) \
-w $(GO_MOUNT_PATH) \
Expand All @@ -105,7 +105,7 @@ ci-release: vault-public-key vault-docker-creds
# Will be uploaded to https://download.elastic.co/downloads/eck/$TAG_NAME/all-in-one.yaml
yaml-upload: vault-aws-creds
docker build -f Dockerfile -t cloud-on-k8s-ci-release .
docker run --rm -t \
@ docker run --rm -t \
-v $(ROOT_DIR):$(GO_MOUNT_PATH) \
-w $(GO_MOUNT_PATH) \
-e "AWS_ACCESS_KEY_ID=$(shell cat $(VAULT_AWS_ACCESS_KEY_FILE))" \
Expand All @@ -119,7 +119,7 @@ yaml-upload: vault-aws-creds
# Spawn a k8s cluster, and run e2e tests against it
ci-e2e: vault-gke-creds
docker build -f Dockerfile -t cloud-on-k8s-ci-e2e .
docker run --rm -t \
@ docker run --rm -t \
-v /var/run/docker.sock:/var/run/docker.sock \
-v $(ROOT_DIR):$(GO_MOUNT_PATH) \
-w $(GO_MOUNT_PATH) \
Expand All @@ -137,7 +137,7 @@ ci-e2e: vault-gke-creds
# Run e2e tests in GKE against provided ECK image
ci-e2e-rc: vault-gke-creds
docker build -f Dockerfile -t cloud-on-k8s-ci-e2e .
docker run --rm -t \
@ docker run --rm -t \
-v /var/run/docker.sock:/var/run/docker.sock \
-v $(ROOT_DIR):$(GO_MOUNT_PATH) \
-w $(GO_MOUNT_PATH) \
Expand All @@ -156,7 +156,7 @@ ci-e2e-rc: vault-gke-creds
# Remove k8s cluster
ci-e2e-delete-cluster: vault-gke-creds
docker build -f Dockerfile -t cloud-on-k8s-ci-e2e .
docker run --rm -t \
@ docker run --rm -t \
-v /var/run/docker.sock:/var/run/docker.sock \
-v $(ROOT_DIR):$(GO_MOUNT_PATH) \
-w $(GO_MOUNT_PATH) \
Expand All @@ -168,7 +168,7 @@ ci-e2e-delete-cluster: vault-gke-creds

# Remove all unused resources in GKE
ci-gke-cleanup: ci-e2e-delete-cluster
docker run --rm -t \
@ docker run --rm -t \
-v $(ROOT_DIR):$(GO_MOUNT_PATH) \
-w $(GO_MOUNT_PATH) \
-e "GCLOUD_PROJECT=$(GCLOUD_PROJECT)" \
Expand All @@ -180,7 +180,7 @@ ci-gke-cleanup: ci-e2e-delete-cluster

# Run docs build
ci-build-docs:
docker run --rm -t \
@ docker run --rm -t \
-v $(ROOT_DIR):$(GO_MOUNT_PATH) \
docker.elastic.co/docs/build:1 \
bash -c "git clone https://github.com/elastic/docs.git && \
Expand Down