Skip to content

Commit 6ead6ed

Browse files
author
Rajula Vineet Reddy
committed
Resolve review comments
1 parent c34cb4d commit 6ead6ed

File tree

2 files changed

+5
-2
lines changed

2 files changed

+5
-2
lines changed

.gitlab-ci.yml

-1
Original file line numberDiff line numberDiff line change
@@ -20,5 +20,4 @@ GoTest:
2020
stage: test
2121
image: golang:1.16
2222
script:
23-
- cp -r chart/drupalsite-operator/runtime-config/ /tmp/
2423
- make test

Makefile

+5-1
Original file line numberDiff line numberDiff line change
@@ -29,12 +29,16 @@ all: manager
2929

3030
# Run tests
3131
ENVTEST := $(shell pwd)/bin/setup-envtest
32+
# ENVTEST_K8S_VERSION refers to the version of kubebuilder assets to be downloaded by envtest binary.
3233
ENVTEST_K8S_VERSION = 1.21
33-
setup-envtest-bin: ## Download setup-envtest locally if necessary
34+
# Download setup-envtest locally if necessary
35+
setup-envtest-bin:
3436
$(call go-get-tool,$(ENVTEST),sigs.k8s.io/controller-runtime/tools/setup-envtest@latest)
3537
$(ENVTEST) use ${ENVTEST_K8S_VERSION}
3638

39+
# Copy runtime config to /tmp and setup envtest assets before running the tests
3740
test: setup-envtest-bin
41+
cp -r chart/drupalsite-operator/runtime-config/ /tmp/
3842
source <(${ENVTEST} use -p env ${ENVTEST_K8S_VERSION}); go test ./... -coverprofile cover.out -v
3943

4044
# Build manager binary

0 commit comments

Comments
 (0)