Skip to content

OCPBUGS-92029: [release-4.20] Remove skopeo-install script #6232

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

Open
umohnani8 wants to merge 1 commit into
base: release-4.20
Choose a base branch
from
Open

OCPBUGS-92029: [release-4.20] Remove skopeo-install script #6232

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
17 changes: 2 additions & 15 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -116,18 +116,6 @@ else
GO111MODULE=on go build -o $(GOPATH)/bin/golangci-lint ./vendor/github.com/golangci/golangci-lint/cmd/golangci-lint
endif

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 a single test target (test-e2e-ocl).
install-tools: install-golangci-lint install-go-junit-report install-setup-envtest

# Runs golangci-lint
Expand Down Expand Up @@ -222,9 +210,8 @@ 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: install-go-junit-report install-skopeo
# Temporarily include /tmp/skopeo/bin in our PATH variable so that the test suite can find skopeo.
set -o pipefail; PATH="$(PATH):/tmp/skopeo/bin" go test -tags=$(GOTAGS) -failfast -timeout 190m -v$${WHAT:+ -run="$$WHAT"} ./test/e2e-ocl/ | ./hack/test-with-junit.sh $(@)
test-e2e-ocl: install-go-junit-report
set -o pipefail; go test -tags=$(GOTAGS) -failfast -timeout 190m -v$${WHAT:+ -run="$$WHAT"} ./test/e2e-ocl/ | ./hack/test-with-junit.sh $(@)

bootstrap-e2e: install-go-junit-report install-setup-envtest
@echo "Setting up KUBEBUILDER_ASSETS"
Expand Down
66 changes: 0 additions & 66 deletions hack/install-skopeo.sh
View file
Open in desktop

This file was deleted.