Skip to content

TC config - splitting test configuration out by service#8254

Merged
SarahFrench merged 8 commits into
GoogleCloudPlatform:mainfrom
hashicorp:megan_tc_services
Jul 11, 2023
Merged

TC config - splitting test configuration out by service#8254
SarahFrench merged 8 commits into
GoogleCloudPlatform:mainfrom
hashicorp:megan_tc_services

Conversation

@megan07

@megan07 megan07 commented Jun 30, 2023

Copy link
Copy Markdown
Contributor

Creates the TC configuration that will allow us to run tests per package/service. We'll want to combine this in some way with a PR that splits out all the tests, or stub out some tests in each package/service directory.

If this PR is for Terraform, I acknowledge that I have:

  • Searched through the issue tracker for an open issue that this either resolves or contributes to, commented on it to claim it, and written "fixes {url}" or "part of {url}" in this PR description. If there were no relevant open issues, I opened one and commented that I would like to work on it (not necessary for very small changes).
  • Ensured that all new fields I added that can be set by a user appear in at least one example (for generated resources) or third_party test (for handwritten resources or update tests).
  • Generated Terraform providers, and ran make test and make lint in the generated providers to ensure it passes unit and linter tests.
  • Ran relevant acceptance tests using my own Google Cloud project and credentials (If the acceptance tests do not yet pass or you are unable to run them, please let your reviewer know).
  • Read Write release notes before writing my release note below.

Release Note Template for Downstream PRs (will be copied)


@modular-magician

Copy link
Copy Markdown
Collaborator

Hi there, I'm the Modular magician. I've detected the following information about your changes:

Diff report

Your PR generated some diffs in downstreams - here they are.

Terraform GA: Diff ( 15 files changed, 665 insertions(+))
Terraform Beta: Diff ( 15 files changed, 675 insertions(+))
TF Conversion: Diff ( 2 files changed, 3 insertions(+), 3 deletions(-))

@SarahFrench SarahFrench self-requested a review July 5, 2023 18:18
@megan07 megan07 requested a review from zli82016 July 5, 2023 19:11

@SarahFrench SarahFrench left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Approving as this PR generates the same code as what currently exists in a feature branch in the TPGB repo (+ similar for my TPG branch).

I've left a few comments, but they're either some small suggestions about comments to add to files, or they are a review comment made for the benefit of people reading this PR in future and not relevant to us now :)

//
// Until that changes, we'll continue to use `teamcity-go-test` to run
// each test individually
const val useTeamCityGoTest = false

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Just highlighting this part of the code for discovery if people look at this PR in future. useTeamCityGoTest controls some if/else logs in parts of this config code (e.g. L19 and L61 in this file, and .teamcity/tests/generated/configuration.erb) but the code will alway use the same branches due to this value being set to false here.

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

👆 For benefit of people reading this PR in the future

Comment thread mmv1/third_party/terraform/.teamcity/components/packages.kt
Comment thread mmv1/third_party/terraform/.teamcity/components/build_google.kt
Comment thread mmv1/third_party/terraform/.teamcity/tests/helpers.kt
Comment thread mmv1/third_party/terraform/.teamcity/generated/settings.kts.erb
Comment thread mmv1/third_party/terraform/.teamcity/components/packages.kt

@zli82016 zli82016 left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

LGTM

megan07 and others added 4 commits July 6, 2023 16:47
…ackage.kt

Co-authored-by: Sarah French <15078782+SarahFrench@users.noreply.github.com>
Co-authored-by: Sarah French <15078782+SarahFrench@users.noreply.github.com>
Co-authored-by: Sarah French <15078782+SarahFrench@users.noreply.github.com>
Co-authored-by: Sarah French <15078782+SarahFrench@users.noreply.github.com>
@modular-magician modular-magician added the awaiting-approval Pull requests that need reviewer's approval to run presubmit tests label Jul 6, 2023

@zli82016 zli82016 left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

LGTM based on the comments.

@SarahFrench

Copy link
Copy Markdown
Contributor

I just spotted that this PR is marked as having a contributor who hasn't signed the CLA - this is due to Megan leaving HashiCorp between the time this PR was opened and when the PR will be merged 😢 .
My plan is to ignore that warning, because the CLA issue is referencing Megan's old hashicorp work email address, so I don't think it's something that can be addressed? And the CLA was agreed to at the time of the PR being made.

Though @megan07 you're welcome to sign the CLA as an individual in case you're going to make future contributions 😉

@SarahFrench

SarahFrench commented Jul 7, 2023

