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

Enable cron triggers defined in .teamcity to use branches that aren't main #10270

Merged
merged 3 commits into from
Apr 3, 2024

Conversation

BBBmau
Copy link
Collaborator

@BBBmau BBBmau commented Mar 23, 2024

Gives users the ability to run tests that aren't main by being able to provide their own branch name. default would be ref/head/main

This PR also insures that nightly tests are ran on main by adding an assertion to check that the branchFilter is in fact +:ref/head/main

Release Note Template for Downstream PRs (will be copied)


@BBBmau BBBmau requested a review from SarahFrench March 23, 2024 19:07
@modular-magician
Copy link
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.

google provider: Diff ( 3 files changed, 12 insertions(+), 2 deletions(-))

@SarahFrench
Copy link
Contributor

@BBBmau if you pull main into your branch the acceptance tests should be able to run as expected!

@BBBmau BBBmau force-pushed the tc-triggers-nonmain branch from 0110f54 to ab6d133 Compare March 27, 2024 23:16
@modular-magician
Copy link
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.

google provider: Diff ( 3 files changed, 12 insertions(+), 2 deletions(-))

Copy link
Contributor

@SarahFrench SarahFrench left a comment

Choose a reason for hiding this comment

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

Shared some errors from the automated TeamCity config tests - now the dependency issue is fixed you can use the .teamcity/Makefile tools to check if the code build ok or not.

@BBBmau
Copy link
Collaborator Author

BBBmau commented Mar 29, 2024

Tests are now passing after running make test 👍🏼

┌─(~/Dev/terraform-provider-google/.teamcity)──────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────(mau@mau-JKDT676NCP:s020)─┐
└─(17:18:45 on main ✹ ✭)──> make test                                                                                                                                                      ──(Thu,Mar28)─┘
mvn teamcity-configs:generate
[INFO] Scanning for projects...
[INFO] 
[INFO] ----------< TerraformProviderGoogle:TerraformProviderGoogle >-----------
[INFO] Building Terraform-Provider-Google Config DSL Script 1.0-SNAPSHOT
[INFO]   from pom.xml
[INFO] --------------------------------[ jar ]---------------------------------
[INFO] 
[INFO] --- teamcity-configs:2023.11.1:generate (default-cli) @ TerraformProviderGoogle ---
[INFO] Generate TeamCity configs in /Users/mau/Dev/terraform-provider-google/.teamcity/target/generated-configs, format kotlin, dslDir: /Users/mau/Dev/terraform-provider-google/.teamcity
[INFO] ------------------------------------------------------------------------
[INFO] BUILD SUCCESS
[INFO] ------------------------------------------------------------------------
[INFO] Total time:  13.317 s
[INFO] Finished at: 2024-03-28T17:19:02-07:00
[INFO] ------------------------------------------------------------------------
mvn test -DtestPackage=tests
[INFO] Scanning for projects...
[INFO] 
[INFO] ----------< TerraformProviderGoogle:TerraformProviderGoogle >-----------
[INFO] Building Terraform-Provider-Google Config DSL Script 1.0-SNAPSHOT
[INFO]   from pom.xml
[INFO] --------------------------------[ jar ]---------------------------------
[INFO] 
[INFO] --- surefire:2.22.2:test (compile) @ TerraformProviderGoogle ---
[INFO] 
[INFO] -------------------------------------------------------
[INFO]  T E S T S
[INFO] -------------------------------------------------------
[INFO] Running tests.NightlyTestProjectsTests
[INFO] Tests run: 1, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.15 s - in tests.NightlyTestProjectsTests
[INFO] Running tests.BuildConfigurationFeatureTests
[INFO] Tests run: 2, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.034 s - in tests.BuildConfigurationFeatureTests
[INFO] Running tests.SweeperTests
[INFO] Tests run: 5, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.027 s - in tests.SweeperTests
[INFO] Running tests.ContextParameterHandlingTests
[INFO] Tests run: 3, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.128 s - in tests.ContextParameterHandlingTests
[INFO] Running tests.VcsTests
[INFO] Tests run: 1, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.007 s - in tests.VcsTests
[INFO] 
[INFO] Results:
[INFO] 
[INFO] Tests run: 12, Failures: 0, Errors: 0, Skipped: 0
[INFO] 
[INFO] 
[INFO] --- kotlin:1.8.22:compile (compile) @ TerraformProviderGoogle ---
[INFO] 
[INFO] --- resources:3.3.1:resources (default-resources) @ TerraformProviderGoogle ---
[WARNING] Using platform encoding (UTF-8 actually) to copy filtered resources, i.e. build is platform dependent!
[INFO] skip non existing resourceDirectory /Users/mau/Dev/terraform-provider-google/.teamcity/src/main/resources
[INFO] 
[INFO] --- compiler:3.11.0:compile (default-compile) @ TerraformProviderGoogle ---
[INFO] Nothing to compile - all classes are up to date
[INFO] 
[INFO] --- kotlin:1.8.22:test-compile (test-compile) @ TerraformProviderGoogle ---
[WARNING] /Users/mau/Dev/terraform-provider-google/.teamcity/tests/sweepers.kt: (56, 30) Name shadowed: project
[WARNING] /Users/mau/Dev/terraform-provider-google/.teamcity/tests/sweepers.kt: (80, 55) Unnecessary non-null assertion (!!) on a non-null receiver of type Project
[WARNING] /Users/mau/Dev/terraform-provider-google/.teamcity/tests/sweepers.kt: (98, 57) Unnecessary non-null assertion (!!) on a non-null receiver of type Project
[WARNING] /Users/mau/Dev/terraform-provider-google/.teamcity/tests/test_utils.kt: (75, 47) Unnecessary non-null assertion (!!) on a non-null receiver of type Project
[INFO] 
[INFO] --- resources:3.3.1:testResources (default-testResources) @ TerraformProviderGoogle ---
[WARNING] Using platform encoding (UTF-8 actually) to copy filtered resources, i.e. build is platform dependent!
[INFO] skip non existing resourceDirectory /Users/mau/Dev/terraform-provider-google/.teamcity/src/test/resources
[INFO] 
[INFO] --- compiler:3.11.0:testCompile (default-testCompile) @ TerraformProviderGoogle ---
[INFO] Changes detected - recompiling the module! :dependency
[WARNING] File encoding has not been set, using platform encoding UTF-8, i.e. build is platform dependent!
[INFO] 
[INFO] --- surefire:2.22.2:test (default-test) @ TerraformProviderGoogle ---
[INFO] Skipping execution of surefire because it has already been run for this configuration
[INFO] ------------------------------------------------------------------------
[INFO] BUILD SUCCESS
[INFO] ------------------------------------------------------------------------
[INFO] Total time:  9.866 s
[INFO] Finished at: 2024-03-28T17:19:13-07:00
[INFO] ------------------------------------------------------------------------

