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

WIP: Don't override OpenJ9 SHA with PR ref #7288

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

WIP: Don't override OpenJ9 SHA with PR ref #7288

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 1 addition & 4 deletions buildenv/jenkins/common/pipeline-functions.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -399,10 +399,7 @@ def workflow(SDK_VERSION, SPEC, SHAS, OPENJDK_REPO, OPENJDK_BRANCH, OPENJ9_REPO,

echo "Using VENDOR_TEST_REPOS = ${VENDOR_TEST_REPOS}, VENDOR_TEST_BRANCHES = ${VENDOR_TEST_BRANCHES}, VENDOR_TEST_SHAS = ${VENDOR_TEST_SHAS}, VENDOR_TEST_DIRS = ${VENDOR_TEST_DIRS}"

// For PullRequest Builds, overwrite the OpenJ9 sha for test jobs so they checkout the PR (OpenJ9 PRs only)
if (params.ghprbPullId && params.ghprbGhRepository == GHPRB_REPO_OPENJ9) {
SHAS['OPENJ9'] = "origin/pr/${params.ghprbPullId}/merge"
}
echo "Passing test OPenJ9 SHA:${SHAS['OPENJ9']}"
Copy link
Contributor

Choose a reason for hiding this comment

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

nit: OPenJ9 -> OpenJ9

for (name in TARGET_NAMES) {
// Checking to see if the test should be excluded
if (EXCLUDED_TESTS.contains(get_target_name(name))){
Expand Down