Skip to content

Commit

Permalink
Makefile: add containers_image_openpgp tag for e2e test build
Browse files Browse the repository at this point in the history
It will fix CI failure during `make check`
```
Error: vendor/github.com/containers/image/v5/signature/mechanism_gpgme.go:16:16: undefined: gpgme.Context
Error: vendor/github.com/containers/image/v5/signature/mechanism_gpgme.go:66:44: undefined: gpgme.Context
Error: vendor/github.com/containers/image/v5/signature/mechanism_gpgme.go:67:14: undefined: gpgme.New
Error: vendor/github.com/containers/image/v5/signature/mechanism_gpgme.go:71:27: undefined: gpgme.ProtocolOpenPGP
Error: vendor/github.com/containers/image/v5/signature/mechanism_gpgme.go:75:28: undefined: gpgme.ProtocolOpenPGP
Error: vendor/github.com/containers/image/v5/signature/mechanism_gpgme.go:97:20: undefined: gpgme.NewDataBytes
Error: vendor/github.com/containers/image/v5/signature/mechanism_gpgme.go:126:20: undefined: gpgme.NewDataBytes
Error: vendor/github.com/containers/image/v5/signature/mechanism_gpgme.go:131:18: undefined: gpgme.NewDataWriter
Error: vendor/github.com/containers/image/v5/signature/mechanism_gpgme.go:135:25: undefined: gpgme.Key
Error: vendor/github.com/containers/image/v5/signature/mechanism_gpgme.go:135:61: undefined: gpgme.SigModeNormal
Error: vendor/github.com/containers/image/v5/signature/mechanism_gpgme.go:135:61: too many errors
```
  • Loading branch information
praveenkumar committed Sep 19, 2022
1 parent 73a6d0b commit 63637fe
Showing 1 changed file with 6 additions and 6 deletions.
12 changes: 6 additions & 6 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -162,10 +162,10 @@ clean: clean_docs clean_macos_package clean_windows_msi

.PHONY: build_e2e
build_e2e: $(SOURCES)
GOARCH=amd64 GOOS=linux go test ./test/e2e/ --ldflags="$(VERSION_VARIABLES)" -c -o $(BUILD_DIR)/linux-amd64/e2e.test
GOARCH=amd64 GOOS=windows go test ./test/e2e/ --ldflags="$(VERSION_VARIABLES)" -c -o $(BUILD_DIR)/windows-amd64/e2e.test.exe
GOARCH=amd64 GOOS=darwin go test ./test/e2e/ --ldflags="$(VERSION_VARIABLES)" -c -o $(BUILD_DIR)/macos-amd64/e2e.test
GOARCH=arm64 GOOS=darwin go test ./test/e2e/ --ldflags="$(VERSION_VARIABLES)" -c -o $(BUILD_DIR)/macos-arm64/e2e.test
GOARCH=amd64 GOOS=linux go test ./test/e2e/ -tags "$(BUILDTAGS)" --ldflags="$(VERSION_VARIABLES)" -c -o $(BUILD_DIR)/linux-amd64/e2e.test
GOARCH=amd64 GOOS=windows go test ./test/e2e/ -tags "$(BUILDTAGS)" --ldflags="$(VERSION_VARIABLES)" -c -o $(BUILD_DIR)/windows-amd64/e2e.test.exe
GOARCH=amd64 GOOS=darwin go test ./test/e2e/ -tags "$(BUILDTAGS)" --ldflags="$(VERSION_VARIABLES)" -c -o $(BUILD_DIR)/macos-amd64/e2e.test
GOARCH=arm64 GOOS=darwin go test ./test/e2e/ -tags "$(BUILDTAGS)" --ldflags="$(VERSION_VARIABLES)" -c -o $(BUILD_DIR)/macos-arm64/e2e.test

.PHONY: build_integration
build_integration: $(SOURCES)
Expand Down Expand Up @@ -206,7 +206,7 @@ export BUNDLE_PATH = $(HOME)/Downloads/crc_libvirt_$(OPENSHIFT_VERSION)_$(GOARCH
endif

integration:
@go test -timeout=60m $(REPOPATH)/test/integration -v $(GINKGO_OPTS)
@go test -timeout=60m -tags "$(BUILDTAGS)" $(REPOPATH)/test/integration -v $(GINKGO_OPTS)

.PHONY: e2e ## Run e2e tests
e2e:
Expand All @@ -221,7 +221,7 @@ ifndef CRC_BINARY
CRC_BINARY = --crc-binary=$(GOPATH)/bin
endif
e2e:
@go test --timeout=180m $(REPOPATH)/test/e2e --ldflags="$(VERSION_VARIABLES)" -v $(PULL_SECRET_FILE) $(BUNDLE_LOCATION) $(CRC_BINARY) $(GODOG_OPTS) $(CLEANUP_HOME) $(INSTALLER_PATH) $(USER_PASSWORD)
@go test --timeout=180m $(REPOPATH)/test/e2e -tags "$(BUILDTAGS)" --ldflags="$(VERSION_VARIABLES)" -v $(PULL_SECRET_FILE) $(BUNDLE_LOCATION) $(CRC_BINARY) $(GODOG_OPTS) $(CLEANUP_HOME) $(INSTALLER_PATH) $(USER_PASSWORD)

.PHONY: e2e-stories e2e-story-health e2e-story-marketplace e2e-story-registry
# cluster must already be running, crc must be in the path
Expand Down

0 comments on commit 63637fe

Please sign in to comment.