File tree Expand file tree Collapse file tree 2 files changed +7
-6
lines changed Expand file tree Collapse file tree 2 files changed +7
-6
lines changed Original file line number Diff line number Diff line change @@ -3,6 +3,7 @@ GO := GOFLAGS="-mod=vendor" go
33CMDS := $(addprefix bin/, $(shell ls ./cmd | grep -v opm) )
44OPM := $(addprefix bin/, opm)
55SPECIFIC_UNIT_TEST := $(if $(TEST ) ,-run $(TEST ) ,)
6+ extra_env := $(GOENV )
67export PKG := github.com/operator-framework/operator-registry
78export GIT_COMMIT := $(or $(SOURCE_GIT_COMMIT ) ,$(shell git rev-parse --short HEAD) )
89export OPM_VERSION := $(or $(SOURCE_GIT_TAG ) ,$(shell git describe --always --tags HEAD) )
@@ -35,12 +36,12 @@ endif
3536all : clean test build
3637
3738$(CMDS ) :
38- $(GO ) build $(extra_flags ) $(TAGS ) -o $@ ./cmd/$(notdir $@ )
39+ $(extra_env ) $( GO ) build $(extra_flags ) $(TAGS ) -o $@ ./cmd/$(notdir $@ )
3940
4041.PHONY : $(OPM )
4142$(OPM ) : opm_version_flags=-ldflags "-X '$(PKG ) /cmd/opm/version.gitCommit=$(GIT_COMMIT ) ' -X '$(PKG ) /cmd/opm/version.opmVersion=$(OPM_VERSION ) ' -X '$(PKG ) /cmd/opm/version.buildDate=$(BUILD_DATE ) '"
4243$(OPM ) :
43- $(GO ) build $(opm_version_flags ) $(extra_flags ) $(TAGS ) -o $@ ./cmd/$(notdir $@ )
44+ $(extra_env ) $( GO ) build $(opm_version_flags ) $(extra_flags ) $(TAGS ) -o $@ ./cmd/$(notdir $@ )
4445
4546.PHONY : build
4647build : clean $(CMDS ) $(OPM )
Original file line number Diff line number Diff line change @@ -19,13 +19,13 @@ running even after the test suite has completed.
19191 . Start the e2e tests:
2020
2121 ``` bash
22- DOCKER_REGISTRY_HOST=localhost:5000 make build e2e SKIPTLS=" true" CLUSTER=kind
22+ DOCKER_REGISTRY_HOST=localhost:5000 GOENV= ' GOOS=linux ' make build e2e SKIPTLS=" true" CLUSTER=kind
2323 ```
2424
25251 . Run a specific BDD test using the ` TEST ` argument to make. Note that this argument uses regular expressions.
2626
2727 ``` bash
28- DOCKER_REGISTRY_HOST=localhost:5000 make build e2e TEST=' builds and manipulates bundle and index images' SKIPTLS=" true" CLUSTER=kind
28+ DOCKER_REGISTRY_HOST=localhost:5000 GOENV= ' GOOS=linux ' make build e2e TEST=' builds and manipulates bundle and index images' SKIPTLS=" true" CLUSTER=kind
2929 ```
3030
31311 . If you want a quick way to ensure that your TEST regex argument will work, you can bypass the
@@ -46,13 +46,13 @@ make file and use `-dryRun` with `-focus` and see if the regex would trigger you
46461 . Start the e2e tests:
4747
4848 ``` bash
49- DOCKER_REGISTRY_HOST=localhost:443 make build e2e CLUSTER=kind
49+ DOCKER_REGISTRY_HOST=localhost:443 GOENV= ' GOOS=linux ' make build e2e CLUSTER=kind
5050 ```
5151
52521 . Run a specific BDD test using the ` TEST ` argument to make. Note that this argument uses regular expressions.
5353
5454 ``` bash
55- DOCKER_REGISTRY_HOST=localhost:443 make build e2e TEST=' builds and manipulates bundle and index images' CLUSTER=kind
55+ DOCKER_REGISTRY_HOST=localhost:443 GOENV= ' GOOS=linux ' make build e2e TEST=' builds and manipulates bundle and index images' CLUSTER=kind
5656 ```
5757
58581 . If you want a quick way to ensure that your TEST regex argument will work, you can bypass the
You can’t perform that action at this time.
0 commit comments