Skip to content
Permalink
Browse files
965: hgupdate-sync mistakenly added to 16.0.2 backport record
Reviewed-by: kcr, erikj
  • Loading branch information
rwestberg committed Apr 14, 2021
1 parent 995a858 commit ea2dc184dee98cbbb39fc105a58794423d4a2866
Showing 2 changed files with 17 additions and 2 deletions.
@@ -253,8 +253,12 @@ private static List<String> releaseStreams(JdkVersion jdkVersion) {
if (jdkVersion.update().isPresent()) {
var numericUpdate = Integer.parseInt(jdkVersion.update().get());
if (numericUpdate == 1 || numericUpdate == 2) {
ret.add(jdkVersion.feature() + "+updates-oracle");
ret.add(jdkVersion.feature() + "+updates-openjdk");
if (jdkVersion.opt().isPresent() && jdkVersion.opt().get().equals("oracle") && jdkVersion.components().size() > 4) {
ret.add(jdkVersion.feature() + "+bpr");
} else {
ret.add(jdkVersion.feature() + "+updates-oracle");
ret.add(jdkVersion.feature() + "+updates-openjdk");
}
} else if (numericUpdate > 2) {
if (jdkVersion.opt().isPresent() && jdkVersion.opt().get().equals("oracle")) {
if (jdkVersion.components().size() > 4) {
@@ -769,4 +769,15 @@ void wontFix(TestInfo testInfo) throws IOException {
backports.assertLabeled("15");
}
}

@Test
void testBpr(TestInfo testInfo) throws IOException {
try (var credentials = new HostCredentials(testInfo)) {
var backports = new BackportManager(credentials, "17");
backports.assertLabeled();

backports.addBackports("16.0.2", "16.0.1.0.1-oracle", "11.0.12-oracle", "11.0.11.0.1-oracle", "8u301", "8u291", "8u281");
backports.assertLabeled("8u291", "8u301");
}
}
}

1 comment on commit ea2dc18

@openjdk-notifier
Copy link

@openjdk-notifier openjdk-notifier bot commented on ea2dc18 Apr 14, 2021

Choose a reason for hiding this comment

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

Please sign in to comment.