Separate short e2e and nightly flow

Signed-off-by: Danil-Grigorev <[email protected]>
rancher · Dec 4, 2024 · e6fc8d1 · e6fc8d1
1 parent b604117
commit e6fc8d1
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/.github/workflows/run-e2e-suite.yaml b/.github/workflows/run-e2e-suite.yaml
@@ -92,7 +92,7 @@ jobs:
           password: ${{ secrets.GITHUB_TOKEN }}
       - name: Build and push e2e image
         if: ${{ inputs.MANAGEMENT_CLUSTER_ENVIRONMENT == 'eks' }}
-        run: make e2e-image
+        run: make e2e-image-build-and-push
       - name: Run e2e tests
         run: make test-e2e
       - name: Collect run artifacts

diff --git a/Makefile b/Makefile
@@ -594,11 +594,14 @@ test-e2e-push-image: $(GINKGO) $(HELM) $(CLUSTERCTL) kubectl e2e-image-push
 .PHONY: e2e-image
 e2e-image: ## Build and push the image for e2e tests
 	CONTROLLER_IMG=$(REGISTRY)/$(ORG)/turtles-e2e $(MAKE) e2e-image-build
-	CONTROLLER_IMG=$(REGISTRY)/$(ORG)/turtles-e2e $(MAKE) e2e-image-push
 	RELEASE_TAG=v0.0.1 CONTROLLER_IMG=$(REGISTRY)/$(ORG)/turtles-e2e \
 	CONTROLLER_IMAGE_VERSION=v0.0.1 \
 	$(MAKE) build-chart
 
+.PHONY: e2e-image-build-and-push
+e2e-image-build-and-push: e2e-image
+	CONTROLLER_IMG=$(REGISTRY)/$(ORG)/turtles-e2e $(MAKE) e2e-image-push
+
 .PHONY: e2e-image-build
 e2e-image-build: ## Build the image for e2e tests
 	docker build \