airship
/
treasuremap
Code Issues Proposed changes

Add type-specific deployment scripts 

This change restructures the deployment script directory to support
type-specific deployment scripts. As sub-clusters are added, those
scripts will only be relevant to the multi-tenant type. The distinction
between which scripts should be used for each type will prevent
unexpected deployment errors.

Co-authored-by: Drew Walters <andrew.walters@att.com>
Change-Id: Ic14d4536bc9e593ab81c94b5c1dcec063a93ed18
This commit is contained in:
Ian Howell 2021-05-18 10:04:24 -05:00 committed by Sirajudeen
parent 49f02e6be4
commit 12fc147cea
58 changed files with 81 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
playbooks/airship-treasuremap-build-gate.yaml
View File

@ -39,7 +39,7 @@
- name: install airshipctl
shell: |
cd {{ local_src_dir | default(zuul.project.src_dir) }}
./tools/deployment/21_systemwide_executable.sh
./tools/deployment/common/21_systemwide_executable.sh
- name: make sure serve directory exists
file:
dest: "{{ serve_dir }}"

26
playbooks/airship-treasuremap-gate-runner.yaml
View File

@ -20,19 +20,19 @@
- name: "set default gate scripts"
set_fact:
gate_scripts_default:
- ./tools/deployment/01_install_essentials.sh
- ./tools/deployment/22_test_configs.sh
- ./tools/deployment/23_pull_documents.sh
- ./tools/deployment/23_generate_secrets.sh
- ./tools/deployment/24_build_images.sh
- ./tools/deployment/25_deploy_ephemeral_node.sh
- ./tools/deployment/26_deploy_capi_ephemeral_node.sh
- ./tools/deployment/30_deploy_controlplane.sh
- ./tools/deployment/31_deploy_initinfra_target_node.sh
- ./tools/deployment/32_cluster_init_target_node.sh
- ./tools/deployment/33_cluster_move_target_node.sh
- ./tools/deployment/35_deploy_worker_node.sh
- ./tools/deployment/36_deploy_workload.sh
- ./tools/deployment/airship-core/01_install_essentials.sh
- ./tools/deployment/airship-core/22_test_configs.sh
- ./tools/deployment/airship-core/23_pull_documents.sh
- ./tools/deployment/airship-core/23_generate_secrets.sh
- ./tools/deployment/airship-core/24_build_images.sh
- ./tools/deployment/airship-core/25_deploy_ephemeral_node.sh
- ./tools/deployment/airship-core/26_deploy_capi_ephemeral_node.sh
- ./tools/deployment/airship-core/30_deploy_controlplane.sh
- ./tools/deployment/airship-core/31_deploy_initinfra_target_node.sh
- ./tools/deployment/airship-core/32_cluster_init_target_node.sh
- ./tools/deployment/airship-core/33_cluster_move_target_node.sh
- ./tools/deployment/airship-core/35_deploy_worker_node.sh
- ./tools/deployment/airship-core/36_deploy_workload.sh
- name: "Run gate scripts"
include_role:

1
tools/deployment/airship-core/01_install_essentials.sh Symbolic link
View File

@ -0,0 +1 @@
../common/01_install_essentials.sh

1
tools/deployment/airship-core/02_install_calicoctl.sh Symbolic link
View File

@ -0,0 +1 @@
../common/02_install_calicoctl.sh

1
tools/deployment/airship-core/21_systemwide_executable.sh Symbolic link
View File

@ -0,0 +1 @@
../common/21_systemwide_executable.sh

1
tools/deployment/airship-core/22_test_configs.sh Symbolic link
View File

@ -0,0 +1 @@
../common/22_test_configs.sh

1
tools/deployment/airship-core/23_generate_secrets.sh Symbolic link
View File

@ -0,0 +1 @@
../common/23_generate_secrets.sh

1
tools/deployment/airship-core/23_pull_documents.sh Symbolic link
View File

