Skip to content

Commit

Permalink
Do not deploy operator twice
Browse files Browse the repository at this point in the history
Signed-off-by: Andrea Mazzotti <andrea.mazzotti@suse.com>
  • Loading branch information
anmazzotti committed Sep 26, 2024
1 parent 374389e commit 41da824
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 5 deletions.
6 changes: 2 additions & 4 deletions .github/workflows/e2e.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -29,16 +29,14 @@ jobs:
uses: actions/checkout@v4
with:
fetch-depth: 0
- name: Setup full cluster
run: LOCAL_BUILD=true make setup-full-cluster
- name: e2e tests
run: LOCAL_BUILD=true make e2e-tests
- name: Upload chart
uses: actions/upload-artifact@v4
with:
name: chart
path: build/*.tgz
overwrite: true
- name: e2e tests
run: make e2e-tests
- name: Archive artifacts
if: always()
uses: actions/upload-artifact@v4
Expand Down
4 changes: 3 additions & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -179,7 +179,7 @@ unit-tests: $(SETUP_ENVTEST) $(GINKGO)
airgap-script-test:
scripts/elemental-airgap-test.sh

e2e-tests: $(GINKGO)
e2e-tests: $(GINKGO) build-docker-operator build-docker-seedimage-builder chart setup-kind
kubectl cluster-info --context kind-$(CLUSTER_NAME)
kubectl label nodes --all --overwrite ingress-ready=true
kubectl label nodes --all --overwrite node-role.kubernetes.io/master=
Expand All @@ -188,6 +188,8 @@ e2e-tests: $(GINKGO)
export CHART=$(CHART) && \
export BRIDGE_IP="172.18.0.1" && \
export CONFIG_PATH=$(E2E_CONF_FILE) && \
kind load docker-image --name $(CLUSTER_NAME) ${REGISTRY_HEADER}${REPO}:${CHART_VERSION} && \
kind load docker-image --name $(CLUSTER_NAME) ${REGISTRY_HEADER}${REPO_SEEDIMAGE}:${TAG_SEEDIMAGE} && \
cd $(ROOT_DIR)/tests && $(GINKGO) -r -v ./e2e

# Only setups the kind cluster
Expand Down

0 comments on commit 41da824

Please sign in to comment.