home/.bin/gs-standup

@@ -2,7 +2,7 @@
 
 source .utils
 
-CODE_DIR="${HOME}/Code/GiantSwarm/cluster-standup-teardown"
+CODE_DIR="${HOME}/Code/GiantSwarm/cluster-test-suites"
 CUR_DIR=$(pwd)
 OUTPUT_DIR=${CUR_DIR}
 
@@ -87,6 +87,8 @@ case ${#POS_ARGS[@]} in
     go run ${CODE_DIR}/cmd/standup/main.go \
       --provider ${PROVIDER} \
       --context ${CONTEXT} \
+      --cluster-values ${CODE_DIR}/providers/${CONTEXT}/standard/test_data/cluster_values.yaml \
+      --default-apps-values ${CODE_DIR}/providers/${CONTEXT}/standard/test_data/default-apps_values.yaml \
       --output ${OUTPUT_DIR}
     cd ${CUR_DIR}
     ;;

home/.bin/gs-teardown

@@ -2,9 +2,9 @@
 
 source .utils
 
-CODE_DIR="${HOME}/Code/GiantSwarm/cluster-standup-teardown"
+CODE_DIR="${HOME}/Code/GiantSwarm/cluster-test-suites"
-CURR_DIR=$(pwd)
+CUR_DIR=$(pwd)
-INPUT_DIR=$(pwd)
+INPUT_DIR=${CUR_DIR}
 
 print_usage() {
   orange "gs-teardown - Teardown a previously created test cluster"
@@ -53,31 +53,39 @@ case ${#POS_ARGS[@]} in
     exit 1
     ;;
   1)
+    PROVIDER=""
     CONTEXT=""
 
     case ${POS_ARGS[0]} in
       "aws"|"capa")
+        PROVIDER="aws"
         CONTEXT="capa"
         ;;
       "azure"|"capz")
+        PROVIDER="azure"
         CONTEXT="capz"
         ;;
       "vsphere"|"capv")
+        PROVIDER="vsphere"
         CONTEXT="capv"
         ;;
       "cloud-director"|"capvcd")
+        PROVIDER="cloud-director"
         CONTEXT="capvcd"
         ;;
       "eks")
+        PROVIDER="eks"
         CONTEXT="eks"
         ;;
       "aws-private"|"capa-private")
+        PROVIDER="aws"
         CONTEXT="capa-private-proxy"
         ;;
     esac
 
     cd ${CODE_DIR}
     go run ${CODE_DIR}/cmd/teardown/main.go \
+      --provider ${PROVIDER} \
       --context ${CONTEXT} \
       --standup-directory ${INPUT_DIR}
     cd ${CUR_DIR}