chore(async-job): move env vars to the top level

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

Author: Crazyglue

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

@@ -17,6 +17,16 @@ on:
       - ".github/workflows/**"
 
 env:
+  # Async Job
+  JOB_IMG_REGISTRY: ghcr.io
+  JOB_IMG_ORG: kubeflow
+  JOB_IMG_NAME: model-registry/job/async-upload
+  JOB_IMG_VERSION: cicd
+  # MR Server
+  IMG_REGISTRY: ghcr.io
+  IMG_ORG: kubeflow
+  IMG_REPO: model-registry/server
+  IMG_VERSION: cicd
   PUSH_IMAGE: false
 
 jobs:
@@ -45,9 +55,6 @@ jobs:
           set -x
           sudo apparmor_parser -R /etc/apparmor.d/usr.sbin.mysqld
       - name: Run E2E tests
-        env:
-          IMG_VERSION: e2e
-          IMG: ghcr.io/kubeflow/model-registry/server:e2e
         run: |
           make test-e2e
   job-test:

Makefile

@@ -31,8 +31,10 @@ IMG_REPO ?= model-registry/server
 # container image build path
 BUILD_PATH ?= .
 # container image
-ifdef IMG_REGISTRY
-    IMG := ${IMG_REGISTRY}/${IMG_ORG}/${IMG_REPO}
+ifdef IMG
+	IMG := ${IMG}
+else ifdef IMG_REGISTRY
+    IMG := ${IMG_REGISTRY}/${IMG_ORG}/${IMG_REPO}:${IMG_VERSION}
 else
     IMG := ${IMG_ORG}/${IMG_REPO}
 endif
@@ -332,7 +334,7 @@ endif
 # build docker image
 .PHONY: image/build
 image/build:
-	${DOCKER} build ${BUILD_PATH} -f ${DOCKERFILE} -t ${IMG}:$(IMG_VERSION) $(ARGS)
+	${DOCKER} build ${BUILD_PATH} -f ${DOCKERFILE} -t ${IMG} $(ARGS)
 
 # build docker image using buildx
 # PLATFORMS defines the target platforms for the model registry image be built to provide support to multiple

jobs/async-upload/Makefile

@@ -15,10 +15,8 @@ deploy-latest-mr:
 	cd ../../ && \
 	$(if $(filter true,$(BUILD_IMAGE)),\
 		IMG_VERSION=${IMG_VERSION} IMG=${IMG} make image/build ARGS="--load$(if ${DEV_BUILD}, --target dev-build)" && \
-	,\
-		docker pull $(IMG) && \
 	) \
-	LOCAL=1 ./scripts/deploy_on_kind.sh
+	LOCAL=1 IMG=${IMG} ./scripts/deploy_on_kind.sh
 	kubectl port-forward -n kubeflow services/model-registry-service 8080:8080 & echo $$! >> .port-forwards.pid
 
 .PHONY: deploy-test-minio