Skip to content
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
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: 3 additions & 3 deletions .github/workflows/async-upload-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -53,9 +53,9 @@ jobs:
- name: Run tests
run: |
make test
- name: Run E2E tests
- name: Run integration tests
run: |
make test-e2e
make test-integration
job-test:
runs-on: ubuntu-latest
defaults:
Expand All @@ -72,7 +72,7 @@ jobs:
pipx install poetry
- name: Execute Sample Job E2E test
run: |
make test-integration
make test-e2e
check-autogen:
name: Check generated code or files are in sync
runs-on: ubuntu-latest
Expand Down
14 changes: 7 additions & 7 deletions jobs/async-upload/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ test-with-cov:
poetry run pytest --cov=job --cov-report=term-missing tests/

.PHONY: test-e2e
test-e2e: deploy-latest-mr deploy-local-registry deploy-test-minio
test-e2e: deploy-latest-mr deploy-local-registry deploy-test-minio dev-load-image
@echo "Starting test-e2e"
@set -e; \
$(MAKE) test-e2e-run || TEST_STATUS=$$?; \
Expand All @@ -60,9 +60,9 @@ test-e2e: deploy-latest-mr deploy-local-registry deploy-test-minio
.PHONY: test-e2e-run
test-e2e-run:
@echo "Ensuring all extras are installed..."
poetry install --all-extras
@echo "Running tests..."
poetry run pytest --e2e -s -x -rA
poetry install --all-extras --with integration
@echo "Running e2e tests..."
CONTAINER_IMAGE_URI=$(JOB_IMG) poetry run pytest --e2e tests/integration/ -vs

.PHONY: test-e2e-cleanup
test-e2e-cleanup:
Expand All @@ -73,7 +73,7 @@ test-e2e-cleanup:
fi

.PHONY: test-integration
test-integration: deploy-latest-mr deploy-local-registry deploy-test-minio dev-load-image
test-integration: deploy-latest-mr deploy-local-registry deploy-test-minio
@echo "Starting test-integration"
@set -e; \
$(MAKE) test-integration-run || TEST_STATUS=$$?; \
Expand All @@ -87,9 +87,9 @@ test-integration: deploy-latest-mr deploy-local-registry deploy-test-minio dev-l
.PHONY: test-integration-run
test-integration-run:
@echo "Ensuring all extras are installed..."
poetry install --all-extras --with integration
poetry install --all-extras
@echo "Running integration tests..."
CONTAINER_IMAGE_URI=$(JOB_IMG) poetry run pytest --integration tests/integration/ -vs
poetry run pytest --integration -s -x -rA

.PHONY: install
install: install-poetry-export
Expand Down
Loading
Loading