@@ -28,15 +28,7 @@ export KUBEBUILDER_ASSETS
28
28
GO := GO111MODULE=on GOFLAGS="$(MOD_FLAGS ) " go
29
29
GINKGO := $(GO ) run github.com/onsi/ginkgo/ginkgo
30
30
BINDATA := $(GO ) run github.com/go-bindata/go-bindata/v3/go-bindata
31
-
32
- # ART builds are performed in dist-git, with content (but not commits) copied
33
- # from the source repo. Thus at build time if your code is inspecting the local
34
- # git repo it is getting unrelated commits and tags from the dist-git repo,
35
- # not the source repo.
36
- # For ART image builds, SOURCE_GIT_COMMIT, SOURCE_GIT_TAG, SOURCE_DATE_EPOCH
37
- # variables are inserted in Dockerfile to enable recovering the original git
38
- # metadata at build time.
39
- GIT_COMMIT := $(if $(SOURCE_GIT_COMMIT ) ,$(SOURCE_GIT_COMMIT ) ,$(shell git rev-parse HEAD) )
31
+ GIT_COMMIT := $(shell git rev-parse HEAD) )
40
32
41
33
.PHONY : build test run clean vendor schema-check \
42
34
vendor-update coverage coverage-html e2e \
@@ -127,6 +119,7 @@ setup-bare: clean e2e.namespace
127
119
. ./scripts/package_release.sh 1.0.0 test/e2e/resources test/e2e/e2e-bare-values.yaml
128
120
. ./scripts/install_bare.sh $(shell cat ./e2e.namespace) test/e2e/resources
129
121
122
+ # TODO(tflannag): Should we remove reference/update e2e to remove OCP namespace?
130
123
# e2e test exculding the rh-operators directory which tests rh-operators and their metric cardinality.
131
124
e2e :
132
125
go test -v $(MOD_FLAGS ) -failfast -timeout 150m ./test/e2e/... -namespace=openshift-operators -kubeconfig=${KUBECONFIG} -olmNamespace=openshift-operator-lifecycle-manager -dummyImage=bitnami/nginx:latest -ginkgo.flakeAttempts=3
@@ -226,6 +219,8 @@ release: manifests
226
219
227
220
verify-release : release diff
228
221
222
+ # TODO(tflannag): Should this target just call a script that can
223
+ # handle these conditionals instead of using make?
229
224
package : olmref=$(shell docker inspect --format='{{index .RepoDigests 0}}' quay.io/operator-framework/olm:v$(ver ) )
230
225
package :
231
226
ifndef target
0 commit comments