From 6a85e4e3276bcfe63963a23a26318f25bc70c37e Mon Sep 17 00:00:00 2001 From: Luigi Montoya Date: Wed, 17 Jul 2024 08:34:54 +0000 Subject: [PATCH] Fix issue to send container registry when testing --- linux/ca-certificates/debian/build.gradle | 4 +--- .../org/adoptium/cacertificates/DebianFlavours.java | 5 +++-- linux/jdk/alpine/build.gradle | 4 +--- .../packageTest/java/packaging/AlpineFlavours.java | 5 +++-- linux/jdk/debian/build.gradle | 4 +--- .../packageTest/java/packaging/DebianFlavours.java | 13 +++++++------ linux/jdk/redhat/build.gradle | 5 ++--- .../java/packaging/RedHatFlavoursWithDnf.java | 7 ++++--- .../java/packaging/RedHatFlavoursWithYum.java | 7 ++++--- linux/jdk/suse/build.gradle | 4 +--- .../packageTest/java/packaging/SuseFlavours.java | 7 ++++--- linux/jre/alpine/build.gradle | 4 +--- .../packageTest/java/packaging/AlpineFlavours.java | 5 +++-- linux/jre/debian/build.gradle | 4 +--- .../packageTest/java/packaging/DebianFlavours.java | 5 +++-- linux/jre/redhat/build.gradle | 4 +--- .../java/packaging/RedHatFlavoursWithDnf.java | 6 ++++-- .../java/packaging/RedHatFlavoursWithYum.java | 7 ++++--- linux/jre/suse/build.gradle | 4 +--- .../packageTest/java/packaging/SuseFlavours.java | 7 ++++--- 20 files changed, 53 insertions(+), 58 deletions(-) diff --git a/linux/ca-certificates/debian/build.gradle b/linux/ca-certificates/debian/build.gradle index c8075d666..1973bd776 100644 --- a/linux/ca-certificates/debian/build.gradle +++ b/linux/ca-certificates/debian/build.gradle @@ -124,9 +124,7 @@ task checkCaCertificatesDebian(type: Test) { environment "PACKAGE", "adoptium-ca-certificates" if (containerRegistry) { - ext { - containerRegistry = containerRegistry - } + environment "containerRegistry", "$containerRegistry" println "Container registry set to $containerRegistry" } diff --git a/linux/ca-certificates/debian/src/packageTest/java/org/adoptium/cacertificates/DebianFlavours.java b/linux/ca-certificates/debian/src/packageTest/java/org/adoptium/cacertificates/DebianFlavours.java index 58e8fcd25..8f7d9d4c2 100644 --- a/linux/ca-certificates/debian/src/packageTest/java/org/adoptium/cacertificates/DebianFlavours.java +++ b/linux/ca-certificates/debian/src/packageTest/java/org/adoptium/cacertificates/DebianFlavours.java @@ -35,11 +35,12 @@ public Stream provideArguments(ExtensionContext context) { * (https://wiki.ubuntu.com/Releases) */ - String containerRegistry = System.getProperty("containerRegistry", ""); + String containerRegistry = ""; - if (containerRegistry.isEmpty()) { + if (System.getenv("containerRegistry") == null) { System.out.println("Using default container registry"); } else { + containerRegistry = System.getenv("containerRegistry"); System.out.println("Using container registry: " + containerRegistry); } diff --git a/linux/jdk/alpine/build.gradle b/linux/jdk/alpine/build.gradle index 96c57a008..6a3fa051f 100644 --- a/linux/jdk/alpine/build.gradle +++ b/linux/jdk/alpine/build.gradle @@ -141,9 +141,7 @@ task checkJdkAlpine(type: Test) { } if (containerRegistry) { - ext { - containerRegistry = containerRegistry - } + environment "containerRegistry", "$containerRegistry" println "Container registry set to $containerRegistry" } diff --git a/linux/jdk/alpine/src/packageTest/java/packaging/AlpineFlavours.java b/linux/jdk/alpine/src/packageTest/java/packaging/AlpineFlavours.java index f200e35ed..093f708c8 100644 --- a/linux/jdk/alpine/src/packageTest/java/packaging/AlpineFlavours.java +++ b/linux/jdk/alpine/src/packageTest/java/packaging/AlpineFlavours.java @@ -33,11 +33,12 @@ public Stream provideArguments(ExtensionContext context) { * (https://alpinelinux.org/releases/) */ - String containerRegistry = System.getProperty("containerRegistry", ""); + String containerRegistry = ""; - if (containerRegistry.isEmpty()) { + if (System.getenv("containerRegistry") == null) { System.out.println("Using default container registry"); } else { + containerRegistry = System.getenv("containerRegistry"); System.out.println("Using container registry: " + containerRegistry); } diff --git a/linux/jdk/debian/build.gradle b/linux/jdk/debian/build.gradle index b754c22f9..fe920ba8e 100644 --- a/linux/jdk/debian/build.gradle +++ b/linux/jdk/debian/build.gradle @@ -183,9 +183,7 @@ task checkJdkDebian(type: Test) { } if (containerRegistry) { - ext { - containerRegistry = containerRegistry - } + environment "containerRegistry", "$containerRegistry" println "Container registry set to $containerRegistry" } diff --git a/linux/jdk/debian/src/packageTest/java/packaging/DebianFlavours.java b/linux/jdk/debian/src/packageTest/java/packaging/DebianFlavours.java index e114d5435..474a6966d 100644 --- a/linux/jdk/debian/src/packageTest/java/packaging/DebianFlavours.java +++ b/linux/jdk/debian/src/packageTest/java/packaging/DebianFlavours.java @@ -36,13 +36,14 @@ public Stream provideArguments(ExtensionContext context) { * (https://wiki.ubuntu.com/Releases) */ - String containerRegistry = System.getProperty("containerRegistry", ""); + String containerRegistry = ""; - if (containerRegistry.isEmpty()) { - System.out.println("Using default container registry"); - } else { - System.out.println("Using container registry: " + containerRegistry); - } + if (System.getenv("containerRegistry") == null) { + System.out.println("Using default container registry"); + } else { + containerRegistry = System.getenv("containerRegistry"); + System.out.println("Using container registry: " + containerRegistry); + } return Stream.of( Arguments.of(containerRegistry + "debian", "trixie"), // Debian/13 (testing) diff --git a/linux/jdk/redhat/build.gradle b/linux/jdk/redhat/build.gradle index c59abf000..03072bd16 100644 --- a/linux/jdk/redhat/build.gradle +++ b/linux/jdk/redhat/build.gradle @@ -151,6 +151,7 @@ task checkJdkRedHat(type: Test) { def arch = getArch() def containerRegistry = getContainerRegistry() + // def containerRegistry = "junipercontainerregistry.azurecr.io/mirror/" // If product is microsoft set it as msopenjdk if (product == "microsoft") { @@ -166,9 +167,7 @@ task checkJdkRedHat(type: Test) { environment "testArch", "$arch" if (containerRegistry) { - ext { - containerRegistry = containerRegistry - } + environment "containerRegistry", "$containerRegistry" println "Container registry set to $containerRegistry" } diff --git a/linux/jdk/redhat/src/packageTest/java/packaging/RedHatFlavoursWithDnf.java b/linux/jdk/redhat/src/packageTest/java/packaging/RedHatFlavoursWithDnf.java index 5b19fe518..a2e8f88df 100644 --- a/linux/jdk/redhat/src/packageTest/java/packaging/RedHatFlavoursWithDnf.java +++ b/linux/jdk/redhat/src/packageTest/java/packaging/RedHatFlavoursWithDnf.java @@ -43,11 +43,12 @@ public Stream provideArguments(ExtensionContext context) { * ubi8 has DNF installed */ - String containerRegistry = System.getProperty("containerRegistry", ""); + String containerRegistry = ""; - if (containerRegistry.isEmpty()) { + if (System.getenv("containerRegistry") == null) { System.out.println("Using default container registry"); - } else { + } else { + containerRegistry = System.getenv("containerRegistry"); System.out.println("Using container registry: " + containerRegistry); } diff --git a/linux/jdk/redhat/src/packageTest/java/packaging/RedHatFlavoursWithYum.java b/linux/jdk/redhat/src/packageTest/java/packaging/RedHatFlavoursWithYum.java index 332a12e3b..a2fae3fbe 100644 --- a/linux/jdk/redhat/src/packageTest/java/packaging/RedHatFlavoursWithYum.java +++ b/linux/jdk/redhat/src/packageTest/java/packaging/RedHatFlavoursWithYum.java @@ -48,13 +48,14 @@ public Stream provideArguments(ExtensionContext context) { */ String redHatRegistry = "registry.access.redhat.com/"; - String containerRegistry = System.getProperty("containerRegistry", ""); + String containerRegistry = ""; - if (containerRegistry.isEmpty()) { + if (System.getenv("containerRegistry") == null) { System.out.println("Using default container registry"); } else { - System.out.println("Using container registry: " + containerRegistry); + containerRegistry = System.getenv("containerRegistry"); redHatRegistry = containerRegistry; + System.out.println("Using container registry: " + containerRegistry); } builder.add(Arguments.of(containerRegistry + "amazonlinux", "2")); diff --git a/linux/jdk/suse/build.gradle b/linux/jdk/suse/build.gradle index 22c5a3a67..066d5c916 100644 --- a/linux/jdk/suse/build.gradle +++ b/linux/jdk/suse/build.gradle @@ -137,9 +137,7 @@ task checkJdkSuse(type: Test) { environment "testArch", "$arch" if (containerRegistry) { - ext { - containerRegistry = containerRegistry - } + environment "containerRegistry", "$containerRegistry" println "Container registry set to $containerRegistry" } diff --git a/linux/jdk/suse/src/packageTest/java/packaging/SuseFlavours.java b/linux/jdk/suse/src/packageTest/java/packaging/SuseFlavours.java index 8f268488f..be19cab28 100644 --- a/linux/jdk/suse/src/packageTest/java/packaging/SuseFlavours.java +++ b/linux/jdk/suse/src/packageTest/java/packaging/SuseFlavours.java @@ -36,13 +36,14 @@ public Stream provideArguments(ExtensionContext context) { */ String suseRegistry = "registry.suse.com/"; - String containerRegistry = System.getProperty("containerRegistry", ""); + String containerRegistry = ""; - if (containerRegistry.isEmpty()) { + if (System.getenv("containerRegistry") == null) { System.out.println("Using default container registry"); } else { - System.out.println("Using container registry: " + containerRegistry); + containerRegistry = System.getenv("containerRegistry"); suseRegistry = containerRegistry; + System.out.println("Using container registry: " + containerRegistry); } return Stream.of( diff --git a/linux/jre/alpine/build.gradle b/linux/jre/alpine/build.gradle index 6251d064f..45f639d18 100644 --- a/linux/jre/alpine/build.gradle +++ b/linux/jre/alpine/build.gradle @@ -142,9 +142,7 @@ task checkJreAlpine(type: Test) { } if (containerRegistry) { - ext { - containerRegistry = containerRegistry - } + environment "containerRegistry", "$containerRegistry" println "Container registry set to $containerRegistry" } diff --git a/linux/jre/alpine/src/packageTest/java/packaging/AlpineFlavours.java b/linux/jre/alpine/src/packageTest/java/packaging/AlpineFlavours.java index 9ec4c0e9c..1ab6d4c1d 100644 --- a/linux/jre/alpine/src/packageTest/java/packaging/AlpineFlavours.java +++ b/linux/jre/alpine/src/packageTest/java/packaging/AlpineFlavours.java @@ -33,11 +33,12 @@ public Stream provideArguments(ExtensionContext context) { * (https://alpinelinux.org/releases/) */ - String containerRegistry = System.getProperty("containerRegistry", ""); + String containerRegistry = ""; - if (containerRegistry.isEmpty()) { + if (System.getenv("containerRegistry") == null) { System.out.println("Using default container registry"); } else { + containerRegistry = System.getenv("containerRegistry"); System.out.println("Using container registry: " + containerRegistry); } diff --git a/linux/jre/debian/build.gradle b/linux/jre/debian/build.gradle index 11e05689c..7080d16d2 100644 --- a/linux/jre/debian/build.gradle +++ b/linux/jre/debian/build.gradle @@ -177,9 +177,7 @@ task checkJreDebian(type: Test) { environment "PACKAGE", "${product}-${productVersion}-jre" if (containerRegistry) { - ext { - containerRegistry = containerRegistry - } + environment "containerRegistry", "$containerRegistry" println "Container registry set to $containerRegistry" } diff --git a/linux/jre/debian/src/packageTest/java/packaging/DebianFlavours.java b/linux/jre/debian/src/packageTest/java/packaging/DebianFlavours.java index 1c00ae778..90ed0d5fd 100644 --- a/linux/jre/debian/src/packageTest/java/packaging/DebianFlavours.java +++ b/linux/jre/debian/src/packageTest/java/packaging/DebianFlavours.java @@ -36,11 +36,12 @@ public Stream provideArguments(ExtensionContext context) { * (https://wiki.ubuntu.com/Releases) */ - String containerRegistry = System.getProperty("containerRegistry", ""); + String containerRegistry = ""; - if (containerRegistry.isEmpty()) { + if (System.getenv("containerRegistry") == null) { System.out.println("Using default container registry"); } else { + containerRegistry = System.getenv("containerRegistry"); System.out.println("Using container registry: " + containerRegistry); } diff --git a/linux/jre/redhat/build.gradle b/linux/jre/redhat/build.gradle index b1755955d..735a7a61a 100644 --- a/linux/jre/redhat/build.gradle +++ b/linux/jre/redhat/build.gradle @@ -160,9 +160,7 @@ task checkJreRedHat(type: Test) { environment "testArch", "$arch" if (containerRegistry) { - ext { - containerRegistry = containerRegistry - } + environment "containerRegistry", "$containerRegistry" println "Container registry set to $containerRegistry" } diff --git a/linux/jre/redhat/src/packageTest/java/packaging/RedHatFlavoursWithDnf.java b/linux/jre/redhat/src/packageTest/java/packaging/RedHatFlavoursWithDnf.java index 5feee7af0..d6ae70a9d 100644 --- a/linux/jre/redhat/src/packageTest/java/packaging/RedHatFlavoursWithDnf.java +++ b/linux/jre/redhat/src/packageTest/java/packaging/RedHatFlavoursWithDnf.java @@ -42,11 +42,13 @@ public Stream provideArguments(ExtensionContext context) { * ubi7 does not have DNF pre-installed, ubi-minimal has microdnf * ubi8 has DNF installed */ - String containerRegistry = System.getProperty("containerRegistry", ""); - if (containerRegistry.isEmpty()) { + String containerRegistry = ""; + + if (System.getenv("containerRegistry") == null) { System.out.println("Using default container registry"); } else { + containerRegistry = System.getenv("containerRegistry"); System.out.println("Using container registry: " + containerRegistry); } diff --git a/linux/jre/redhat/src/packageTest/java/packaging/RedHatFlavoursWithYum.java b/linux/jre/redhat/src/packageTest/java/packaging/RedHatFlavoursWithYum.java index 228067c9e..084fa2f48 100644 --- a/linux/jre/redhat/src/packageTest/java/packaging/RedHatFlavoursWithYum.java +++ b/linux/jre/redhat/src/packageTest/java/packaging/RedHatFlavoursWithYum.java @@ -48,13 +48,14 @@ public Stream provideArguments(ExtensionContext context) { */ String redHatRegistry = "registry.access.redhat.com/"; - String containerRegistry = System.getProperty("containerRegistry", ""); + String containerRegistry = ""; - if (containerRegistry.isEmpty()) { + if (System.getenv("containerRegistry") == null) { System.out.println("Using default container registry"); } else { - System.out.println("Using container registry: " + containerRegistry); + containerRegistry = System.getenv("containerRegistry"); redHatRegistry = containerRegistry; + System.out.println("Using container registry: " + containerRegistry); } builder.add(Arguments.of(containerRegistry + "amazonlinux", "2")); diff --git a/linux/jre/suse/build.gradle b/linux/jre/suse/build.gradle index dbdc3c7cb..78e7b2de7 100644 --- a/linux/jre/suse/build.gradle +++ b/linux/jre/suse/build.gradle @@ -137,9 +137,7 @@ task checkJreSuse(type: Test) { environment "testArch", "$arch" if (containerRegistry) { - ext { - containerRegistry = containerRegistry - } + environment "containerRegistry", "$containerRegistry" println "Container registry set to $containerRegistry" } diff --git a/linux/jre/suse/src/packageTest/java/packaging/SuseFlavours.java b/linux/jre/suse/src/packageTest/java/packaging/SuseFlavours.java index ec781a896..6a2624d85 100644 --- a/linux/jre/suse/src/packageTest/java/packaging/SuseFlavours.java +++ b/linux/jre/suse/src/packageTest/java/packaging/SuseFlavours.java @@ -36,13 +36,14 @@ public Stream provideArguments(ExtensionContext context) { */ String suseRegistry = "registry.suse.com/"; - String containerRegistry = System.getProperty("containerRegistry", ""); + String containerRegistry = ""; - if (containerRegistry.isEmpty()) { + if (System.getenv("containerRegistry") == null) { System.out.println("Using default container registry"); } else { - System.out.println("Using container registry: " + containerRegistry); + containerRegistry = System.getenv("containerRegistry"); suseRegistry = containerRegistry; + System.out.println("Using container registry: " + containerRegistry); } return Stream.of(