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.

Sign up for GitHub

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

Jump to bottom

Set OPENJ9_BRANCH and JDK_BRANCH to release_tag in test pipeline #2166

Merged
merged 1 commit into from
Oct 30, 2020
Merged

Set OPENJ9_BRANCH and JDK_BRANCH to release_tag in test pipeline #2166

merged 1 commit into from
Oct 30, 2020

Conversation

llxia
Copy link
Contributor

@llxia llxia commented Oct 21, 2020 •
edited
Loading

  • If release_tag is provided, set OPENJ9_BRANCH to release_tag
    (buildConfig.SCM_REF). Otherwise, set OPENJ9_BRANCH to master
  • If release_tag is provided, set JDK_BRANCH to release_tag
    (buildConfig.SCM_REF). Otherwise, set JDK_BRANCH according to
    buildConfig.VARIANT

Resolves: #2131
Related: adoptium/aqa-tests#2006

Signed-off-by: lanxia lan_xia@ca.ibm.com

@karianna karianna added the bug Issues that are problems in the code as reported by the community label Oct 22, 2020
@karianna karianna added this to the October 2020 milestone Oct 22, 2020
@LongyuZhang LongyuZhang mentioned this pull request Oct 23, 2020
Open
@sophia-guo sophia-guo mentioned this pull request Oct 27, 2020
Closed
@sophia-guo
Copy link
Contributor

This should not be limited to openj9. May just set JDK_BRANCH --> ${buildConfig.SCM_REF} if ${buildConfig.SCM_REF} is set.

@llxia
Set OPENJ9_BRANCH and JDK_BRANCH to release_tag in test pipeline
16c1aea 
- If release_tag is provided, set OPENJ9_BRANCH to release_tag
(buildConfig.SCM_REF). Otherwise, set OPENJ9_BRANCH to master
- If release_tag is provided, set JDK_BRANCH to release_tag
(buildConfig.SCM_REF). Otherwise, set JDK_BRANCH according to
buildConfig.VARIANT

Resolves: adoptium#2131
Related: adoptium/aqa-tests#2006

Signed-off-by: lanxia <lan_xia@ca.ibm.com>
@llxia
Copy link
Contributor Author

llxia commented Oct 28, 2020 •
edited
Loading

This should not be limited to openj9. May just set JDK_BRANCH --> ${buildConfig.SCM_REF} if ${buildConfig.SCM_REF} is set.

Updated to set JDK_BRANCH if buildConfig.SCM_REF is provided. Otherwise, set JDK_BRANCH according to
buildConfig.VARIANT

@llxia llxia changed the title Set OPENJ9_BRANCH to release_tag in test pipeline Set OPENJ9_BRANCH and JDK_BRANCH to release_tag in test pipeline Oct 28, 2020
@llxia llxia marked this pull request as ready for review October 28, 2020 18:35
@llxia
Copy link
Contributor Author

llxia commented Oct 28, 2020

Reviewers: @smlambert @sophia-guo

smlambert
smlambert approved these changes Oct 29, 2020
View reviewed changes
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.

LGTM

@llxia
Copy link
Contributor Author

llxia commented Oct 29, 2020

Could Admin please trigger PR Testers with run tests comment? I do not think it will run test builds, but it should make sure this PR does not break the build pipeline.

@M-Davies
Copy link

run tests

@M-Davies
Copy link

There's a pretty big backlog right now. PR-tester might take a while https://ci.adoptopenjdk.net/view/build-tester/job/build-scripts-pr-tester/job/openjdk-build-pr-tester/

M-Davies
M-Davies approved these changes Oct 29, 2020
View reviewed changes
Copy link

@M-Davies M-Davies left a comment

Choose a reason for hiding this comment

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

LGTM

@adoptopenjdk-github-bot
Copy link
Contributor

🟠 PR TESTER RESULT 🟠

❎ Some pipelines failed or the job was aborted! ❎
See the pipeline-build-check below for more information...

@smlambert
Copy link
Contributor

The macos build issue is not related to this PR, is it a known issue?

configure: error: Xcode 4, 9, 10 or 11 is required to build JDK 8, the version found was 12.0.1. Use --with-xcode-path to specify the location of Xcode or make Xcode active by using xcode-select.
configure exiting with result code 1
Makefile:55: *** Cannot continue.  Stop.

I believe this is ready to merge.

@smlambert
Copy link
Contributor

I see the answer to my question in #2197

@smlambert smlambert merged commit 96e2c91 into adoptium:master Oct 30, 2020
@smlambert smlambert mentioned this pull request Nov 3, 2020
Closed
@joeyleeeeeee97 joeyleeeeeee97 mentioned this pull request Nov 5, 2020
Closed
@sophia-guo sophia-guo mentioned this pull request Jan 10, 2022
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@karianna karianna karianna left review comments

@M-Davies M-Davies M-Davies approved these changes

@smlambert smlambert smlambert approved these changes

Assignees
No one assigned
Labels
bug Issues that are problems in the code as reported by the community
Projects
None yet
Milestone
October 2020
Development

Successfully merging this pull request may close these issues.

Functional testing uses wrong test material in release testing
6 participants
@llxia @sophia-guo @M-Davies @adoptopenjdk-github-bot @smlambert @karianna