From f54e6052ba45dc6dd01fd58b3607e1cf03f8a1a7 Mon Sep 17 00:00:00 2001
From: Juan Ariza Toledano <jariza@vmware.com>
Date: Mon, 10 Feb 2025 11:38:49 +0100
Subject: [PATCH] [bitnami/java] tests: 1.8 branch shows version on stderr
 (#77134)

---
 .vib/java-min/goss/java-min.yaml | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/.vib/java-min/goss/java-min.yaml b/.vib/java-min/goss/java-min.yaml
index be033d87a9e5..2ff8da4b9739 100644
--- a/.vib/java-min/goss/java-min.yaml
+++ b/.vib/java-min/goss/java-min.yaml
@@ -2,19 +2,20 @@ command:
   check-java-version:
     exec:
     - java
-    {{- if regexMatch "^1.8.+" .Env.APP_VERSION }}
+  {{- if regexMatch "^1.8.+" .Env.APP_VERSION }}
     - -version
     exit-status: 0
-    # Replace "-" with "_" in the version string
-    stdout:
-    - {{ .Env.APP_VERSION | replace "-" "_" }}
-    {{- else }}
+    # APP_VERSION follows format 1.8.XXX-Y
+    # while stdout shows 1.8.0_XXX
+    stderr:
+      - /openjdk version "{{ (semver .Env.APP_VERSION).Major }}.{{ (semver .Env.APP_VERSION).Minor }}.*_{{ (semver .Env.APP_VERSION).Patch }}"/
+  {{- else }}
     - --version
     exit-status: 0
     # Replace "-" with "+" in the version string
     stdout:
     - {{ .Env.APP_VERSION | replace "-" "+" }}
-    {{- end }}
+  {{- end }}
   check-hello-world:
     exec:
     - java