Skip to content
This repository has been archived by the owner on Jan 9, 2025. It is now read-only.

ci(workflows,makefile): update ray image tag #122

Merged
merged 1 commit into from
Feb 29, 2024
Merged

ci(workflows,makefile): update ray image tag #122

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
10 changes: 5 additions & 5 deletions .github/workflows/helm-integration-test-console.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -110,8 +110,8 @@ jobs:
--set edition=k8s-ce:test \
--set modelBackend.image.tag=latest \
--set controllerModel.image.tag=latest \
--set rayService.image.tag=latest \
--set itMode.enabled=true \
--set ray.platform=cpu \
--set tags.observability=false

- name: Run console integration test (latest)
Expand Down Expand Up @@ -291,8 +291,8 @@ jobs:
--set edition=k8s-ce:test \
--set modelBackend.image.tag=latest \
--set controllerModel.image.tag=latest \
--set rayService.image.tag=latest \
--set itMode.enabled=true \
--set ray.platform=arm \
--set tags.observability=false

- name: Run console integration test (latest)
Expand Down Expand Up @@ -431,8 +431,8 @@ jobs:
--set edition=k8s-ce:test \
--set modelBackend.image.tag=latest \
--set controllerModel.image.tag=latest \
--set rayService.image.tag=latest \
--set itMode.enabled=true \
--set ray.platform=cpu \
--set tags.observability=false

- name: Run console integration test (release)
Expand All @@ -455,7 +455,7 @@ jobs:

helm-integration-test-release-mac:
if: false
# disable the mac test temporary
# disable the mac test temporary
# if: inputs.target == 'release'
runs-on: [self-hosted, macOS, core]
timeout-minutes: 30
Expand Down Expand Up @@ -612,8 +612,8 @@ jobs:
--set edition=k8s-ce:test \
--set modelBackend.image.tag=latest \
--set controllerModel.image.tag=latest \
--set rayService.image.tag=latest \
--set itMode.enabled=true \
--set ray.platform=arm \
--set tags.observability=false

- name: Run console integration test (release)
Expand Down
16 changes: 8 additions & 8 deletions .github/workflows/integration-test-console.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,13 +92,13 @@ jobs:
run: |
ITMODE_ENABLED=true \
TRITON_CONDA_ENV_PLATFORM=cpu \
RAY_PLATFORM=cpu \
RAY_LATEST_TAG=latest \
COMPOSE_PROFILES=all \
EDITION=local-ce:test \
docker compose -f docker-compose.yml -f docker-compose.latest.yml up -d --quiet-pull
ITMODE_ENABLED=true \
TRITON_CONDA_ENV_PLATFORM=cpu \
RAY_PLATFORM=cpu \
RAY_LATEST_TAG=latest \
COMPOSE_PROFILES=all \
EDITION=local-ce:test \
docker compose -f docker-compose.yml -f docker-compose.latest.yml rm -f
Expand Down Expand Up @@ -231,13 +231,13 @@ jobs:
make build-latest
ITMODE_ENABLED=true \
TRITON_CONDA_ENV_PLATFORM=cpu \
RAY_PLATFORM=arm \
RAY_LATEST_TAG=latest \
COMPOSE_PROFILES=all \
EDITION=local-ce:test \
docker compose -f docker-compose.yml -f docker-compose.latest.yml up -d --quiet-pull
ITMODE_ENABLED=true \
TRITON_CONDA_ENV_PLATFORM=cpu \
RAY_PLATFORM=arm \
RAY_LATEST_TAG=latest \
COMPOSE_PROFILES=all \
EDITION=local-ce:test \
docker compose -f docker-compose.yml -f docker-compose.latest.yml rm -f
Expand Down Expand Up @@ -385,13 +385,13 @@ jobs:
make build-latest
ITMODE_ENABLED=true \
TRITON_CONDA_ENV_PLATFORM=cpu \
RAY_PLATFORM=cpu \
RAY_RELEASE_TAG=${RAY_SERVER_VERSION} \
COMPOSE_PROFILES=all \
EDITION=local-ce:test \
docker compose -f docker-compose.yml -f docker-compose.latest.yml up -d --quiet-pull
ITMODE_ENABLED=true \
TRITON_CONDA_ENV_PLATFORM=cpu \
RAY_PLATFORM=cpu \
RAY_RELEASE_TAG=${RAY_SERVER_VERSION} \
COMPOSE_PROFILES=all \
EDITION=local-ce:test \
docker compose -f docker-compose.yml -f docker-compose.latest.yml rm -f
Expand Down Expand Up @@ -522,13 +522,13 @@ jobs:
make build-latest
ITMODE_ENABLED=true \
TRITON_CONDA_ENV_PLATFORM=cpu \
RAY_PLATFORM=arm \
RAY_RELEASE_TAG=${RAY_SERVER_VERSION} \
COMPOSE_PROFILES=all \
EDITION=local-ce:test \
docker compose -f docker-compose.yml -f docker-compose.latest.yml up -d --quiet-pull
ITMODE_ENABLED=true \
TRITON_CONDA_ENV_PLATFORM=cpu \
RAY_PLATFORM=arm \
RAY_RELEASE_TAG=${RAY_SERVER_VERSION} \
COMPOSE_PROFILES=all \
EDITION=local-ce:test \
docker compose -f docker-compose.yml -f docker-compose.latest.yml rm -f
Expand Down
27 changes: 8 additions & 19 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,13 +13,6 @@ endif

