Skip to content

Commit 9a41b1c

Browse files
committed
update README instructions for renamng build type files
1 parent 196e4b4 commit 9a41b1c

File tree

4 files changed

+10
-53
lines changed

4 files changed

+10
-53
lines changed

0-bootstrap/README-GitHub.md

Lines changed: 2 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -148,20 +148,9 @@ You must be [authenticated to GitHub](https://docs.github.com/en/authentication/
148148
cd ./envs/shared
149149
```
150150

151-
1. In the versions file `./versions.tf` un-comment the `github` required provider
152-
1. In the variables file `./variables.tf` un-comment variables in the section `Specific to github_bootstrap`
153-
1. In the outputs file `./outputs.tf` Comment-out outputs in the section `Specific to cloudbuild_module`
154-
1. In the outputs file `./outputs.tf` un-comment outputs in the section `Specific to github_bootstrap`
155-
1. Rename file `./cb.tf` to `./cb.tf.example`
156-
157-
```bash
158-
mv ./cb.tf ./cb.tf.example
159-
```
160-
161-
1. Rename file `./github.tf.example` to `./github.tf`
162-
151+
1. Run the helper script `choose_build_type.sh` to enable Bootstrap GitHub version
163152
```bash
164-
mv ./github.tf.example ./github.tf
153+
./scripts/choose_build_type.sh github
165154
```
166155

167156
1. Rename file `terraform.example.tfvars` to `terraform.tfvars`

0-bootstrap/README-GitLab.md

Lines changed: 4 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,8 @@ It is a best practice to have two separate projects here (`prj-b-seed` and `prj-
88
On one hand, `prj-b-seed` stores terraform state and has the Service Accounts able to create / modify infrastructure.
99
On the other hand, the authentication infrastructure using [Workload identity federation](https://cloud.google.com/iam/docs/workload-identity-federation) is implemented in `prj-b-cicd-wif-gl`.
1010

11+
## Requirements
12+
1113
To run the instructions described in this document, install the following:
1214

1315
- [Google Cloud SDK](https://cloud.google.com/sdk/install) version 393.0.0 or later
@@ -216,20 +218,9 @@ Run the `0-bootstrap/scripts/git_create_branches_helper.sh` script to create the
216218
cd ./envs/shared
217219
```
218220

219-
1. In the versions file `./versions.tf` un-comment the `gitlab` required provider
220-
1. In the variables file `./variables.tf` un-comment variables in the section `Specific to gitlab_bootstrap`
221-
1. In the outputs file `./outputs.tf` Comment-out outputs in the section `Specific to cloudbuild_module`
222-
1. In the outputs file `./outputs.tf` un-comment outputs in the section `Specific to gitlab_bootstrap`
223-
1. Rename file `./cb.tf` to `./cb.tf.example`
224-
225-
```bash
226-
mv ./cb.tf ./cb.tf.example
227-
```
228-
229-
1. Rename file `./gitlab.tf.example` to `./gitlab.tf`
230-
221+
1. Run the helper script `choose_build_type.sh` to enable Bootstrap GitHub version
231222
```bash
232-
mv ./gitlab.tf.example ./gitlab.tf
223+
./scripts/choose_build_type.sh gitlab
233224
```
234225

235226
1. Rename file `terraform.example.tfvars` to `terraform.tfvars`

0-bootstrap/README-Jenkins.md

Lines changed: 2 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -139,22 +139,11 @@ You arrived to these instructions because you are using the `jenkins_bootstrap`
139139
cd ./envs/shared
140140
```
141141

142-
1. Activate the Jenkins module and disable the Cloud Build module. This implies manually editing the following files:
143-
1. Rename file `./cb.tf` to `./cb.tf.example`
144-
145-
```bash
146-
mv ./cb.tf ./cb.tf.example
147-
```
148-
149-
1. Rename file `./jenkins.tf.example` to `./jenkins.tf`
150-
142+
1. Run the helper script `choose_build_type.sh` to enable Bootstrap GitHub version
151143
```bash
152-
mv ./jenkins.tf.example ./jenkins.tf
144+
./scripts/choose_build_type.sh jenkins
153145
```
154146

155-
1. Un-comment the `jenkins_bootstrap` variables in `./variables.tf`
156-
1. Un-comment the `jenkins_bootstrap` outputs in `./outputs.tf`
157-
1. Comment-out the `cloudbuild_bootstrap` outputs in `./outputs.tf`
158147
1. Rename `terraform.example.tfvars` to `terraform.tfvars` and update the file with values from your environment.
159148

160149
```bash

0-bootstrap/README-Terraform-Cloud.md

Lines changed: 2 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -136,21 +136,9 @@ You must be authenticated to the VCS provider. See [GitHub authentication](https
136136
cd ./envs/shared
137137
```
138138

139-
1. In the versions file `./versions.tf` un-comment the `tfe` required provider
140-
1. In the variables file `./variables.tf` un-comment variables in the section `Specific to tfc_bootstrap`
141-
1. In the outputs file `./outputs.tf` Comment-out outputs in the section `Specific to cloudbuild_module`
142-
1. In the outputs file `./outputs.tf` un-comment outputs in the section `Specific to tfc_bootstrap`
143-
1. If you want to use [Terraform Cloud with Agents](https://developer.hashicorp.com/terraform/cloud-docs/agents), in addition to `Specific to tfc_bootstrap`, un-comment outputs in the section `Specific to tfc_bootstrap with Terraform Cloud Agents` and update `enable_tfc_cloud_agents` to `true` variable at `terraform.tfvars`
144-
1. Rename file `./cb.tf` to `./cb.tf.example`
145-
146-
```bash
147-
mv ./cb.tf ./cb.tf.example
148-
```
149-
150-
1. Rename file `.terraform_cloud.tf.example` to `./terraform_cloud.tf`
151-
139+
1. Run the helper script `choose_build_type.sh` to enable Bootstrap GitHub version
152140
```bash
153-
mv ./terraform_cloud.tf.example ./terraform_cloud.tf
141+
./scripts/choose_build_type.sh terraform_cloud
154142
```
155143

156144
1. Rename file `terraform.example.tfvars` to `terraform.tfvars`

0 commit comments

Comments
 (0)