diff options
| author | Adin Scannell <ascannell@google.com> | 2020-12-11 13:23:27 -0800 |
|---|---|---|
| committer | gVisor bot <gvisor-bot@google.com> | 2020-12-11 13:25:44 -0800 |
| commit | 5bdc167d174515eb51ba1bb0f4b4d1e484e8996c (patch) | |
| tree | 5002ad4ae1901bf5cecab5e5cf9d75c73347c3fe | |
| parent | 305a456551467623d38acdb5a1b9741cb0dc1219 (diff) | |
Fix run and sudo targets.
These are not passing arguments properly. This breaks the current
pre-command for BuildKite.
PiperOrigin-RevId: 347062729
| -rw-r--r-- | .buildkite/hooks/pre-command | 5 | ||||
| -rw-r--r-- | Makefile | 4 |
2 files changed, 5 insertions, 4 deletions
diff --git a/.buildkite/hooks/pre-command b/.buildkite/hooks/pre-command index 1994287e8..7d277202b 100644 --- a/.buildkite/hooks/pre-command +++ b/.buildkite/hooks/pre-command @@ -4,7 +4,8 @@ PARTITION=$((${PARTITION}+1)) # 1-indexed, but PARALLEL_JOB is 0-indexed. export TOTAL_PARTITIONS=${BUILDKITE_PARALLEL_JOB_COUNT:-1} # Ensure Docker has experimental enabled. -if ! grep experimental /etc/docker/daemon.json >/dev/null; then +EXPERIMENTAL=$(sudo docker version --format='{{.Server.Experimental}}') +if test "${EXPERIMENTAL}" != "true"; then make sudo TARGETS=//runsc:runsc ARGS="install --experimental=true" - sudo systemctl reload docker + sudo systemctl restart docker fi @@ -67,11 +67,11 @@ copy: ## Copies the given $(TARGETS) to the given $(DESTINATION). E.g. make copy .PHONY: copy run: ## Runs the given $(TARGETS), built with $(OPTIONS), using $(ARGS). E.g. make run TARGETS=runsc ARGS=-version - @$(call build,$(TARGETS) $(ARGS)) + @$(call run,$(TARGETS),$(ARGS)) .PHONY: run sudo: ## Runs the given $(TARGETS) as per run, but using "sudo -E". E.g. make sudo TARGETS=test/root:root_test ARGS=-test.v - @$(call sudo,$(TARGETS) $(ARGS)) + @$(call sudo,$(TARGETS),$(ARGS)) .PHONY: sudo # Load image helpers. |