File tree Expand file tree Collapse file tree 1 file changed +12
-2
lines changed Expand file tree Collapse file tree 1 file changed +12
-2
lines changed Original file line number Diff line number Diff line change @@ -109,7 +109,17 @@ else
109
109
GO111MODULE=on go build -o $(GOPATH)/bin/golangci-lint ./vendor/github.com/golangci/golangci-lint/cmd/golangci-lint
110
110
endif
111
111
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
113
123
114
124
# Runs golangci-lint
115
125
lint : install-tools
@@ -203,7 +213,7 @@ test-e2e-techpreview: install-go-junit-report
203
213
test-e2e-single-node : install-go-junit-report
204
214
set -o pipefail; go test -tags=$(GOTAGS ) -failfast -timeout 120m -v$$ {WHAT:+ -run=" $$ WHAT" } ./test/e2e-single-node/ | ./hack/test-with-junit.sh $(@ )
205
215
206
- test-e2e-ocl : install-go-junit-report
216
+ test-e2e-ocl : install-go-junit-report install-skopeo
207
217
set -o pipefail; go test -tags=$(GOTAGS ) -failfast -timeout 190m -v$$ {WHAT:+ -run=" $$ WHAT" } ./test/e2e-ocl/ | ./hack/test-with-junit.sh $(@ )
208
218
209
219
bootstrap-e2e : install-go-junit-report install-setup-envtest
You can’t perform that action at this time.
0 commit comments