@ -0,0 +1 @@
../common/23_pull_documents.sh

1
tools/deployment/airship-core/24_build_images.sh Symbolic link
View File

@ -0,0 +1 @@
../common/24_build_images.sh

1
tools/deployment/airship-core/25_deploy_ephemeral_node.sh Symbolic link
View File

@ -0,0 +1 @@
../common/25_deploy_ephemeral_node.sh

1
tools/deployment/airship-core/26_deploy_capi_ephemeral_node.sh Symbolic link
View File

@ -0,0 +1 @@
../common/26_deploy_capi_ephemeral_node.sh

1
tools/deployment/airship-core/30_deploy_controlplane.sh Symbolic link
View File

@ -0,0 +1 @@
../common/30_deploy_controlplane.sh

1
tools/deployment/airship-core/31_deploy_initinfra_target_node.sh Symbolic link
View File

@ -0,0 +1 @@
../common/31_deploy_initinfra_target_node.sh

1
tools/deployment/airship-core/32_cluster_init_target_node.sh Symbolic link
View File

@ -0,0 +1 @@
../common/32_cluster_init_target_node.sh

1
tools/deployment/airship-core/33_cluster_move_target_node.sh Symbolic link
View File

@ -0,0 +1 @@
../common/33_cluster_move_target_node.sh

1
tools/deployment/airship-core/34_deploy_controlplane_target.sh Symbolic link
View File

@ -0,0 +1 @@
../common/34_deploy_controlplane_target.sh

1
tools/deployment/airship-core/35_deploy_worker_node.sh Symbolic link
View File

@ -0,0 +1 @@
../common/35_deploy_worker_node.sh

1
tools/deployment/airship-core/36_deploy_workload.sh Symbolic link
View File

@ -0,0 +1 @@
../common/36_deploy_workload.sh

1
tools/deployment/airship-core/37_verify_hwcc_profiles.sh Symbolic link
View File

@ -0,0 +1 @@
../common/37_verify_hwcc_profiles.sh

1
tools/deployment/40_deploy_lma.sh → tools/deployment/airship-core/40_deploy_lma.sh
View File

@ -18,4 +18,3 @@ echo "Deploying LMA stack"
airshipctl phase run --debug lma-infra
airshipctl phase run --debug lma-stack
airshipctl phase run --debug lma-configs

1
tools/deployment/airship-core/40_deploy_network_policies.sh Symbolic link
View File

@ -0,0 +1 @@
../common/40_deploy_network_policies.sh

0
tools/deployment/01_install_essentials.sh → tools/deployment/common/01_install_essentials.sh
View File

0
tools/deployment/02_install_calicoctl.sh → tools/deployment/common/02_install_calicoctl.sh
View File

0
tools/deployment/21_systemwide_executable.sh → tools/deployment/common/21_systemwide_executable.sh
View File

0
tools/deployment/22_test_configs.sh → tools/deployment/common/22_test_configs.sh
View File

0
tools/deployment/23_generate_secrets.sh → tools/deployment/common/23_generate_secrets.sh
View File

0
tools/deployment/23_pull_documents.sh → tools/deployment/common/23_pull_documents.sh
View File

0
tools/deployment/24_build_images.sh → tools/deployment/common/24_build_images.sh
View File

0
tools/deployment/25_deploy_ephemeral_node.sh → tools/deployment/common/25_deploy_ephemeral_node.sh
View File

0
tools/deployment/26_deploy_capi_ephemeral_node.sh → tools/deployment/common/26_deploy_capi_ephemeral_node.sh
View File

0
tools/deployment/30_deploy_controlplane.sh → tools/deployment/common/30_deploy_controlplane.sh
View File

0
tools/deployment/31_deploy_initinfra_target_node.sh → tools/deployment/common/31_deploy_initinfra_target_node.sh
View File