UNAME_S := $(shell uname -s)

# ray container platform for integration-test
ifeq ($(shell uname -p),arm)
RAY_PLATFORM := arm
else
RAY_PLATFORM := cpu
endif

INSTILL_CORE_VERSION := $(shell git tag --sort=committerdate | grep -E '[0-9]' | tail -1 | cut -b 2-)

CONTAINER_BUILD_NAME := core-build
Expand Down Expand Up @@ -336,16 +329,15 @@ console-integration-test-latest: ## Run console integration test on the latest
/bin/sh -c 'cd /instill-ai/vdp && COMPOSE_PROFILES=all EDITION=local-ce:test docker compose -f docker-compose.yml -f docker-compose.latest.yml up -d --quiet-pull' && \
/bin/sh -c 'rm -rf $${TMP_CONFIG_DIR}/*' \
" && rm -rf $${TMP_CONFIG_DIR}
@export TMP_CONFIG_DIR=$(shell mktemp -d) && export RAY_PLATFORM=${RAY_PLATFORM} && docker run --rm \
@export TMP_CONFIG_DIR=$(shell mktemp -d) && docker run --rm \
-v /var/run/docker.sock:/var/run/docker.sock \
-v $${TMP_CONFIG_DIR}:$${TMP_CONFIG_DIR} \
-e RAY_PLATFORM:$${RAY_PLATFORM} \
--name ${CONTAINER_COMPOSE_NAME}-latest \
${CONTAINER_COMPOSE_IMAGE_NAME}:latest /bin/sh -c " \
cp /instill-ai/model/.env $${TMP_CONFIG_DIR}/.env && \
cp /instill-ai/model/docker-compose.build.yml $${TMP_CONFIG_DIR}/docker-compose.build.yml && \
/bin/sh -c 'cd /instill-ai/model && make build-latest BUILD_CONFIG_DIR_PATH=$${TMP_CONFIG_DIR}' && \
/bin/sh -c 'cd /instill-ai/model && COMPOSE_PROFILES=all EDITION=local-ce:test ITMODE_ENABLED=true TRITON_CONDA_ENV_PLATFORM=cpu RAY_PLATFORM=$${RAY_PLATFORM} docker compose -f docker-compose.yml -f docker-compose.latest.yml up -d --quiet-pull' && \
/bin/sh -c 'cd /instill-ai/model && COMPOSE_PROFILES=all EDITION=local-ce:test ITMODE_ENABLED=true TRITON_CONDA_ENV_PLATFORM=cpu RAY_LATEST_TAG=latest docker compose -f docker-compose.yml -f docker-compose.latest.yml up -d --quiet-pull' && \
/bin/sh -c 'rm -rf $${TMP_CONFIG_DIR}/*' \
" && rm -rf $${TMP_CONFIG_DIR}
@docker run --rm \
Expand Down Expand Up @@ -377,16 +369,15 @@ console-integration-test-release: ## Run console integration test on the relea
/bin/sh -c 'cd /instill-ai/vdp && COMPOSE_PROFILES=all EDITION=local-ce:test docker compose -f docker-compose.yml -f docker-compose.latest.yml up -d --quiet-pull' && \
/bin/sh -c 'rm -rf $${TMP_CONFIG_DIR}/*' \
" && rm -rf $${TMP_CONFIG_DIR}
@export TMP_CONFIG_DIR=$(shell mktemp -d) && export RAY_PLATFORM=${RAY_PLATFORM} && docker run --rm \
@export TMP_CONFIG_DIR=$(shell mktemp -d) && docker run --rm \
-v /var/run/docker.sock:/var/run/docker.sock \
-v $${TMP_CONFIG_DIR}:$${TMP_CONFIG_DIR} \
-e RAY_PLATFORM:$${RAY_PLATFORM} \
--name ${CONTAINER_COMPOSE_NAME}-latest \
${CONTAINER_COMPOSE_IMAGE_NAME}:latest /bin/sh -c " \
cp /instill-ai/model/.env $${TMP_CONFIG_DIR}/.env && \
cp /instill-ai/model/docker-compose.build.yml $${TMP_CONFIG_DIR}/docker-compose.build.yml && \
/bin/sh -c 'cd /instill-ai/model && make build-latest BUILD_CONFIG_DIR_PATH=$${TMP_CONFIG_DIR}' && \
/bin/sh -c 'cd /instill-ai/model && COMPOSE_PROFILES=all EDITION=local-ce:test ITMODE_ENABLED=true TRITON_CONDA_ENV_PLATFORM=cpu RAY_PLATFORM=$${RAY_PLATFORM} docker compose -f docker-compose.yml -f docker-compose.latest.yml up -d --quiet-pull' && \
/bin/sh -c 'cd /instill-ai/model && COMPOSE_PROFILES=all EDITION=local-ce:test ITMODE_ENABLED=true TRITON_CONDA_ENV_PLATFORM=cpu RAY_LATEST_TAG=latest docker compose -f docker-compose.yml -f docker-compose.latest.yml up -d --quiet-pull' && \
/bin/sh -c 'rm -rf $${TMP_CONFIG_DIR}/*' \
" && rm -rf $${TMP_CONFIG_DIR}
@docker run --rm \
Expand Down Expand Up @@ -455,11 +446,10 @@ endif
--set controllerVDP.image.tag=latest' \
/bin/sh -c 'rm -rf $${TMP_CONFIG_DIR}/*' \
" && rm -rf $${TMP_CONFIG_DIR}
@export TMP_CONFIG_DIR=$(shell mktemp -d) && export RAY_PLATFORM=${RAY_PLATFORM} && docker run --rm \
@export TMP_CONFIG_DIR=$(shell mktemp -d) && docker run --rm \
-v ${HOME}/.kube/config:/root/.kube/config \
-v /var/run/docker.sock:/var/run/docker.sock \
-v $${TMP_CONFIG_DIR}:$${TMP_CONFIG_DIR} \
-e RAY_PLATFORM:$${RAY_PLATFORM} \
${DOCKER_HELM_IT_EXTRA_PARAMS} \
--name ${CONTAINER_CONSOLE_INTEGRATION_TEST_NAME}-latest \
${CONTAINER_COMPOSE_IMAGE_NAME}:latest /bin/sh -c " \
Expand All @@ -471,8 +461,8 @@ endif
--set edition=k8s-ce:test \
--set modelBackend.image.tag=latest \
--set controllerModel.image.tag=latest \
--set rayService.image.tag=latest \
--set itMode.enabled=true' \
--set ray.platform=$${RAY_PLATFORM} \
/bin/sh -c 'rm -rf $${TMP_CONFIG_DIR}/*' \
" && rm -rf $${TMP_CONFIG_DIR}
ifeq ($(UNAME_S),Darwin)
Expand Down Expand Up @@ -561,11 +551,10 @@ endif
--set controllerVDP.image.tag=latest' \
/bin/sh -c 'rm -rf $${TMP_CONFIG_DIR}/*' \
" && rm -rf $${TMP_CONFIG_DIR}
@export TMP_CONFIG_DIR=$(shell mktemp -d) && export RAY_PLATFORM=${RAY_PLATFORM} && docker run --rm \
@export TMP_CONFIG_DIR=$(shell mktemp -d) && docker run --rm \
-v ${HOME}/.kube/config:/root/.kube/config \
-v /var/run/docker.sock:/var/run/docker.sock \
-v $${TMP_CONFIG_DIR}:$${TMP_CONFIG_DIR} \
-e RAY_PLATFORM:$${RAY_PLATFORM} \
${DOCKER_HELM_IT_EXTRA_PARAMS} \
--name ${CONTAINER_CONSOLE_INTEGRATION_TEST_NAME}-latest \
${CONTAINER_COMPOSE_IMAGE_NAME}:latest /bin/sh -c " \
Expand All @@ -577,8 +566,8 @@ endif
--set edition=k8s-ce:test \
--set modelBackend.image.tag=latest \
--set controllerModel.image.tag=latest \
--set rayService.image.tag=latest \
--set itMode.enabled=true' \
--set ray.platform=$${RAY_PLATFORM} \
/bin/sh -c 'rm -rf $${TMP_CONFIG_DIR}/*' \
" && rm -rf $${TMP_CONFIG_DIR}
ifeq ($(UNAME_S),Darwin)
Expand Down
Loading