Skip to content

🐛 fix: ensure that all required env variables are set before running tests #105

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

Merged
merged 1 commit into from
May 10, 2023
Merged

🐛 fix: ensure that all required env variables are set before running tests #105

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
6 changes: 4 additions & 2 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -133,6 +133,8 @@ E2E_CONF_FILE ?= $(ROOT)/test/e2e/config/operator-dev.yaml
E2E_CONF_FILE_ENVSUBST ?= $(ROOT)/test/e2e/config/operator-dev-envsubst.yaml
SKIP_CLEANUP ?= false
SKIP_CREATE_MGMT_CLUSTER ?= false
E2E_CERT_MANAGER_VERSION ?= v1.7.1
E2E_OPERATOR_IMAGE ?= $(CONTROLLER_IMG):$(TAG)

# Relase
RELEASE_TAG ?= $(shell git describe --abbrev=0 2>/dev/null)
Expand Down Expand Up @@ -353,7 +355,7 @@ docker-push-%:

.PHONY: docker-build-e2e
docker-build-e2e:
$(MAKE) CONTROLLER_IMG_TAG="gcr.io/k8s-staging-capi-operator/cluster-api-operator:dev" docker-build
$(MAKE) CONTROLLER_IMG_TAG="$(E2E_OPERATOR_IMAGE)" docker-build

.PHONY: set-manifest-pull-policy
set-manifest-pull-policy:
Expand Down Expand Up @@ -464,7 +466,7 @@ test-e2e: $(KUSTOMIZE)

.PHONY: test-e2e-run
test-e2e-run: $(GINKGO) $(ENVSUBST) ## Run e2e tests
$(ENVSUBST) < $(E2E_CONF_FILE) > $(E2E_CONF_FILE_ENVSUBST) && \
E2E_OPERATOR_IMAGE=$(E2E_OPERATOR_IMAGE) E2E_CERT_MANAGER_VERSION=$(E2E_CERT_MANAGER_VERSION) $(ENVSUBST) < $(E2E_CONF_FILE) > $(E2E_CONF_FILE_ENVSUBST) && \
$(GINKGO) -v -trace -tags=e2e --junit-report=junit_cluster_api_operator_e2e.xml --output-dir="${JUNIT_REPORT_DIR}" --no-color=$(GINKGO_NOCOLOR) $(GINKGO_ARGS) ./test/e2e -- \
-e2e.artifacts-folder="$(ARTIFACTS)" \
-e2e.config="$(E2E_CONF_FILE_ENVSUBST)" -e2e.components=$(ROOT)/$(RELEASE_DIR)/operator-components.yaml \
Expand Down
3 changes: 0 additions & 3 deletions scripts/ci-e2e.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,9 +27,6 @@ source "${REPO_ROOT}/hack/ensure-go.sh"
source "${REPO_ROOT}/hack/ensure-kind.sh"

# Build operator images
export CERT_MANAGER_VERSION=v1.7.1
export OPERATOR_IMAGE=gcr.io/k8s-staging-capi-operator/cluster-api-operator:dev

echo "+ Building CAPI operator image"
make docker-build-e2e

Expand Down
4 changes: 2 additions & 2 deletions test/e2e/config/operator-dev.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,11 @@ managementClusterName: capi-operator-e2e

images:
# Use local dev images built source tree;
- name: ${OPERATOR_IMAGE} # This should be substituted with operator image
- name: ${E2E_OPERATOR_IMAGE} # This should be substituted with operator image
loadBehavior: tryLoad

intervals:
default/wait-controllers: ["3m", "10s"]

variables:
CERTMANAGER_URL: https://github.com/cert-manager/cert-manager/releases/download/${CERT_MANAGER_VERSION}/cert-manager.yaml
CERTMANAGER_URL: https://github.com/cert-manager/cert-manager/releases/download/${E2E_CERT_MANAGER_VERSION}/cert-manager.yaml