Skip to content

Remove tgc build from downstream builder#8472

Merged
trodge merged 1 commit into
GoogleCloudPlatform:mainfrom
trodge:ci-changes
Aug 4, 2023
Merged

Remove tgc build from downstream builder#8472
trodge merged 1 commit into
GoogleCloudPlatform:mainfrom
trodge:ci-changes

Conversation

@trodge

@trodge trodge commented Jul 27, 2023

Copy link
Copy Markdown
Contributor

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)


@trodge

trodge commented Jul 27, 2023

Copy link
Copy Markdown
Contributor Author

/gcbrun

@trodge

trodge commented Jul 27, 2023

Copy link
Copy Markdown
Contributor Author

/gcbrun

1 similar comment
@ScottSuarez

Copy link
Copy Markdown
Contributor

/gcbrun

pushd $LOCAL_PATH

if [ "$COMMAND" == "downstream" ]; then
go get -d github.com/hashicorp/terraform-provider-google-beta@$BASE_BRANCH

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.

This line will need to stay, otherwise the downstream branch won't update terraform-provider-google-beta to latest in the go.sum

@ScottSuarez

ScottSuarez commented Jul 28, 2023

Copy link
Copy Markdown
Contributor

Thankfully we probably can retain the old behavior. For the push_downstream build

- name: 'gcr.io/graphite-docker-images/downstream-builder'
secretEnv: ["GITHUB_TOKEN"]
id: tgc-push
waitFor: ["tgc-sync", "tpg-push"]
env:
- BASE_BRANCH=$BRANCH_NAME
args:
- 'downstream'
- 'terraform-google-conversion'
- 'beta'
- $COMMIT_SHA
- name: 'gcr.io/cloud-builders/git'
waitFor: ["tgc-push"]
secretEnv: ["GITHUB_TOKEN"]
entrypoint: 'bash'
args:
- -c
- |
if [ "$BRANCH_NAME" == "main" ]; then
git push https://modular-magician:$$GITHUB_TOKEN@github.com/GoogleCloudPlatform/magic-modules $COMMIT_SHA:tgc-sync
else
git push https://modular-magician:$$GITHUB_TOKEN@github.com/GoogleCloudPlatform/magic-modules $COMMIT_SHA:tgc-sync-$BRANCH_NAME
fi

Looks like this is where the downstreams are built. We need to update the wait_for to be dependent on tpgb

waitFor: ["tgc-sync", "tpg-push"]

@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 hasn't generated any diffs, but I'll let you know if a future commit does.

@trodge

trodge commented Jul 28, 2023

Copy link
Copy Markdown
Contributor Author

If we're retaining the old behavior doesn't it already wait on everything it needs to wait on?

@ScottSuarez

Copy link
Copy Markdown
Contributor

we changed it to rely on tpgb but this line was never updated. I think its a mishap.

@modular-magician

Copy link
Copy Markdown
Collaborator

Tests analytics

Total tests: 2908
Passed tests 2604
Skipped tests: 302
Affected tests: 2

Action taken

Found 2 affected test(s) by replaying old test recordings. Starting RECORDING based on the most recent commit. Click here to see the affected tests
TestAccContainerAwsNodePool_BetaBasicHandWritten|TestAccBigtableAppProfile_bigtableAppProfileSingleclusterExample

Get to know how VCR tests work

@modular-magician

Copy link
Copy Markdown
Collaborator

$\textcolor{green}{\textsf{Tests passed during RECORDING mode:}}$
TestAccBigtableAppProfile_bigtableAppProfileSingleclusterExample[Debug log]

Rerun these tests in REPLAYING mode to catch issues

$\textcolor{green}{\textsf{No issues found for passed tests after REPLAYING rerun.}}$


$\textcolor{red}{\textsf{Tests failed during RECORDING mode:}}$
TestAccContainerAwsNodePool_BetaBasicHandWritten[Error message] [Debug log]

$\textcolor{red}{\textsf{Please fix these to complete your PR.}}$
View the build log or the debug log for each test

@trodge trodge requested a review from ScottSuarez July 28, 2023 20:21
@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 hasn't generated any diffs, but I'll let you know if a future commit does.

@modular-magician

Copy link
Copy Markdown
Collaborator

Tests analytics

Total tests: 2909
Passed tests 2606
Skipped tests: 302
Affected tests: 1

Action taken

Found 1 affected test(s) by replaying old test recordings. Starting RECORDING based on the most recent commit. Click here to see the affected tests
TestAccContainerAwsNodePool_BetaBasicHandWritten

Get to know how VCR tests work

@modular-magician

Copy link
Copy Markdown
Collaborator

$\textcolor{red}{\textsf{Tests failed during RECORDING mode:}}$
TestAccContainerAwsNodePool_BetaBasicHandWritten[Error message] [Debug log]

$\textcolor{red}{\textsf{Please fix these to complete your PR.}}$
View the build log or the debug log for each test

@ScottSuarez

Copy link
Copy Markdown
Contributor

Looks like all the terraform google conversion tests are failing status on the PR

@ScottSuarez

Copy link
Copy Markdown
Contributor

Ah this is probably because you didn't update their container. Could you also update their containers remotely. Want to make sure everything is green before landing it.

@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 hasn't generated any diffs, but I'll let you know if a future commit does.

@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.

TF Conversion: Diff ( 1 file changed, 1 insertion(+))

@ScottSuarez

Copy link
Copy Markdown
Contributor

Looks good !! Thanks so much, one last flow I would like to see. Could you make a small change to tgc so the code compiles and tests run without being skipped. Then I think we are good to check this in !

@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.

TF Conversion: Diff ( 1 file changed, 2 insertions(+))

@ScottSuarez ScottSuarez 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.

Looks good to me. Could you revert the changes to the mmv1 directory. Thanks for testing!!

@trodge trodge merged commit bcc8c94 into GoogleCloudPlatform:main Aug 4, 2023
@trodge trodge deleted the ci-changes branch August 4, 2023 21:33
jeperetz pushed a commit to jeperetz/magic-modules that referenced this pull request Aug 10, 2023
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.

3 participants