Skip to content

Commit b184612

Browse files
committed
install skopeo if missing
1 parent 5345a85 commit b184612

File tree

1 file changed

+12
-2
lines changed

1 file changed

+12
-2
lines changed

Makefile

Lines changed: 12 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -109,7 +109,17 @@ else
109109
GO111MODULE=on go build -o $(GOPATH)/bin/golangci-lint ./vendor/github.com/golangci/golangci-lint/cmd/golangci-lint
110110
endif
111111

112-
install-tools: install-golangci-lint install-go-junit-report install-setup-envtest
112+
SKOPEO := $(shell command -v skopeo 2> /dev/null)
113+
install-skopeo:
114+
ifdef SKOPEO
115+
@echo "Found skopeo"
116+
skopeo --version
117+
else
118+
@echo "Installing skopeo"
119+
dnf install -y skopeo
120+
endif
121+
122+
install-tools: install-golangci-lint install-go-junit-report install-setup-envtest install-skopeo
113123

114124
# Runs golangci-lint
115125
lint: install-tools
@@ -203,7 +213,7 @@ test-e2e-techpreview: install-go-junit-report
203213
test-e2e-single-node: install-go-junit-report
204214
set -o pipefail; go test -tags=$(GOTAGS) -failfast -timeout 120m -v$${WHAT:+ -run="$$WHAT"} ./test/e2e-single-node/ | ./hack/test-with-junit.sh $(@)
205215

206-
test-e2e-ocl: install-go-junit-report
216+
test-e2e-ocl: install-go-junit-report install-skopeo
207217
set -o pipefail; go test -tags=$(GOTAGS) -failfast -timeout 190m -v$${WHAT:+ -run="$$WHAT"} ./test/e2e-ocl/ | ./hack/test-with-junit.sh $(@)
208218

209219
bootstrap-e2e: install-go-junit-report install-setup-envtest

0 commit comments

Comments
 (0)