chore(makefile): use version tag for pipeline and model backend

instill-ai · Apr 18, 2024 · e6da461 · e6da461
1 parent e002430
commit e6da461
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 12 deletions.
diff --git a/.github/workflows/helm-integration-test-backend.yml b/.github/workflows/helm-integration-test-backend.yml
@@ -57,9 +57,9 @@ jobs:
             --set apiGateway.image.tag=latest \
             --set mgmtBackend.image.tag=latest \
             --set mgmtBackend.instillCoreHost=http://${INSTILL_CORE_HOST}:${API_GATEWAY_PORT} \
-            --set pipelineBackend.image.tag=latest \
+            --set pipelineBackend.image.tag=${PIPELINE_BACKEND_VERSION} \
             --set pipelineBackend.excludelocalconnector=false \
-            --set modelBackend.image.tag=latest \
+            --set modelBackend.image.tag=${MODEL_BACKEND_VERSION} \
             --set console.image.tag=latest \
             --set rayService.image.tag=${RAY_SERVER_VERSION} \
             --set rayService.headGroupSpec.resources.limits.cpu=0 \

diff --git a/.github/workflows/helm-integration-test-console.yml b/.github/workflows/helm-integration-test-console.yml
@@ -50,9 +50,9 @@ jobs:
             --set apiGateway.image.tag=latest \
             --set mgmtBackend.image.tag=latest \
             --set mgmtBackend.instillCoreHost=http://${INSTILL_CORE_HOST}:${API_GATEWAY_PORT} \
-            --set pipelineBackend.image.tag=latest \
+            --set pipelineBackend.image.tag=${PIPELINE_BACKEND_VERSION} \
             --set pipelineBackend.excludelocalconnector=false \
-            --set modelBackend.image.tag=latest \
+            --set modelBackend.image.tag=${MODEL_BACKEND_VERSION} \
             --set console.image.tag=latest \
             --set rayService.image.tag=${RAY_SERVER_VERSION} \
             --set rayService.headGroupSpec.resources.limits.cpu=0 \

diff --git a/Makefile b/Makefile
@@ -93,8 +93,8 @@ build-latest:				## Build latest images for all Instill Core components
 			${INSTILL_CORE_IMAGE_NAME}:latest /bin/sh -c " \
 				API_GATEWAY_VERSION=latest \
 				MGMT_BACKEND_VERSION=latest \
-				PIPELINE_BACKEND_VERSION=latest \
-				MODEL_BACKEND_VERSION=latest \
+				PIPELINE_BACKEND_VERSION=${PIPELINE_BACKEND_VERSION} \
+				MODEL_BACKEND_VERSION=${MODEL_BACKEND_VERSION} \
 				ARTIFACT_BACKEND_VERSION=latest \
 				CONSOLE_VERSION=latest \
 				COMPOSE_PROFILES=${PROFILE} docker compose -f docker-compose-build.yml build --progress plain \
@@ -214,9 +214,9 @@ helm-integration-test-latest:                       ## Run integration test on t
 		--set mgmtBackend.image.tag=latest \
 		--set mgmtBackend.instillCoreHost=http://${INSTILL_CORE_HOST}:${API_GATEWAY_PORT} \
 		--set artifactBackend.image.tag=latest \
-		--set pipelineBackend.image.tag=latest \
+		--set pipelineBackend.image.tag=${PIPELINE_BACKEND_VERSION} \
 		--set pipelineBackend.excludelocalconnector=false \
-		--set modelBackend.image.tag=latest \
+		--set modelBackend.image.tag=${MODEL_BACKEND_VERSION} \
 		--set console.image.tag=latest \
 		--set rayService.image.tag=${RAY_LATEST_TAG} \
 		--set tags.observability=false \
@@ -332,9 +332,9 @@ ifeq ($(UNAME_S),Darwin)
 		--set mgmtBackend.image.tag=latest \
 		--set mgmtBackend.instillCoreHost=http://${INSTILL_CORE_HOST}:${API_GATEWAY_PORT} \
 		--set artifactBackend.image.tag=latest \
-		--set pipelineBackend.image.tag=latest \
+		--set pipelineBackend.image.tag=${PIPELINE_BACKEND_VERSION} \
 		--set pipelineBackend.excludelocalconnector=false \
-		--set modelBackend.image.tag=latest \
+		--set modelBackend.image.tag=${MODEL_BACKEND_VERSION} \
 		--set console.image.tag=latest \
 		--set rayService.image.tag=${RAY_LATEST_TAG} \
 		--set apiGatewayURL=http://host.docker.internal:${API_GATEWAY_PORT} \
@@ -350,9 +350,9 @@ else ifeq ($(UNAME_S),Linux)
 		--set mgmtBackend.image.tag=latest \
 		--set mgmtBackend.instillCoreHost=http://${INSTILL_CORE_HOST}:${API_GATEWAY_PORT} \
 		--set artifactBackend.image.tag=latest \
-		--set pipelineBackend.image.tag=latest \
+		--set pipelineBackend.image.tag=${PIPELINE_BACKEND_VERSION} \
 		--set pipelineBackend.excludelocalconnector=false \
-		--set modelBackend.image.tag=latest \
+		--set modelBackend.image.tag=${MODEL_BACKEND_VERSION} \
 		--set console.image.tag=latest \
 		--set rayService.image.tag=${RAY_LATEST_TAG} \
 		--set apiGatewayURL=http://localhost:${API_GATEWAY_PORT} \