0
tools/deployment/32_cluster_init_target_node.sh → tools/deployment/common/32_cluster_init_target_node.sh
View File

0
tools/deployment/33_cluster_move_target_node.sh → tools/deployment/common/33_cluster_move_target_node.sh
View File

0
tools/deployment/34_deploy_controlplane_target.sh → tools/deployment/common/34_deploy_controlplane_target.sh
View File

0
tools/deployment/35_deploy_worker_node.sh → tools/deployment/common/35_deploy_worker_node.sh
View File

0
tools/deployment/36_deploy_workload.sh → tools/deployment/common/36_deploy_workload.sh
View File

0
tools/deployment/37_verify_hwcc_profiles.sh → tools/deployment/common/37_verify_hwcc_profiles.sh
View File

0
tools/deployment/40_deploy_network_policies.sh → tools/deployment/common/40_deploy_network_policies.sh
View File

1
tools/deployment/multi-tenant/01_install_essentials.sh Symbolic link
View File

@ -0,0 +1 @@
../common/01_install_essentials.sh

1
tools/deployment/multi-tenant/02_install_calicoctl.sh Symbolic link
View File

@ -0,0 +1 @@
../common/02_install_calicoctl.sh

1
tools/deployment/multi-tenant/21_systemwide_executable.sh Symbolic link
View File

@ -0,0 +1 @@
../common/21_systemwide_executable.sh

1
tools/deployment/multi-tenant/22_test_configs.sh Symbolic link
View File

@ -0,0 +1 @@
../common/22_test_configs.sh

1
tools/deployment/multi-tenant/23_generate_secrets.sh Symbolic link
View File

@ -0,0 +1 @@
../common/23_generate_secrets.sh

1
tools/deployment/multi-tenant/23_pull_documents.sh Symbolic link
View File

@ -0,0 +1 @@
../common/23_pull_documents.sh

1
tools/deployment/multi-tenant/24_build_images.sh Symbolic link
View File

@ -0,0 +1 @@
../common/24_build_images.sh

1
tools/deployment/multi-tenant/25_deploy_ephemeral_node.sh Symbolic link
View File

@ -0,0 +1 @@
../common/25_deploy_ephemeral_node.sh

1
tools/deployment/multi-tenant/26_deploy_capi_ephemeral_node.sh Symbolic link
View File

@ -0,0 +1 @@
../common/26_deploy_capi_ephemeral_node.sh

1
tools/deployment/multi-tenant/30_deploy_controlplane.sh Symbolic link
View File

@ -0,0 +1 @@
../common/30_deploy_controlplane.sh

1
tools/deployment/multi-tenant/31_deploy_initinfra_target_node.sh Symbolic link
View File

@ -0,0 +1 @@
../common/31_deploy_initinfra_target_node.sh

1
tools/deployment/multi-tenant/32_cluster_init_target_node.sh Symbolic link
View File

@ -0,0 +1 @@
../common/32_cluster_init_target_node.sh

1
tools/deployment/multi-tenant/33_cluster_move_target_node.sh Symbolic link
View File

@ -0,0 +1 @@
../common/33_cluster_move_target_node.sh

1
tools/deployment/multi-tenant/34_deploy_controlplane_target.sh Symbolic link
View File

@ -0,0 +1 @@
../common/34_deploy_controlplane_target.sh

1
tools/deployment/multi-tenant/35_deploy_worker_node.sh Symbolic link
View File

@ -0,0 +1 @@
../common/35_deploy_worker_node.sh

1
tools/deployment/multi-tenant/36_deploy_workload.sh Symbolic link
View File

@ -0,0 +1 @@
../common/36_deploy_workload.sh

1
tools/deployment/multi-tenant/37_verify_hwcc_profiles.sh Symbolic link
View File

@ -0,0 +1 @@
../common/37_verify_hwcc_profiles.sh

1
tools/deployment/multi-tenant/40_deploy_network_policies.sh Symbolic link
View File