Copy link
Copy Markdown
Contributor

Plan is to merge this on Monday, without the service-split PR.

Edit: Merging today (Tues 11 July) but will need to write up considerations about quotas and parallelism before moving tests to the service packages

@SarahFrench SarahFrench merged commit 8c255bc into GoogleCloudPlatform:main Jul 11, 2023
Khaledmohamedrefaat pushed a commit to Khaledmohamedrefaat/magic-modules that referenced this pull request Jul 13, 2023
…latform#8254)

* add .teamcity folder

* update .teamcity folder

* fix mistakes

* add sweeper steps

* Update mmv1/third_party/terraform/.teamcity/components/build_config_package.kt

Co-authored-by: Sarah French <15078782+SarahFrench@users.noreply.github.com>

* Update mmv1/third_party/terraform/.teamcity/components/build_google.kt

Co-authored-by: Sarah French <15078782+SarahFrench@users.noreply.github.com>

* Update mmv1/third_party/terraform/.teamcity/generated/settings.kts.erb

Co-authored-by: Sarah French <15078782+SarahFrench@users.noreply.github.com>

* Update mmv1/third_party/terraform/.teamcity/tests/helpers.kt

Co-authored-by: Sarah French <15078782+SarahFrench@users.noreply.github.com>

---------

Co-authored-by: Sarah French <15078782+SarahFrench@users.noreply.github.com>
ericayyliu pushed a commit to ericayyliu/magic-modules that referenced this pull request Jul 26, 2023
…latform#8254)

* add .teamcity folder

* update .teamcity folder

* fix mistakes

* add sweeper steps

* Update mmv1/third_party/terraform/.teamcity/components/build_config_package.kt

Co-authored-by: Sarah French <15078782+SarahFrench@users.noreply.github.com>

* Update mmv1/third_party/terraform/.teamcity/components/build_google.kt

Co-authored-by: Sarah French <15078782+SarahFrench@users.noreply.github.com>

* Update mmv1/third_party/terraform/.teamcity/generated/settings.kts.erb

Co-authored-by: Sarah French <15078782+SarahFrench@users.noreply.github.com>

* Update mmv1/third_party/terraform/.teamcity/tests/helpers.kt

Co-authored-by: Sarah French <15078782+SarahFrench@users.noreply.github.com>

---------

Co-authored-by: Sarah French <15078782+SarahFrench@users.noreply.github.com>
wj-chen pushed a commit to wj-chen/magic-modules that referenced this pull request Aug 1, 2023
…latform#8254)

* add .teamcity folder

* update .teamcity folder

* fix mistakes

* add sweeper steps

* Update mmv1/third_party/terraform/.teamcity/components/build_config_package.kt

Co-authored-by: Sarah French <15078782+SarahFrench@users.noreply.github.com>

* Update mmv1/third_party/terraform/.teamcity/components/build_google.kt

Co-authored-by: Sarah French <15078782+SarahFrench@users.noreply.github.com>

* Update mmv1/third_party/terraform/.teamcity/generated/settings.kts.erb

Co-authored-by: Sarah French <15078782+SarahFrench@users.noreply.github.com>

* Update mmv1/third_party/terraform/.teamcity/tests/helpers.kt

Co-authored-by: Sarah French <15078782+SarahFrench@users.noreply.github.com>

---------

Co-authored-by: Sarah French <15078782+SarahFrench@users.noreply.github.com>
hao-nan-li pushed a commit to hao-nan-li/magic-modules that referenced this pull request Aug 9, 2023
…latform#8254)

* add .teamcity folder

* update .teamcity folder

* fix mistakes

* add sweeper steps

* Update mmv1/third_party/terraform/.teamcity/components/build_config_package.kt

Co-authored-by: Sarah French <15078782+SarahFrench@users.noreply.github.com>

* Update mmv1/third_party/terraform/.teamcity/components/build_google.kt

Co-authored-by: Sarah French <15078782+SarahFrench@users.noreply.github.com>

* Update mmv1/third_party/terraform/.teamcity/generated/settings.kts.erb

Co-authored-by: Sarah French <15078782+SarahFrench@users.noreply.github.com>

* Update mmv1/third_party/terraform/.teamcity/tests/helpers.kt

Co-authored-by: Sarah French <15078782+SarahFrench@users.noreply.github.com>

---------

Co-authored-by: Sarah French <15078782+SarahFrench@users.noreply.github.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

awaiting-approval Pull requests that need reviewer's approval to run presubmit tests

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants