@@ -121,8 +121,8 @@ jobs:
121121 - name : set runs-on variable based on cluster provider
122122 id : set_runs_on
123123 run : |
124- echo "${{ github.workflow }}" | grep -q "\-ocp" || echo "$LLMDBENCH_CICD_TARGET" | grep -q "ocp"
125- if [[ $? -eq 0 ]]; then
124+ IS_OCP=$( echo "${{ github.workflow }}" | grep "\-ocp")$( echo "$LLMDBENCH_CICD_TARGET" | grep "ocp")
125+ if [[ ! -z $IS_OCP ]]; then
126126 echo "Targetting self-hosted runners (OpenShift)"
127127 JSON_LIST='["self-hosted", "openshift", "pok-prod"]'
128128 else
@@ -193,24 +193,24 @@ jobs:
193193 - name : Get GKE credentials
194194 if : inputs.cluster_provider != 'kind'
195195 run : |
196- echo "${{ github.workflow }}" | grep -q "\-gke" || echo "$LLMDBENCH_CICD_TARGET" | grep -q "gke"
197- if [[ $? -eq 0 ]]; then
196+ IS_GKE=$( echo "${{ github.workflow }}" | grep "\-gke")$( echo "$LLMDBENCH_CICD_TARGET" | grep "gke")
197+ if [[ ! -z $IS_GKE ]]; then
198198 echo "Selected \"Google Kubernetes Engine\" kubeconfig"
199199 gcloud container clusters get-credentials "${{ env.GKE_CLUSTER_NAME }}" --zone "${{ env.GKE_CLUSTER_ZONE }}"
200- fi
200+ fi
201201 shell : bash
202202
203203 - name : Set up kubeconfig from secret
204204 if : inputs.cluster_provider != 'kind'
205205 run : |
206206 mkdir -p ~/.kube
207- echo "${{ github.workflow }}" | grep -q "\-cks" || echo "$LLMDBENCH_CICD_TARGET" | grep -q "cks"
208- if [[ $? -eq 0 ]]; then
207+ IS_CKS=$( echo "${{ github.workflow }}" | grep "\-cks")$( echo "$LLMDBENCH_CICD_TARGET" | grep "cks")
208+ if [[ ! -z $IS_CKS ]]; then
209209 echo "Selected \"Coreweave\" kubeconfig"
210210 echo "${{ secrets.KUBECONFIG_DATA_CKS }}" | base64 -d > ~/.kube/config
211211 fi
212- echo "${{ github.workflow }}" | grep -q "\-ocp" || echo "$LLMDBENCH_CICD_TARGET" | grep -q "ocp"
213- if [[ $? -eq 0 ]]; then
212+ IS_OCP=$( echo "${{ github.workflow }}" | grep "\-ocp")$( echo "$LLMDBENCH_CICD_TARGET" | grep "ocp")
213+ if [[ ! -z $IS_OCP -eq 0 ]]; then
214214 echo "Selected \"OpenShift\" kubeconfig"
215215 echo "${{ secrets.KUBECONFIG_DATA_OCP }}" | base64 -d > ~/.kube/config
216216 fi
@@ -220,8 +220,8 @@ jobs:
220220 - name : Install oc (optional on install.sh)
221221 if : inputs.cluster_provider != 'kind'
222222 run : |
223- echo "${{ github.workflow }}" | grep -q "\-ocp" || echo "$LLMDBENCH_CICD_TARGET" | grep -q "ocp"
224- if [[ $? -eq 0 ]]; then
223+ IS_OCP=$( echo "${{ github.workflow }}" | grep "\-ocp")$( echo "$LLMDBENCH_CICD_TARGET" | grep "ocp")
224+ if [[ ! -z $IS_OCP -eq 0 ]]; then
225225 # Install oc (OpenShift CLI) — optional on install.sh
226226 if ! command -v oc &>/dev/null; then
227227 curl -fsSL --retry 3 --retry-delay 5 -o /tmp/openshift-client-linux.tar.gz \
0 commit comments