[Setup] [Run] bugfix: emergency fix to restore CI/CD functionality (llm-d#228)

* [Setup] [Run] bugfix: emergency fix to restore CI/CD functionality

* Make the stack endpoint URL on run conditional.

---------

Signed-off-by: maugustosilva <maugusto.silva@gmail.com>

Author: maugustosilva

.gitignore

@@ -58,3 +58,5 @@ venv/
 ENV/
 env.bak/
 venv.bak/
+
+scenarios/none.sh

setup/env.sh

@@ -281,14 +281,18 @@ if [[ ! -z $LLMDBENCH_DEPLOY_SCENARIO ]]; then
   else
     export LLMDBENCH_SCENARIO_FULL_PATH=$(echo ${LLMDBENCH_MAIN_DIR}/scenarios/$LLMDBENCH_DEPLOY_SCENARIO'.sh' | $LLMDBENCH_CONTROL_SCMD 's^.sh.sh^.sh^g')
   fi
-  if [[ -f $LLMDBENCH_SCENARIO_FULL_PATH ]]; then
-    source $LLMDBENCH_SCENARIO_FULL_PATH
-  elif [[ $LLMDBENCH_SCENARIO_FULL_PATH == "${LLMDBENCH_MAIN_DIR}/scenarios/none.sh" ]]; then
-    true
-  else
-    echo "❌ Scenario file \"$LLMDBENCH_SCENARIO_FULL_PATH\" could not be found."
-    exit 1
-  fi
+else
+  export LLMDBENCH_SCENARIO_FULL_PATH="${LLMDBENCH_MAIN_DIR}/scenarios/none.sh"
+  touch ${LLMDBENCH_MAIN_DIR}/scenarios/none.sh
+fi
+
+if [[ -f $LLMDBENCH_SCENARIO_FULL_PATH ]]; then
+  source $LLMDBENCH_SCENARIO_FULL_PATH
+elif [[ $LLMDBENCH_SCENARIO_FULL_PATH == "${LLMDBENCH_MAIN_DIR}/scenarios/none.sh" ]]; then
+  touch ${LLMDBENCH_MAIN_DIR}/scenarios/none.sh
+else
+  echo "❌ Scenario file \"$LLMDBENCH_SCENARIO_FULL_PATH\" could not be found."
+  exit 1
 fi
 
 if [[ "$LLMDBENCH_VLLM_MODELSERVICE_GAIE_PRESETS" == /* ]]; then

setup/run.sh

@@ -194,6 +194,7 @@ for method in ${LLMDBENCH_DEPLOY_METHODS//,/ }; do
 
   for model in ${LLMDBENCH_DEPLOY_MODEL_LIST//,/ }; do
     export LLMDBENCH_DEPLOY_CURRENT_MODEL=$(model_attribute $model model)
+    export LLMDBENCH_DEPLOY_CURRENT_MODELID=$(model_attribute $model modelid)
 
     export LLMDBENCH_RUN_HARNESS_LAUNCHER_NAME=llmdbench-${LLMDBENCH_HARNESS_NAME}-launcher
 
@@ -251,7 +252,11 @@ for method in ${LLMDBENCH_DEPLOY_METHODS//,/ }; do
         exit 1
       fi
 
-      export LLMDBENCH_HARNESS_STACK_ENDPOINT_URL="http://${LLMDBENCH_HARNESS_STACK_ENDPOINT_NAME}${LLMDBENCH_VLLM_COMMON_FQDN}:${LLMDBENCH_HARNESS_STACK_ENDPOINT_PORT}"
+      if [[ $LLMDBENCH_CONTROL_ENVIRONMENT_TYPE_MODELSERVICE_ACTIVE -eq 1 ]]; then
+        export LLMDBENCH_HARNESS_STACK_ENDPOINT_URL="http://${LLMDBENCH_HARNESS_STACK_ENDPOINT_NAME}${LLMDBENCH_VLLM_COMMON_FQDN}:${LLMDBENCH_HARNESS_STACK_ENDPOINT_PORT}/${LLMDBENCH_DEPLOY_CURRENT_MODELID}"
+      else
+        export LLMDBENCH_HARNESS_STACK_ENDPOINT_URL="http://${LLMDBENCH_HARNESS_STACK_ENDPOINT_NAME}${LLMDBENCH_VLLM_COMMON_FQDN}:${LLMDBENCH_HARNESS_STACK_ENDPOINT_PORT}"
+      fi
       announce "ℹ️ Stack Endpoint URL detected is \"$LLMDBENCH_HARNESS_STACK_ENDPOINT_URL\""
 
       if [[ $LLMDBENCH_CONTROL_DRY_RUN -eq 1 ]]; then

setup/steps/02_ensure_gateway_provider.sh

@@ -36,7 +36,7 @@ if [[ $LLMDBENCH_CONTROL_ENVIRONMENT_TYPE_MODELSERVICE_ACTIVE -eq 1 ]]; then
       fi
 
     else
-        announce "❗No privileges to setup Gateway Provider. Will assume an user with proper privileges already performed this action."
+        announce "❗No privileges to setup Gateway Provider. Will assume a user with proper privileges already performed this action."
     fi
   fi
 

setup/steps/07_deploy_setup.sh

@@ -2,7 +2,7 @@
 source ${LLMDBENCH_CONTROL_DIR}/env.sh
 
 if [[ $LLMDBENCH_CONTROL_ENVIRONMENT_TYPE_MODELSERVICE_ACTIVE -eq 1 ]]; then
-  
+
   # make sure llm-d-modelservice helm repo is available
   llmdbench_execute_cmd "$LLMDBENCH_CONTROL_HCMD repo add ${LLMDBENCH_VLLM_MODELSERVICE_CHART_NAME} ${LLMDBENCH_VLLM_MODELSERVICE_HELM_REPOSITORY_URL} --force-update" ${LLMDBENCH_CONTROL_DRY_RUN} ${LLMDBENCH_CONTROL_VERBOSE}
   llmdbench_execute_cmd "$LLMDBENCH_CONTROL_HCMD repo update" ${LLMDBENCH_CONTROL_DRY_RUN} ${LLMDBENCH_CONTROL_VERBOSE}
@@ -62,7 +62,7 @@ releases:
       managedBy: helmfile
 EOF
 
-    ((model_number++))
+    model_number=$((model_number + 1))
   done
   announce "✅ Completed gaie deployment"
 else

setup/steps/08_deploy_gaie.sh

@@ -50,7 +50,7 @@ EOF
 
     unset LLMDBENCH_DEPLOY_CURRENT_MODEL_ID_LABEL
 
-    ((model_number++))
+    model_number=$((model_number + 1))
   done
   announce "✅ Completed model deployment"
 else

setup/steps/09_deploy_via_modelservice.sh

@@ -302,8 +302,8 @@ EOF
     unset LLMDBENCH_DEPLOY_CURRENT_MODEL
     unset LLMDBENCH_DEPLOY_CURRENT_MODEL_ID
     unset LLMDBENCH_DEPLOY_CURRENT_MODEL_ID_LABEL
-  
-    ((model_number++))
+
+    model_number=$((model_number + 1))
   done
   announce "✅ modelservice completed model deployment"