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

Update JCK repo default branch to 'main' #4667

Merged
merged 1 commit into from
Jul 13, 2023

Conversation

AdamBrousseau
Copy link
Contributor

Internal infra 8166

Internal infra 8166

Signed-off-by: Adam Brousseau <adam.brousseau88@gmail.com>
@llxia
Copy link
Contributor

llxia commented Jul 12, 2023

@smlambert I do not think this will affect adoptium, but could you run a Grinder to check?

Copy link
Contributor

@smlambert smlambert left a comment

Choose a reason for hiding this comment

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

16:55:33       [exec] hint: You can replace "git config" with "git config --global" to set a default
16:55:33       [exec] hint: preference for all repositories. You can also pass --rebase, --no-rebase,
16:55:33       [exec] hint: or --ff-only on the command line to override the configured default per
16:55:33       [exec] hint: invocation.
16:55:35       [exec] fatal: couldn't find remote ref main
16:55:35       [exec] Result: 1
16:55:35       [echo] Performing hard reset...
16:55:35       [exec] fatal: ambiguous argument 'origin/main': unknown revision or path not in the working tree.
16:55:35       [exec] Use '--' to separate paths from revisions, like this:
16:55:35       [exec] 'git <command> [<revision>...] -- [<file>...]'

I believe it implies we would have to change our *-unzipped repositories (which we do not have read or write access to do). We do not use the tagged aqa-tests repo for running TCKs, we use the master branch. We will need to raise a EF helpdesk in order to make changes to *-unzipped repos and I would not want to be attempting to do it prior to our July release.

@llxia
Copy link
Contributor

llxia commented Jul 12, 2023

What is your JCK_GIT_BRANCH value in Grinder? Is it set to master?

@smlambert
Copy link
Contributor

I do not have that parameter in our Grinders, so it was unset. I see in our test jobs it is set to master. I am going to create a metric called NumberOfAQAvitParams which must be nearing 100 by now. What can be done to reduce the number, or at least slow the steady growth.

@smlambert smlambert merged commit 5d30587 into adoptium:master Jul 13, 2023
@llxia
Copy link
Contributor

llxia commented Jul 14, 2023

I think we should raise an EF helpdesk ticket to update Adoptium *-unzipped repos to main after the July release so that we do not have to maintain code for both master and main.

@smlambert
Copy link
Contributor

I think we should raise an EF helpdesk ticket to update Adoptium *-unzipped repos to main after the July release so that we do not have to maintain code for both master and main.

💯 agree

AdamBrousseau added a commit to AdamBrousseau/aqa-tests that referenced this pull request Aug 25, 2023
Internal infra 8166

Signed-off-by: Adam Brousseau <adam.brousseau88@gmail.com>
llxia pushed a commit that referenced this pull request Aug 25, 2023
Internal infra 8166

Signed-off-by: Adam Brousseau <adam.brousseau88@gmail.com>
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.

4 participants