Merge pull request #332 from jmtd/OPENJDK-1335-microdnf-update-weak-deps

[OPENJDK-1335] microdnf update weak deps

Author: jmtd

.github/workflows/ubi8-openjdk-11-runtime.yml

@@ -2,7 +2,7 @@ name: OpenJDK 11 Runtime Image CI
 on: [push, pull_request]
 env:
   LANG: en_US.UTF-8
-  CEKIT_VERSION: 3.11.0
+  CEKIT_VERSION: 4.5.0
   S2I_URI: https://github.com/openshift/source-to-image/releases/download/v1.3.1/source-to-image-v1.3.1-a5a77147-linux-amd64.tar.gz
 jobs:
   openjdkci:

.github/workflows/ubi8-openjdk-11.yml

@@ -2,7 +2,7 @@ name: OpenJDK 11 S2I Image CI
 on: [push, pull_request]
 env:
   LANG: en_US.UTF-8
-  CEKIT_VERSION: 3.6.0
+  CEKIT_VERSION: 4.5.0
   S2I_URI: https://github.com/openshift/source-to-image/releases/download/v1.3.1/source-to-image-v1.3.1-a5a77147-linux-amd64.tar.gz
 jobs:
   openjdkci:

.github/workflows/ubi8-openjdk-17-runtime.yml

@@ -2,7 +2,7 @@ name: OpenJDK 17 Runtime Image CI
 on: [push, pull_request]
 env:
   LANG: en_US.UTF-8
-  CEKIT_VERSION: 3.11.0
+  CEKIT_VERSION: 4.5.0
   S2I_URI: https://github.com/openshift/source-to-image/releases/download/v1.3.1/source-to-image-v1.3.1-a5a77147-linux-amd64.tar.gz
 jobs:
   openjdkci:

.github/workflows/ubi8-openjdk-17.yml

@@ -2,7 +2,7 @@ name: OpenJDK 17 S2I Image CI
 on: [push, pull_request]
 env:
   LANG: en_US.UTF-8
-  CEKIT_VERSION: 3.6.0
+  CEKIT_VERSION: 4.5.0
   S2I_URI: https://github.com/openshift/source-to-image/releases/download/v1.3.1/source-to-image-v1.3.1-a5a77147-linux-amd64.tar.gz
 jobs:
   openjdkci:

.github/workflows/ubi8-openjdk-8-runtime.yml

@@ -2,7 +2,7 @@ name: OpenJDK 8 Runtime Image CI
 on: [push, pull_request]
 env:
   LANG: en_US.UTF-8
-  CEKIT_VERSION: 3.11.0
+  CEKIT_VERSION: 4.5.0
   S2I_URI: https://github.com/openshift/source-to-image/releases/download/v1.3.1/source-to-image-v1.3.1-a5a77147-linux-amd64.tar.gz
 jobs:
   openjdkci:

.github/workflows/ubi8-openjdk-8.yml

@@ -2,7 +2,7 @@ name: OpenJDK 8 S2I Image CI
 on: [push, pull_request]
 env:
   LANG: en_US.UTF-8
-  CEKIT_VERSION: 3.6.0
+  CEKIT_VERSION: 4.5.0
   S2I_URI: https://github.com/openshift/source-to-image/releases/download/v1.3.1/source-to-image-v1.3.1-a5a77147-linux-amd64.tar.gz
 jobs:
   openjdkci:

modules/util/pkg-update/execute.sh

@@ -4,7 +4,7 @@ set -euo pipefail
 for candidate in yum dnf microdnf; do
     if command -v "$candidate"; then
         mgr="$(command -v "$candidate")"
-        "$mgr" update -y
+        "$mgr" update --setopt=install_weak_deps=0 --setopt=tsflags=nodocs -y
         "$mgr" -y clean all
         exit
     fi

tests/features/java/openjdk.feature

@@ -79,3 +79,18 @@ Feature: Miscellaneous OpenJDK-related unit tests
     | arg     | value                                  |
     | command | bash -c "$JAVA_HOME/bin/java -XshowSettings:properties -version" |
     Then available container log should contain file.encoding = UTF-8
+
+  @ubi8/openjdk-8
+  @ubi8/openjdk-11
+  @ubi8/openjdk-17
+  Scenario: Check that transitive weak dependencies are not installed (OPENJDK-1335)
+    When container is started with args
+    | arg     | value   |
+    | command | rpm -qa |
+    Then container log should not contain procps-ng
+    Then container log should not contain os-prober
+    Then container log should not contain which
+    Then container log should not contain systemd-pam
+    Then container log should not contain libpwquality
+    Then container log should not contain libxkbcommon
+    Then container log should not contain kbd