Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore(CI): remove business_unit_2 to reduce CI scope #1241

Merged
merged 6 commits into from
May 17, 2024

Conversation

eeaton
Copy link
Collaborator

@eeaton eeaton commented May 16, 2024

Deleted subfolder for business_unit_2 under under step 4-projects, with updated directions in Readme for users to optionally recreate the this folder and automatically replace strings that change between bu1 and bu2.

This should help improve the flakiness of CI tests where a small chance of flaky error becomes cumulatively higher when creating a large number of projects (this reduces the test scope by 15 projects).

…Update readme with directions to optionally recreate.
@eeaton eeaton requested review from rjerrems, gtsorbo and a team as code owners May 16, 2024 15:52
@eeaton eeaton changed the title chore(CI) remove business_unit_2 to improve CI tests chore(CI): remove business_unit_2 to improve CI tests May 16, 2024
@eeaton eeaton changed the title chore(CI): remove business_unit_2 to improve CI tests chore(CI): remove business_unit_2 to reduce CI scope May 16, 2024
@eeaton
Copy link
Collaborator Author

eeaton commented May 17, 2024

Thanks for the feedback @daniel-cit . I removed those instances of business_unit_2 in the .go tests, and found a few similar places in the helper script to remove. I decided that leaving it in the README files is ok to illustrate what the complete structure looks like if someone does take the optional steps to duplicate bu2 folders.

@eeaton eeaton enabled auto-merge (squash) May 17, 2024 16:00
Copy link
Contributor

@fmichaelobrien fmichaelobrien left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

reviewing over the next 24h...

…st.go:100:4: missing ',' before newline in composite literal"""
@@ -168,7 +168,7 @@ module "interconnect" {
random_project_id = true
random_project_id_length = 4
default_service_account = "deprivilege"
name = "${local.project_prefix}-c-interconnect"
name = "${local.project_prefix}-net-interconnect"
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I understand a large portion of these label changes are already in main - I noticed them when I was doing an upstream sync last sunday
specific example
net-interconnect for 171
https://github.com/terraform-google-modules/terraform-example-foundation/blob/master/1-org/envs/shared/projects.tf#L171

also minor and not really functionality affecting but there is a pending PR on 2 changes that look to have been missed in the last PR on this yaml
https://github.com/terraform-google-modules/terraform-example-foundation/pull/1232/files
for #1231

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think we are good - I was using a 3hr old diff view - 1-org is out of the patch now
/lgtm

Copy link
Contributor

@daniel-cit daniel-cit left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

Copy link
Contributor

@apeabody apeabody left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Already has two approvals - lgtm

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants