From 801df306c0ee3d86b7db8dbba82bfdc5e391d69e Mon Sep 17 00:00:00 2001 From: ishaansehgal99 Date: Wed, 8 May 2024 19:02:03 -0700 Subject: [PATCH 1/4] add env --- .github/workflows/e2e-workflow.yml | 1 + Makefile | 2 ++ 2 files changed, 3 insertions(+) diff --git a/.github/workflows/e2e-workflow.yml b/.github/workflows/e2e-workflow.yml index e31021b5c..3e99edd81 100644 --- a/.github/workflows/e2e-workflow.yml +++ b/.github/workflows/e2e-workflow.yml @@ -195,6 +195,7 @@ jobs: RUN_LLAMA_13B: ${{ env.RUN_LLAMA_13B }} AI_MODELS_REGISTRY: ${{ secrets.E2E_ACR_AMRT_USERNAME }}.azurecr.io AI_MODELS_REGISTRY_SECRET: ${{ secrets.E2E_AMRT_SECRET_NAME }} + SUPPORTED_MODELS_YAML_PATH: "/home/runner/work/kaito/kaito/presets/models/supported_models.yaml" - name: Cleanup e2e resources if: ${{ always() }} diff --git a/Makefile b/Makefile index d10bfcb25..53af27c52 100644 --- a/Makefile +++ b/Makefile @@ -33,6 +33,7 @@ KAITO_NAMESPACE ?= kaito-workspace RUN_LLAMA_13B ?= false AI_MODELS_REGISTRY ?= modelregistry.azurecr.io AI_MODELS_REGISTRY_SECRET ?= modelregistry +SUPPORTED_MODELS_YAML_PATH ?= ~/kaito/presets/models/supported_models.yaml # Scripts GO_INSTALL := ./hack/go-install.sh @@ -108,6 +109,7 @@ GINKGO_ARGS ?= -focus="$(GINKGO_FOCUS)" -skip="$(GINKGO_SKIP)" -nodes=$(GINKGO_N kaito-workspace-e2e-test: $(E2E_TEST) $(GINKGO) AI_MODELS_REGISTRY_SECRET=$(AI_MODELS_REGISTRY_SECRET) RUN_LLAMA_13B=$(RUN_LLAMA_13B) \ AI_MODELS_REGISTRY=$(AI_MODELS_REGISTRY) GPU_NAMESPACE=$(GPU_NAMESPACE) KAITO_NAMESPACE=$(KAITO_NAMESPACE) \ + SUPPORTED_MODELS_YAML_PATH=$(SUPPORTED_MODELS_YAML_PATH) \ $(GINKGO) -v -trace $(GINKGO_ARGS) $(E2E_TEST) .PHONY: create-rg From 851c6cc8ec1101c6b84043b8aae10d97517e5fa6 Mon Sep 17 00:00:00 2001 From: ishaansehgal99 Date: Wed, 8 May 2024 19:03:04 -0700 Subject: [PATCH 2/4] add env --- test/e2e/preset_test.go | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/test/e2e/preset_test.go b/test/e2e/preset_test.go index e8f262ef0..0cc9c938d 100644 --- a/test/e2e/preset_test.go +++ b/test/e2e/preset_test.go @@ -337,6 +337,7 @@ func deleteWorkspace(workspaceObj *kaitov1alpha1.Workspace) error { var runLlama13B bool var aiModelsRegistry string var aiModelsRegistrySecret string +var supportedModelsYamlPath string var modelInfo map[string]string var _ = Describe("Workspace Preset", func() { @@ -351,9 +352,10 @@ var _ = Describe("Workspace Preset", func() { aiModelsRegistry = utils.GetEnv("AI_MODELS_REGISTRY") aiModelsRegistrySecret = utils.GetEnv("AI_MODELS_REGISTRY_SECRET") + supportedModelsYamlPath = utils.GetEnv("SUPPORTED_MODELS_YAML_PATH") // Load stable model versions - configs, err := utils.GetModelConfigInfo("/home/runner/work/kaito/kaito/presets/models/supported_models.yaml") + configs, err := utils.GetModelConfigInfo(supportedModelsYamlPath) if err != nil { fmt.Printf("Failed to load model configs: %v\n", err) os.Exit(1) From 496acd611f3c763627143ade8433e7971e249766 Mon Sep 17 00:00:00 2001 From: Ishaan Sehgal Date: Wed, 8 May 2024 19:43:03 -0700 Subject: [PATCH 3/4] Update Makefile Signed-off-by: Ishaan Sehgal --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 68e528fcc..cd9ac1ebe 100644 --- a/Makefile +++ b/Makefile @@ -36,7 +36,7 @@ GPU_PROVISIONER_MSI_NAME ?= gpuIdentity RUN_LLAMA_13B ?= false AI_MODELS_REGISTRY ?= modelregistry.azurecr.io AI_MODELS_REGISTRY_SECRET ?= modelregistry -SUPPORTED_MODELS_YAML_PATH ?= ~/kaito/presets/models/supported_models.yaml +SUPPORTED_MODELS_YAML_PATH ?= /home/runner/work/kaito/kaito/presets/models/supported_models.yaml # Scripts GO_INSTALL := ./hack/go-install.sh From fbf5e8c24f42ba6e2f3110914bb71c0f43d9829c Mon Sep 17 00:00:00 2001 From: Ishaan Sehgal Date: Wed, 8 May 2024 19:43:37 -0700 Subject: [PATCH 4/4] Update e2e-workflow.yml Signed-off-by: Ishaan Sehgal --- .github/workflows/e2e-workflow.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/e2e-workflow.yml b/.github/workflows/e2e-workflow.yml index 9695e7dc2..3e5465b94 100644 --- a/.github/workflows/e2e-workflow.yml +++ b/.github/workflows/e2e-workflow.yml @@ -198,7 +198,6 @@ jobs: RUN_LLAMA_13B: ${{ env.RUN_LLAMA_13B }} AI_MODELS_REGISTRY: ${{ secrets.E2E_ACR_AMRT_USERNAME }}.azurecr.io AI_MODELS_REGISTRY_SECRET: ${{ secrets.E2E_AMRT_SECRET_NAME }} - SUPPORTED_MODELS_YAML_PATH: "/home/runner/work/kaito/kaito/presets/models/supported_models.yaml" - name: Cleanup e2e resources if: ${{ always() }}