test: for kind tests, place current profiles under non-gpu/ subdirectory

Author: starpit

.github/workflows/kind.yml

@@ -14,7 +14,7 @@ jobs:
       matrix:
         os: [ubuntu-latest]
         node-version: [16.x]
-        profile: [keep-it-simple, ray-autoscaler, mcad-default, mcad-coscheduler, mcad-preinstalled]
+        profile: [non-gpu/keep-it-simple, non-gpu/ray-autoscaler, non-gpu/mcad-default, non-gpu/mcad-coscheduler, non-gpu/mcad-preinstalled]
 
     steps:
     - uses: actions/checkout@v3

tests/kind/profiles/keep-it-simple renamed to tests/kind/profiles/non-gpu/keep-it-simple

@@ -1,5 +1,12 @@
 #!/usr/bin/env bash
 
+#
+# -a: force re-answering all questions
+# -f <profile>: force re-answering for given profile
+# -s: guidebook store root
+# -b: run this guidebook
+#
+
 set -e
 set -o pipefail
 
@@ -29,20 +36,23 @@ do
 done
 shift $((OPTIND-1))
 
-mkdir -p "$MWPROFILES_PATH"
-
 function run {
-    local profile=$1
+    local profileFull=$1
+    local variant=$(dirname $profileFull)
+    local profile=$(basename $profileFull)
+    export MWPROFILES_PATH="$MWPROFILES_PATH_BASE"/$variant
+    mkdir -p "$MWPROFILES_PATH"
+
     local guidebook=${2-$GUIDEBOOK}
-    local yes=$([ -z "$FORCE_ALL" ] && [ "$FORCE" != "$profile" ] && [ -f "$MWPROFILES_PATH/$profile" ] && echo "--yes" || echo "")
+    local yes=$([ -z "$FORCE_ALL" ] && [ "$FORCE" != "$profileFull" ] && [ -f "$MWPROFILES_PATH/$profile" ] && echo "--yes" || echo "")
 
-    local PRE="$MWPROFILES_PATH"/../profiles.d/$profile/pre
+    local PRE="$MWPROFILES_PATH_BASE"/../profiles.d/$profile/pre
     if [ -f "$PRE" ]; then
-        echo "Running pre guidebooks for profile $profile"
+        echo "Running pre guidebooks for profile=$profile"
         cat "$PRE" | xargs -n1 "$ROOT"/bin/codeflare -p $profile $yes
     fi
 
-    echo "Running with profile $profile"
+    echo "Running with variant=$variant profile=$profile yes=$yes"
     "$ROOT"/bin/codeflare -p $profile $yes $guidebook
 }
 

tests/kind/profiles/mcad-coscheduler renamed to tests/kind/profiles/non-gpu/mcad-coscheduler

@@ -4,4 +4,4 @@ SCRIPTDIR=$(cd $(dirname "$0") && pwd)
 ROOT="$SCRIPTDIR"/../../
 NODE=$(which node)
 CODEFLARE_HEADLESS_HOME="$ROOT"/dist/headless
-export MWPROFILES_PATH="$SCRIPTDIR"/profiles
+export MWPROFILES_PATH_BASE="$SCRIPTDIR"/profiles