Fix run and sudo targets.
These are not passing arguments properly. This breaks the current pre-command for BuildKite. PiperOrigin-RevId: 347062729
This commit is contained in:
parent
305a456551
commit
5bdc167d17
|
@ -4,7 +4,8 @@ PARTITION=$((${PARTITION}+1)) # 1-indexed, but PARALLEL_JOB is 0-indexed.
|
||||||
export TOTAL_PARTITIONS=${BUILDKITE_PARALLEL_JOB_COUNT:-1}
|
export TOTAL_PARTITIONS=${BUILDKITE_PARALLEL_JOB_COUNT:-1}
|
||||||
|
|
||||||
# Ensure Docker has experimental enabled.
|
# 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"
|
make sudo TARGETS=//runsc:runsc ARGS="install --experimental=true"
|
||||||
sudo systemctl reload docker
|
sudo systemctl restart docker
|
||||||
fi
|
fi
|
||||||
|
|
4
Makefile
4
Makefile
|
@ -67,11 +67,11 @@ copy: ## Copies the given $(TARGETS) to the given $(DESTINATION). E.g. make copy
|
||||||
.PHONY: copy
|
.PHONY: copy
|
||||||
|
|
||||||
run: ## Runs the given $(TARGETS), built with $(OPTIONS), using $(ARGS). E.g. make run TARGETS=runsc ARGS=-version
|
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
|
.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
|
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
|
.PHONY: sudo
|
||||||
|
|
||||||
# Load image helpers.
|
# Load image helpers.
|
||||||
|
|
Loading…
Reference in New Issue