@BBBmau BBBmau requested a review from SarahFrench March 29, 2024 00:24
@modular-magician
Copy link
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.

google provider: Diff ( 3 files changed, 16 insertions(+), 2 deletions(-))

Copy link
Contributor

@SarahFrench SarahFrench left a comment

Choose a reason for hiding this comment

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

Looks good to me! Send me a DM when you merge this and we can check it as TeamCity loads in the new config

@BBBmau BBBmau merged commit a7749ef into GoogleCloudPlatform:main Apr 3, 2024
10 checks passed
rafalmaczewski pushed a commit to rafalmaczewski/magic-modules that referenced this pull request Apr 3, 2024
cmfeng pushed a commit to cmfeng/cmfeng-magic-modules that referenced this pull request Apr 5, 2024
hao-nan-li pushed a commit to hao-nan-li/magic-modules that referenced this pull request Apr 9, 2024
balanaguharsha pushed a commit to balanaguharsha/magic-modules that referenced this pull request Apr 19, 2024
balanaguharsha pushed a commit to balanaguharsha/magic-modules that referenced this pull request May 2, 2024
balanaguharsha pushed a commit to balanaguharsha/magic-modules that referenced this pull request May 2, 2024
BBBmau added a commit to BBBmau/magic-modules that referenced this pull request May 8, 2024
pawelJas pushed a commit to pawelJas/magic-modules that referenced this pull request May 16, 2024
pengq-google pushed a commit to pengq-google/magic-modules that referenced this pull request May 21, 2024
Cheriit pushed a commit to Cheriit/magic-modules that referenced this pull request Jun 4, 2024
pcostell pushed a commit to pcostell/magic-modules that referenced this pull request Jul 16, 2024
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