From d1d8f859e6a945def8aad83b318c8b787e9a702b Mon Sep 17 00:00:00 2001
From: Connor Hack <connorhack@meta.com>
Date: Fri, 22 Nov 2024 12:51:34 -0800
Subject: [PATCH] Update checkpointd directory setting

---
 .../gha_workflow_llama_stack_tests.yml        | 27 +++++--------------
 1 file changed, 6 insertions(+), 21 deletions(-)

diff --git a/.github/workflows/gha_workflow_llama_stack_tests.yml b/.github/workflows/gha_workflow_llama_stack_tests.yml
index 1165215f0..8e5731d1b 100644
--- a/.github/workflows/gha_workflow_llama_stack_tests.yml
+++ b/.github/workflows/gha_workflow_llama_stack_tests.yml
@@ -56,7 +56,7 @@ env:
   PROVIDER_ID: "${{ inputs.provider_id || 'meta_reference' }}"
 
   # Path to model checkpoints within EFS volume
-  MODEL_CHECKPOINT_DIR: "/data/llama/"
+  MODEL_CHECKPOINT_DIR: "/data/llama"
 
   # Path to directory to run tests from
   TESTS_PATH: "${{ github.workspace }}/llama_stack/providers/tests"
@@ -114,27 +114,12 @@ jobs:
         id: check_model_id
         run: |
           if [[ " ${AVAILABLE_MODEL_IDs[@]} " =~ " ${MODEL_ID} " ]]; then
-            echo "Model ID ${MODEL_ID} is valid"
+            echo "Model ID '${MODEL_ID}' is valid"
           else
-            echo "Model ID ${MODEL_ID} is invalid, Terminating workflow."
+            echo "Model ID '${MODEL_ID}' is invalid, Terminating workflow."
             exit 1
           fi
 
-      - name: "Check if models exist in EFS volume"
-        id: check_if_models_exist
-        run: |
-          MODEL_IDS="${LLAMA_3B_OVERRIDE},${LLAMA_8B_OVERRIDE}"
-          for model_id in ${MODEL_IDS//,/ }; do
-            model_path="${MODEL_CHECKPOINT_DIR}/${model_id}"
-            if [ ! -d "${model_path}" ]; then
-              echo "Model '${model_id}' does not exist in mounted EFS volume, Terminating workflow."
-              exit 1
-            else
-              echo "Content of '${model_id}' model"
-              ls -la "${model_path}"
-            fi
-          done
-
       #######################
       #### CODE CHECKOUT ####
       #######################
@@ -196,12 +181,12 @@ jobs:
       - name: "Update checkpoint directory"
         id: checkpoint_update
         run: |
-          if ${MODEL_ID} == "llama_3b" ; then
+          if ${MODEL_ID} == "llama_3b" &&  [ -d "${MODEL_CHECKPOINT_DIR}/$LLAMA_3B_OVERRIDE" ]; then
             echo "MODEL_CHECKPOINT_DIR=${MODEL_CHECKPOINT_DIR}/$LLAMA_3B_OVERRIDE" >> "$GITHUB_ENV"
-          elif ${MODEL_ID} == "llama_8b" ; then
+          elif ${MODEL_ID} == "llama_8b" && [ -d "${MODEL_CHECKPOINT_DIR}/$LLAMA_8B_OVERRIDE" ]; then
             echo "MODEL_CHECKPOINT_DIR=${MODEL_CHECKPOINT_DIR}/$LLAMA_8B_OVERRIDE" >> "$GITHUB_ENV"
           else
-            echo "MODEL_ID is not valid, Terminating workflow."
+            echo "MODEL_ID & LLAMA_*B_OVERRIDE are not a valid pairing, Terminating workflow."
             exit 1
           fi