Skip to content

OCPBUGS-87014: Remove skopeo-install script #6141

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

Merged
openshift-merge-bot merged 1 commit into from
Jun 4, 2026
+4 −82
Merged

OCPBUGS-87014: Remove skopeo-install script #6141

Show file tree
Hide file tree
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
20 changes: 4 additions & 16 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -110,18 +110,6 @@ install-golangci-lint:
@echo "Installing golangci-lint from vendor"
GO111MODULE=on go build -o $(GOPATH)/bin/golangci-lint ./vendor/github.com/golangci/golangci-lint/cmd/golangci-lint

SKOPEO := $(shell command -v skopeo 2> /dev/null)
install-skopeo:
ifdef SKOPEO
@echo "Found skopeo"
skopeo --version
else
@echo "Installing skopeo"
./hack/install-skopeo.sh
endif

# install-skopeo is purposely omitted from this target because it is only
# needed for the e2e-ocl test targets (test-e2e-ocl-1of2, test-e2e-ocl-2of2).
install-tools: install-golangci-lint install-go-junit-report install-setup-envtest

# Runs golangci-lint
Expand Down Expand Up @@ -216,11 +204,11 @@ test-e2e-techpreview: install-go-junit-report
test-e2e-single-node: install-go-junit-report
set -o pipefail; go test -tags=$(GOTAGS) -failfast -timeout 120m -v$${WHAT:+ -run="$$WHAT"} ./test/e2e-single-node/ | ./hack/test-with-junit.sh $(@)

test-e2e-ocl-1of2: install-go-junit-report install-skopeo
set -o pipefail; PATH="$(PATH):/tmp/skopeo/bin" go test -tags=$(GOTAGS) -failfast -timeout 120m -v$${WHAT:+ -run="$$WHAT"} ./test/e2e-ocl-1of2/ ./test/e2e-ocl-shared/ | ./hack/test-with-junit.sh $(@)
test-e2e-ocl-1of2: install-go-junit-report
set -o pipefail; go test -tags=$(GOTAGS) -failfast -timeout 120m -v$${WHAT:+ -run="$$WHAT"} ./test/e2e-ocl-1of2/ ./test/e2e-ocl-shared/ | ./hack/test-with-junit.sh $(@)

test-e2e-ocl-2of2: install-go-junit-report install-skopeo
set -o pipefail; PATH="$(PATH):/tmp/skopeo/bin" go test -tags=$(GOTAGS) -failfast -timeout 150m -v$${WHAT:+ -run="$$WHAT"} ./test/e2e-ocl-2of2/ ./test/e2e-ocl-shared/ | ./hack/test-with-junit.sh $(@)
test-e2e-ocl-2of2: install-go-junit-report
set -o pipefail; go test -tags=$(GOTAGS) -failfast -timeout 150m -v$${WHAT:+ -run="$$WHAT"} ./test/e2e-ocl-2of2/ ./test/e2e-ocl-shared/ | ./hack/test-with-junit.sh $(@)

test-e2e-iri: install-go-junit-report
set -o pipefail; go test -tags=$(GOTAGS) -failfast -timeout 120m -v$${WHAT:+ -run="$$WHAT"} ./test/e2e-iri/ | ./hack/test-with-junit.sh $(@)
Expand Down
66 changes: 0 additions & 66 deletions hack/install-skopeo.sh
View file
Open in desktop

This file was deleted.