Fix issue to send container registry when testing

adoptium · Aug 2, 2024 · 6a85e4e · 6a85e4e
1 parent a3ba961
commit 6a85e4e
Show file tree

Hide file tree

Showing 20 changed files with 53 additions and 58 deletions.
diff --git 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/...-certificates/debian/src/packageTest/java/org/adoptium/cacertificates/DebianFlavours.java b/...-certificates/debian/src/packageTest/java/org/adoptium/cacertificates/DebianFlavours.java
@@ -35,11 +35,12 @@ public Stream<? extends Arguments> 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
@@ -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
@@ -33,11 +33,12 @@ public Stream<? extends Arguments> 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
@@ -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
@@ -36,13 +36,14 @@ public Stream<? extends Arguments> 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
@@ -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
@@ -43,11 +43,12 @@ public Stream<? extends Arguments> 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
@@ -48,13 +48,14 @@ public Stream<? extends Arguments> 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
@@ -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
@@ -36,13 +36,14 @@ public Stream<? extends Arguments> 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
@@ -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
@@ -33,11 +33,12 @@ public Stream<? extends Arguments> 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
@@ -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
@@ -36,11 +36,12 @@ public Stream<? extends Arguments> 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
@@ -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
@@ -42,11 +42,13 @@ public Stream<? extends Arguments> 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
@@ -48,13 +48,14 @@ public Stream<? extends Arguments> 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
@@ -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
@@ -36,13 +36,14 @@ public Stream<? extends Arguments> 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(