chore(async-job): ensure async job has a separate env var from mr service

Signed-off-by: Eric Dobroveanu <[email protected]>

Author: Crazyglue

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

@@ -49,8 +49,12 @@ jobs:
           set -x
           sudo apparmor_parser -R /etc/apparmor.d/usr.sbin.mysqld
       - name: Run E2E tests
+        env:
+          IMG_VERSION: e2e
+          JOB_IMG_VERSION: e2e
+          BUILD_IMAGE: true
         run: |
-          make test-e2e
+          IMG_VERSION=e2e JOB_IMG_VERSION=e2e make test-e2e
   job-test:
     runs-on: ubuntu-latest
     defaults:
@@ -71,6 +75,8 @@ jobs:
           sudo apparmor_parser -R /etc/apparmor.d/usr.sbin.mysqld
       - name: Execute Sample Job E2E test
         env:
-          IMG_VERSION: e2e
+          IMG_VERSION: integration
+          JOB_IMG_VERSION: integration
+          BUILD_IMAGE: true
         run: |
-          make test-integration
+          IMG_VERSION=integration JOB_IMG_VERSION=integration make test-integration

jobs/async-upload/Makefile

@@ -1,16 +1,16 @@
-IMG_VERSION ?= latest
-IMG_REGISTRY ?= ghcr.io
-IMG_ORG ?= kubeflow
-IMG_NAME ?= model-registry/job/async-upload
-IMG ?= $(IMG_REGISTRY)/$(IMG_ORG)/$(IMG_NAME):$(IMG_VERSION)
+JOB_IMG_VERSION ?= latest
+JOB_IMG_REGISTRY ?= ghcr.io
+JOB_IMG_ORG ?= kubeflow
+JOB_IMG_NAME ?= model-registry/job/async-upload
+JOB_IMG ?= $(JOB_IMG_REGISTRY)/$(JOB_IMG_ORG)/$(JOB_IMG_NAME):$(JOB_IMG_VERSION)
 BUILD_IMAGE ?= true # whether to build the MR server image
 CLUSTER_NAME ?= mr-e2e
 
 .PHONY: deploy-latest-mr
 deploy-latest-mr:
 	cd ../../ && \
 	$(if $(filter true,$(BUILD_IMAGE)),\
-		IMG_VERSION=${IMG_VERSION} make image/build ARGS="--load$(if ${DEV_BUILD}, --target dev-build)" && \
+		JOB_IMG_VERSION=${JOB_IMG_VERSION} make image/build ARGS="--load$(if ${DEV_BUILD}, --target dev-build)" && \
 	) \
 	LOCAL=1 ./scripts/deploy_on_kind.sh
 	kubectl port-forward -n kubeflow services/model-registry-service 8080:8080 & echo $$! >> .port-forwards.pid
@@ -29,8 +29,8 @@ deploy-local-registry:
 
 .PHONY: dev-load-image
 dev-load-image:
-	docker buildx build --load -t $(IMG) .
-	kind load docker-image $(IMG) -n $(CLUSTER_NAME)
+	docker buildx build --load -t $(JOB_IMG) .
+	kind load docker-image $(JOB_IMG) -n $(CLUSTER_NAME)
 
 .PHONY: test
 test:
@@ -73,7 +73,7 @@ test-integration-run:
 	@echo "Ensuring all extras are installed..."
 	poetry install --all-extras --with integration
 	@echo "Running integration tests..."
-	CONTAINER_IMAGE_URI=$(IMG) poetry run pytest --integration tests/integration/ -vs
+	CONTAINER_IMAGE_URI=$(JOB_IMG) poetry run pytest --integration tests/integration/ -vs
 
 .PHONY: install
 install: