Skip to content

Commit

Permalink
Merge pull request #905 from Danil-Grigorev/nightly-push-e2e
Browse files Browse the repository at this point in the history
Fix nightly e2e image push in workflow
  • Loading branch information
alexander-demicev authored Dec 5, 2024
2 parents 233b718 + e6fc8d1 commit c2c9d29
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 2 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/run-e2e-suite.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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-push
run: make e2e-image-build-and-push
- name: Run e2e tests
run: make test-e2e
- name: Collect run artifacts
Expand Down
6 changes: 5 additions & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -592,12 +592,16 @@ test-e2e-push-image: $(GINKGO) $(HELM) $(CLUSTERCTL) kubectl e2e-image-push
$(E2E_RUN_COMMAND)

.PHONY: e2e-image
e2e-image: ## Build the image for e2e tests
e2e-image: ## Build and push the image for e2e tests
CONTROLLER_IMG=$(REGISTRY)/$(ORG)/turtles-e2e $(MAKE) e2e-image-build
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 \
Expand Down

0 comments on commit c2c9d29

Please sign in to comment.