diff --git a/backend/caasp4os/defaults.sh b/backend/caasp4os/defaults.sh index eff12cdf..0cc3cacf 100644 --- a/backend/caasp4os/defaults.sh +++ b/backend/caasp4os/defaults.sh @@ -3,4 +3,8 @@ # Caasp4os options ################## +# Override default GARDEN_ROOTFS_DRIVER for all backends default +if [ "$BACKEND" == "caasp4os" ]; then + GARDEN_ROOTFS_DRIVER="${GARDEN_ROOTFS_DRIVER:-btrfs}" +fi CAASP_VER=${CAASP_VER:-"update"} # devel, staging, update, product diff --git a/modules/scf/defaults.sh b/modules/scf/defaults.sh index 859e6a52..b894aa47 100644 --- a/modules/scf/defaults.sh +++ b/modules/scf/defaults.sh @@ -12,7 +12,6 @@ SCF_OPERATOR="${SCF_OPERATOR:-false}" OPERATOR_CHART_URL="${OPERATOR_CHART_URL:-latest}" GARDEN_ROOTFS_DRIVER="${GARDEN_ROOTFS_DRIVER:-overlay-xfs}" -DIEGO_SIZING="${DIEGO_SIZING:-$SIZING}" STORAGECLASS="${STORAGECLASS:-persistent}" AUTOSCALER="${AUTOSCALER:-false}" @@ -25,6 +24,8 @@ else SIZING="${SIZING:-1}" fi +DIEGO_SIZING="${DIEGO_SIZING:-$SIZING}" + UAA_UPGRADE="${UAA_UPGRADE:-true}" OVERRIDE="${OVERRIDE:-}" @@ -32,4 +33,9 @@ CONFIG_OVERRIDE="${CONFIG_OVERRIDE:-$OVERRIDE}" SCF_LOCAL="${SCF_LOCAL:-}" -SCF_TESTGROUP="${SCF_TESTGROUP:-false}" \ No newline at end of file +SCF_TESTGROUP="${SCF_TESTGROUP:-false}" + +## Testing +BRATS_BUILDPACK="${BRATS_BUILDPACK:-}" +BRATS_BUILDPACK_URL="${BRATS_BUILDPACK_URL:-}" +BRATS_BUILDPACK_VERSION="${BRATS_BUILDPACK_URL:-}" \ No newline at end of file diff --git a/modules/scf/gen_config.sh b/modules/scf/gen_config.sh index 48a57528..9bcc6fb1 100755 --- a/modules/scf/gen_config.sh +++ b/modules/scf/gen_config.sh @@ -1,11 +1,10 @@ #!/bin/bash -. ./defaults.sh . ../../include/common.sh +. ./defaults.sh # Read build defaults . .envrc -info "Generating SCF config values" if [ "${DEFAULT_STACK}" = "from_chart" ]; then export DEFAULT_STACK=$(helm inspect helm/cf/ | grep DEFAULT_STACK | sed 's~DEFAULT_STACK:~~g' | sed 's~"~~g' | sed 's~\s~~g') fi @@ -18,6 +17,15 @@ for (( i=0; i < ${#aux_external_ips[@]}; i++ )); do external_ips+=", \"${aux_external_ips[$i]}\"" done +info "Generating SCF config values" +info "\t GARDEN_ROOTFS_DRIVER: $GARDEN_ROOTFS_DRIVER" +info "\t DOMAIN: $domain" +info "\t DEFAULT_STACK: $DEFAULT_STACK" +info "\t ENABLE_EIRINI: $ENABLE_EIRINI" +info "\t AUTOSCALER: $AUTOSCALER" +info "\t HA: $HA" +info "\t SIZING: $SIZING" + VALUES= if [ "$ENABLE_EIRINI" = true ] ; then AUTH="rbac" diff --git a/tests/unit_tests.sh b/tests/unit_tests.sh index 11bf5158..e6d79ab1 100755 --- a/tests/unit_tests.sh +++ b/tests/unit_tests.sh @@ -52,6 +52,25 @@ testConfig() { AUTOSCALER=true make scf-gen-config VALUES_FILE="$(cat $ROOT_DIR/buildtest/scf-config-values.yaml)" assertContains 'generates correctly AUTOSCALER' "$VALUES_FILE" "autoscaler: true" + + make clean + + export BACKEND=kind + export GARDEN_ROOTFS_DRIVER=test + make buildir scf-gen-config + + VALUES_FILE="$(cat $ROOT_DIR/buildtest/scf-config-values.yaml)" + assertContains 'generates correctly GARDEN_ROOTFS_DRIVER ' "$VALUES_FILE" "GARDEN_ROOTFS_DRIVER: \"test\"" + + + make clean + + unset GARDEN_ROOTFS_DRIVER + export BACKEND=caasp4os + make buildir scf-gen-config + VALUES_FILE="$(cat $ROOT_DIR/buildtest/scf-config-values.yaml)" + assertContains 'generates correctly GARDEN_ROOTFS_DRIVER for caasp' "$VALUES_FILE" "GARDEN_ROOTFS_DRIVER: \"btrfs\"" + } # Tests backend switch