Merge pull request #427 from jmtd/OPENJDK-2587-tzdata-ubi8

[Openjdk-2587] reinstall tzdata rpm for  ubi8

Author: jmtd

modules/util/tzdata/execute.sh

@@ -0,0 +1,14 @@
+#!/bin/bash
+set -euo pipefail
+
+for candidate in yum dnf microdnf; do
+    if command -v "$candidate"; then
+        mgr="$(command -v "$candidate")"
+        "$mgr" reinstall tzdata -y && \
+            "$mgr" -y clean all
+        exit
+    fi
+done
+
+echo "cannot find a package manager" >&2
+exit 1

modules/util/tzdata/module.yaml

@@ -0,0 +1,7 @@
+schema_version: 1
+name: jboss.container.util.tzdata
+version: '1.0'
+description: Reinstall the tzdata package, to ensure zoneinfo is present
+
+execute:
+- script: execute.sh

tests/features/java/openjdk.feature

@@ -119,9 +119,16 @@ Feature: Miscellaneous OpenJDK-related unit tests
     Then container log should not contain libxkbcommon
     Then container log should not contain kbd
 
+  @ubi8
+  Scenario: Ensure tzdata RPM is properly installed (OPENJDK-2587)
+    When container is started with args
+    | arg     | value         |
+    | command | rpm -V tzdata |
+    Then available container log should not contain missing
+    
   @ubi8
   Scenario: Ensure tar is installed (OPENJDK-2588)
     When container is started with args
     | arg     | value |
     | command | tar   |
-    Then available container log should not contain command not found
+    Then available container log should not contain command not found

ubi8-openjdk-11-runtime.yaml

@@ -48,6 +48,7 @@ modules:
   - name: jboss.container.util.pkg-update
   - name: jboss.container.openjdk.jre
     version: "11"
+  - name: jboss.container.util.tzdata
   - name: jboss.container.tar
   - name: jboss.container.java.jre.run
 

ubi8-openjdk-11.yaml

@@ -56,6 +56,7 @@ modules:
     version: "3.8.11"
   - name: jboss.container.java.s2i.bash
   - name: jboss.container.util.pkg-update
+  - name: jboss.container.util.tzdata
   # required due to jolokia
   - name: jboss.container.java.singleton-jdk
 

ubi8-openjdk-17-runtime.yaml

@@ -48,6 +48,7 @@ modules:
   - name: jboss.container.util.pkg-update
   - name: jboss.container.openjdk.jre
     version: "17"
+  - name: jboss.container.util.tzdata
   - name: jboss.container.tar
   - name: jboss.container.java.jre.run
 

ubi8-openjdk-17.yaml

@@ -53,6 +53,7 @@ modules:
     version: "8.6.17"
   - name: jboss.container.maven
     version: "3.8.17"
+  - name: jboss.container.util.tzdata
   - name: jboss.container.java.s2i.bash
   - name: jboss.container.util.pkg-update
 

ubi8-openjdk-21-runtime.yaml

@@ -49,6 +49,7 @@ modules:
   - name: jboss.container.tar
   - name: jboss.container.openjdk.jre
     version: "21"
+  - name: jboss.container.util.tzdata
   - name: jboss.container.java.jre.run
 
 help:

ubi8-openjdk-21.yaml

@@ -52,6 +52,7 @@ modules:
     version: "21"
   - name: jboss.container.maven
     version: "3.8.17"
+  - name: jboss.container.util.tzdata
   - name: jboss.container.java.s2i.bash
   - name: jboss.container.java.singleton-jdk
 

ubi8-openjdk-8-runtime.yaml

@@ -50,6 +50,7 @@ modules:
   - name:  jboss.container.java.jre.run
   - name: jboss.container.tar
   - name: jboss.container.util.pkg-update
+  - name: jboss.container.util.tzdata
 
 help:
   add: true