chore: fix marking of async upload job e2e and integration tests

Signed-off-by: Debarati Basu-Nag <dbasunag@redhat.com>

Author: dbasunag

.github/workflows/async-upload-test.yml

@@ -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:
@@ -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

jobs/async-upload/Makefile

@@ -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=$$?; \
@@ -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:
@@ -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=$$?; \
@@ -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