Merge pull request #457 from jhuttana/ubi8-re-org-tests

[OPENJDK-2722] Create a dummy module.yaml to move openjdk.feature behave test to module/jdk/tests/features
jboss-container-images · Mar 13, 2024 · ce3472a · ce3472a
2 parents d167919 + 8f8db49
commit ce3472a
Show file tree

Hide file tree

Showing 10 changed files with 13 additions and 0 deletions.
diff --git a/modules/jdk/11/module.yaml b/modules/jdk/11/module.yaml
@@ -30,6 +30,7 @@ packages:
 modules:
  install:
  - name: jboss.container.user
+ - name: jboss.container.openjdk
 
 execute:
 - script: configure.sh
diff --git a/modules/jdk/17/module.yaml b/modules/jdk/17/module.yaml
@@ -29,6 +29,7 @@ packages:
 modules:
  install:
  - name: jboss.container.user
+ - name: jboss.container.openjdk
 
 execute:
 - script: configure.sh
diff --git a/modules/jdk/21/module.yaml b/modules/jdk/21/module.yaml
@@ -29,6 +29,7 @@ packages:
 modules:
  install:
  - name: jboss.container.user
+ - name: jboss.container.openjdk
 
 execute:
 - script: configure.sh
diff --git a/modules/jdk/8/module.yaml b/modules/jdk/8/module.yaml
@@ -29,6 +29,7 @@ packages:
 modules:
  install:
  - name: jboss.container.user
+ - name: jboss.container.openjdk
 
 execute:
 - script: configure.sh
diff --git a/modules/jdk/module.yaml b/modules/jdk/module.yaml
@@ -0,0 +1,5 @@
+schema_version: 1
+
+name: "jboss.container.openjdk"
+description: "A dummy descriptor to couple tests with jdk modules"
+version: "0"
diff --git a/tests/features/java/openjdk.feature → modules/jdk/tests/features/openjdk.feature b/tests/features/java/openjdk.feature → modules/jdk/tests/features/openjdk.feature
diff --git a/modules/jre/11/module.yaml b/modules/jre/11/module.yaml
@@ -30,6 +30,7 @@ packages:
 modules:
  install:
  - name: jboss.container.user
+ - name: jboss.container.openjdk
 
 execute:
 - script: configure.sh
diff --git a/modules/jre/17/module.yaml b/modules/jre/17/module.yaml
@@ -29,6 +29,7 @@ packages:
 modules:
  install:
  - name: jboss.container.user
+ - name: jboss.container.openjdk
 
 execute:
 - script: configure.sh
diff --git a/modules/jre/21/module.yaml b/modules/jre/21/module.yaml
@@ -29,6 +29,7 @@ packages:
 modules:
  install:
  - name: jboss.container.user
+ - name: jboss.container.openjdk
 
 execute:
 - script: configure.sh
diff --git a/modules/jre/8/module.yaml b/modules/jre/8/module.yaml
@@ -29,6 +29,7 @@ packages:
 modules:
  install:
  - name: jboss.container.user
+ - name: jboss.container.openjdk
 
 execute:
 - script: configure.sh