@ -0,0 +1 @@
../common/40_deploy_network_policies.sh

48
zuul.d/jobs.yaml
View File

@ -27,10 +27,10 @@
nodeset: airship-treasuremap-single-node
vars:
gate_scripts:
- ./tools/deployment/01_install_essentials.sh
- ./tools/deployment/21_systemwide_executable.sh
- ./tools/deployment/22_test_configs.sh
- ./tools/deployment/23_pull_documents.sh
- ./tools/deployment/common/01_install_essentials.sh
- ./tools/deployment/common/21_systemwide_executable.sh
- ./tools/deployment/common/22_test_configs.sh
- ./tools/deployment/common/23_pull_documents.sh
- ./tools/validate_docs
- job:
@ -70,19 +70,19 @@
vars:
site_name: test-site
gate_scripts:
- ./tools/deployment/01_install_essentials.sh
- ./tools/deployment/22_test_configs.sh
- ./tools/deployment/23_pull_documents.sh
- ./tools/deployment/23_generate_secrets.sh
- ./tools/deployment/24_build_images.sh
- ./tools/deployment/25_deploy_ephemeral_node.sh
- ./tools/deployment/26_deploy_capi_ephemeral_node.sh
- ./tools/deployment/30_deploy_controlplane.sh
- ./tools/deployment/31_deploy_initinfra_target_node.sh
- ./tools/deployment/32_cluster_init_target_node.sh
- ./tools/deployment/33_cluster_move_target_node.sh
- ./tools/deployment/35_deploy_worker_node.sh
- ./tools/deployment/36_deploy_workload.sh
- ./tools/deployment/airship-core/01_install_essentials.sh
- ./tools/deployment/airship-core/22_test_configs.sh
- ./tools/deployment/airship-core/23_pull_documents.sh
- ./tools/deployment/airship-core/23_generate_secrets.sh
- ./tools/deployment/airship-core/24_build_images.sh
- ./tools/deployment/airship-core/25_deploy_ephemeral_node.sh
- ./tools/deployment/airship-core/26_deploy_capi_ephemeral_node.sh
- ./tools/deployment/airship-core/30_deploy_controlplane.sh
- ./tools/deployment/airship-core/31_deploy_initinfra_target_node.sh
- ./tools/deployment/airship-core/32_cluster_init_target_node.sh
- ./tools/deployment/airship-core/33_cluster_move_target_node.sh
- ./tools/deployment/airship-core/35_deploy_worker_node.sh
- ./tools/deployment/airship-core/36_deploy_workload.sh
serve_dir: /srv/images
serve_port: 8099
voting: true
@ -92,6 +92,20 @@
parent: airship-treasuremap-deploy-test-site
vars:
site_name: virtual-network-cloud
gate_scripts:
- ./tools/deployment/multi-tenant/01_install_essentials.sh
- ./tools/deployment/multi-tenant/22_test_configs.sh
- ./tools/deployment/multi-tenant/23_pull_documents.sh
- ./tools/deployment/multi-tenant/23_generate_secrets.sh
- ./tools/deployment/multi-tenant/24_build_images.sh
- ./tools/deployment/multi-tenant/25_deploy_ephemeral_node.sh
- ./tools/deployment/multi-tenant/26_deploy_capi_ephemeral_node.sh
- ./tools/deployment/multi-tenant/30_deploy_controlplane.sh
- ./tools/deployment/multi-tenant/31_deploy_initinfra_target_node.sh
- ./tools/deployment/multi-tenant/32_cluster_init_target_node.sh
- ./tools/deployment/multi-tenant/33_cluster_move_target_node.sh
- ./tools/deployment/multi-tenant/35_deploy_worker_node.sh
- ./tools/deployment/multi-tenant/36_deploy_workload.sh
files:
- ^manifests/site/virtual-network-cloud/.*$
- ^manifests/type/multi-tenant/.*$