Skip to content

Commit 4b750fe

Browse files
committed
Comment out unused Terraform execution commands in initdemo.sh and remove should_keep_forever from retention_policy in terraform.tf
1 parent d6eb244 commit 4b750fe

File tree

2 files changed

+28
-29
lines changed

2 files changed

+28
-29
lines changed

initdemo.sh

Lines changed: 28 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -654,27 +654,27 @@ execute_terraform 'environments' 'shared/environments/dev_test_prod/pgbackend' '
654654
execute_terraform 'lifecycle_simple_test_prod' 'shared/lifecycles/simple_test_prod/pgbackend' 'Spaces-3'
655655

656656
# Prepare both spaces with the global resources needed to host the sample project
657-
for space in "Spaces-2" "Spaces-3"
658-
do
659-
execute_terraform 'project_group_hello_world' 'shared/project_group/hello_world/pgbackend' "${space}"
660-
done
657+
#for space in "Spaces-2" "Spaces-3"
658+
#do
659+
# execute_terraform 'project_group_hello_world' 'shared/project_group/hello_world/pgbackend' "${space}"
660+
#done
661661

662662
# The dev instance gets library variable sets for exporting projects
663663
execute_terraform 'lib_var_octopus_server' 'shared/variables/octopus_server/pgbackend' "Spaces-2"
664664
execute_terraform 'lib_var_this_instance' 'shared/variables/this_instance/pgbackend' "Spaces-2"
665665

666666
# Deploy the sample project to the dev space
667-
execute_terraform 'project_hello_world' 'management_instance/projects/hello_world/pgbackend' "Spaces-2"
667+
#execute_terraform 'project_hello_world' 'management_instance/projects/hello_world/pgbackend' "Spaces-2"
668668

669669
# The dev instance gets a tenant representing test/prod
670670
execute_terraform 'tenants_environment' 'management_instance/tenants/environment_tenants/pgbackend' "Spaces-2"
671671

672672
# Append the common runbooks to the sample project
673-
for project in "Hello World"
674-
do
675-
execute_terraform_with_project 'serialize_and_deploy' 'management_instance/runbooks/serialize_and_deploy/pgbackend' "${project//[^[:alnum:]]/_}" "${project}" "Spaces-2"
676-
execute_terraform_with_project 'runbooks_list' 'management_instance/runbooks/list/pgbackend' "${project//[^[:alnum:]]/_}" "${project}" "Spaces-2"
677-
done
673+
#for project in "Hello World"
674+
#do
675+
# execute_terraform_with_project 'serialize_and_deploy' 'management_instance/runbooks/serialize_and_deploy/pgbackend' "${project//[^[:alnum:]]/_}" "${project}" "Spaces-2"
676+
# execute_terraform_with_project 'runbooks_list' 'management_instance/runbooks/list/pgbackend' "${project//[^[:alnum:]]/_}" "${project}" "Spaces-2"
677+
#done
678678

679679
execute_terraform 'team_variable_editor' 'shared/team/deployer_variable_editor/pgbackend' 'Spaces-1'
680680

@@ -722,26 +722,26 @@ execute_terraform 'lib_var_git' 'shared/variables/git/pgbackend' 'Spaces-1'
722722

723723
execute_terraform 'lib_var_export_options' 'shared/variables/export_options/pgbackend' 'Spaces-1'
724724

725-
execute_terraform 'project_create_client_space' 'management_instance/projects/create_client_space/pgbackend' 'Spaces-1'
726-
publish_runbook "__ Create Client Space" "Create Client Space"
727-
728-
execute_terraform 'project_hello_world' 'management_instance/projects/hello_world/pgbackend' 'Spaces-1'
729-
730-
execute_terraform 'project_hello_world_cac' 'management_instance/projects/hello_world_cac/pgbackend' 'Spaces-1'
731-
732-
execute_terraform 'project_azure_web_app_cac' 'management_instance/projects/azure_web_app_cac/pgbackend' 'Spaces-1'
725+
#execute_terraform 'project_create_client_space' 'management_instance/projects/create_client_space/pgbackend' 'Spaces-1'
726+
#publish_runbook "__ Create Client Space" "Create Client Space"
727+
#
728+
#execute_terraform 'project_hello_world' 'management_instance/projects/hello_world/pgbackend' 'Spaces-1'
729+
#
730+
#execute_terraform 'project_hello_world_cac' 'management_instance/projects/hello_world_cac/pgbackend' 'Spaces-1'
731+
#
732+
#execute_terraform 'project_azure_web_app_cac' 'management_instance/projects/azure_web_app_cac/pgbackend' 'Spaces-1'
733733

734734
# Remove the project first to fix the error "Error: Octopus API error: Sequence contains no matching element []"
735-
delete_project 'Spaces-1' 'K8S Microservice Template'
736-
execute_terraform 'project_k8s_microservice' 'management_instance/projects/k8s_microservice/pgbackend' 'Spaces-1'
737-
738-
execute_terraform 'project_azure_space_initialization' 'management_instance/projects/azure_space_initialization/pgbackend' 'Spaces-1'
739-
publish_runbook "__ Compose Azure Resources" "Initialize Space"
740-
741-
execute_terraform 'project_k8s_space_initialization' 'management_instance/projects/k8s_space_initialization/pgbackend' 'Spaces-1'
742-
publish_runbook "__ Compose K8S Resources" "Initialize Space"
743-
744-
execute_terraform 'project_pr_checks' 'management_instance/projects/pr_checks/pgbackend' 'Spaces-1'
735+
#delete_project 'Spaces-1' 'K8S Microservice Template'
736+
#execute_terraform 'project_k8s_microservice' 'management_instance/projects/k8s_microservice/pgbackend' 'Spaces-1'
737+
#
738+
#execute_terraform 'project_azure_space_initialization' 'management_instance/projects/azure_space_initialization/pgbackend' 'Spaces-1'
739+
#publish_runbook "__ Compose Azure Resources" "Initialize Space"
740+
#
741+
#execute_terraform 'project_k8s_space_initialization' 'management_instance/projects/k8s_space_initialization/pgbackend' 'Spaces-1'
742+
#publish_runbook "__ Compose K8S Resources" "Initialize Space"
743+
#
744+
#execute_terraform 'project_pr_checks' 'management_instance/projects/pr_checks/pgbackend' 'Spaces-1'
745745

746746
# Setup targets
747747
docker compose -f docker/compose.yml exec terraformdb sh -c '/usr/bin/psql -v ON_ERROR_STOP=1 --username "$POSTGRES_USER" -c "CREATE DATABASE target_k8s"'

management_instance/projects/create_client_space/octopus/terraform.tf

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,6 @@ resource "octopusdeploy_runbook" "runbook____create_client_space_create_client_s
5757

5858
retention_policy {
5959
quantity_to_keep = 100
60-
should_keep_forever = false
6160
}
6261

6362
connectivity_policy {

0 commit comments

Comments
 (0)