From 96d9ea6af188c169e9265a8045a053138b514692 Mon Sep 17 00:00:00 2001 From: "Yusuf A. Hasan Miyan" Date: Tue, 20 Sep 2022 16:27:21 +1000 Subject: [PATCH 1/2] [GOVCMS-7646] Remove early exit for config import. --- scripts/deploy/govcms-config-import | 6 ------ 1 file changed, 6 deletions(-) diff --git a/scripts/deploy/govcms-config-import b/scripts/deploy/govcms-config-import index f3698571..9cb94648 100755 --- a/scripts/deploy/govcms-config-import +++ b/scripts/deploy/govcms-config-import @@ -7,18 +7,12 @@ set -euo pipefail # LAGOON_ENVIRONMENT_TYPE=${LAGOON_ENVIRONMENT_TYPE:-production} -GOVCMS_DEPLOY_WORKFLOW_CONFIG=${GOVCMS_DEPLOY_WORKFLOW_CONFIG:-import} CONFIG_DEFAULT_DIR=${CONFIG_DEFAULT_DIR:-/app/config/default} CONFIG_DEV_DIR=${CONFIG_DEV_DIR:-/app/config/dev} LAGOON_GIT_SAFE_BRANCH=${LAGOON_GIT_SAFE_BRANCH:-master} echo "GovCMS Deploy :: Configuration import" -if [ "$GOVCMS_DEPLOY_WORKFLOW_CONFIG" != "import" ]; then - echo "[skip]: Workflow is not set to import." - exit 0 -fi - if [[ "$LAGOON_GIT_SAFE_BRANCH" = internal-govcms-update* ]]; then echo "[skip]: Configuration cannot be imported on update branches." exit 0 From 74835bfc267361ac03683fa8763edee78f140381 Mon Sep 17 00:00:00 2001 From: "Yusuf A. Hasan Miyan" Date: Tue, 20 Sep 2022 17:49:19 +1000 Subject: [PATCH 2/2] Removed tests with `GOVCMS_DEPLOY_WORKFLOW_CONFIG` --- tests/bats/deploy/govcms-config-import.bats | 33 --------------------- 1 file changed, 33 deletions(-) diff --git a/tests/bats/deploy/govcms-config-import.bats b/tests/bats/deploy/govcms-config-import.bats index 1b531949..148f8b5e 100644 --- a/tests/bats/deploy/govcms-config-import.bats +++ b/tests/bats/deploy/govcms-config-import.bats @@ -20,41 +20,12 @@ load ../_helpers_govcms assert_equal 0 "$(mock_get_call_num "${mock_drush}")" } -# Workflow: retain -# dir: /app/config/default -@test "Config import: retain" { - mock_drush=$(mock_command "drush") - export GOVCMS_DEPLOY_WORKFLOW_CONFIG=retain - - run scripts/deploy/govcms-config-import >&3 - - assert_output_contains "GovCMS Deploy :: Configuration import" - assert_output_contains "[skip]: Workflow is not set to import." - - assert_equal 0 "$(mock_get_call_num "${mock_drush}")" -} - -# Workflow: import -# dir: /app/config/default -@test "Config import: import" { - mock_drush=$(mock_command "drush") - export GOVCMS_DEPLOY_WORKFLOW_CONFIG=import - - run scripts/deploy/govcms-config-import >&3 - - assert_output_contains "GovCMS Deploy :: Configuration import" - assert_output_contains "[skip]: There is no configuration." - - assert_equal 0 "$(mock_get_call_num "${mock_drush}")" -} - # Workflow: import # dir: ./fixures/config/default @test "Config import: default config" { mock_drush=$(mock_command "drush") mock_set_output "${mock_drush}" "Successful" 1 - export GOVCMS_DEPLOY_WORKFLOW_CONFIG=import export CONFIG_DEFAULT_DIR="tests/bats/deploy/fixtures/config/default" export CONFIG_DEV_DIR="/tmp/nodir" @@ -75,7 +46,6 @@ load ../_helpers_govcms mock_set_output "${mock_drush}" "Successful" 1 export LAGOON_ENVIRONMENT_TYPE="production" - export GOVCMS_DEPLOY_WORKFLOW_CONFIG=import export CONFIG_DEV_DIR="tests/bats/deploy/fixtures/config/dev" run scripts/deploy/govcms-config-import >&3 @@ -93,7 +63,6 @@ load ../_helpers_govcms mock_drush=$(mock_command "drush") mock_set_output "${mock_drush}" "Successful" 1 - export GOVCMS_DEPLOY_WORKFLOW_CONFIG=import export CONFIG_DEV_DIR="tests/bats/deploy/fixtures/config/dev" export LAGOON_ENVIRONMENT_TYPE="development" @@ -114,7 +83,6 @@ load ../_helpers_govcms mock_drush=$(mock_command "drush") mock_set_output "${mock_drush}" "Successful" 1 - export GOVCMS_DEPLOY_WORKFLOW_CONFIG=import export LAGOON_ENVIRONMENT_TYPE="production" export CONFIG_DEFAULT_DIR="tests/bats/deploy/fixtures/config/default" export CONFIG_DEV_DIR="tests/bats/deploy/fixtures/config/dev" @@ -136,7 +104,6 @@ load ../_helpers_govcms mock_drush=$(mock_command "drush") mock_set_output "${mock_drush}" "Successful" 1 - export GOVCMS_DEPLOY_WORKFLOW_CONFIG=import export LAGOON_ENVIRONMENT_TYPE="development" export CONFIG_DEFAULT_DIR="tests/bats/deploy/fixtures/config/default" export CONFIG_DEV_DIR="tests/bats/deploy/fixtures/config/dev"