Fix tests

carlossg · Feb 8, 2024 · 0f2f0e5 · 0f2f0e5
1 parent 9f905c1
commit 0f2f0e5
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 8 deletions.
diff --git a/README.md b/README.md
@@ -54,6 +54,10 @@ See Docker Hub or GitHub Container Registry for an updated list of tags
 * [sapmachine-11](https://github.com/carlossg/docker-maven/blob/main/sapmachine-11/)
 * [sapmachine-17](https://github.com/carlossg/docker-maven/blob/main/sapmachine-17/)
 * [sapmachine-21](https://github.com/carlossg/docker-maven/blob/main/sapmachine-21/)
+* [graalvm-community-17](https://github.com/carlossg/docker-maven/blob/main/graalvm-community-17/)
+* [graalvm-community-21](https://github.com/carlossg/docker-maven/blob/main/graalvm-community-21/)
+* [oracle-graalvm-17](https://github.com/carlossg/docker-maven/blob/main/oracle-graalvm-17/)
+* [oracle-graalvm-21](https://github.com/carlossg/docker-maven/blob/main/oracle-graalvm-21/)
 
 Only under `csanchez/maven` and `ghcr.io/carlossg/maven`:
 * [azulzulu-8](https://github.com/carlossg/docker-maven/blob/main/azulzulu-8/Dockerfile)
@@ -251,8 +255,8 @@ Some come from the parent images and some are installed in this image for backwa
 | microsoft-openjdk-11-ubuntu   | ✔️   | ✔️    | ✔️   | ✔️    | ✔️     | ✔️    | ✔️      | ✔️   |     |
 | microsoft-openjdk-17-ubuntu   | ✔️   | ✔️    | ✔️   | ✔️    | ✔️     | ✔️    | ✔️      | ✔️   |     |
 | microsoft-openjdk-21-ubuntu   | ✔️   | ✔️    | ✔️   | ✔️    | ✔️     | ✔️    | ✔️      | ✔️   |     |
-| oracle-graalvm-17             |     | ✔️    | ✔️   | ✔️    | ✔️     | ✔️    |        | ✔️   |     |
-| oracle-graalvm-21             |     | ✔️    | ✔️   | ✔️    | ✔️     | ✔️    |        | ✔️   |     |
+| oracle-graalvm-17             |     | ✔️    | ✔️   | ✔️    |       | ✔️    |        | ✔️   |     |
+| oracle-graalvm-21             |     | ✔️    | ✔️   | ✔️    |       | ✔️    |        | ✔️   |     |
 | sapmachine-11                 | ✔️   | ✔️    | ✔️   | ✔️    | ✔️     | ✔️    | ✔️      |     |     |
 | sapmachine-17                 | ✔️   | ✔️    | ✔️   | ✔️    | ✔️     | ✔️    | ✔️      |     |     |
 | sapmachine-21                 | ✔️   | ✔️    | ✔️   | ✔️    | ✔️     | ✔️    | ✔️      |     |     |

diff --git a/oracle-graalvm-17/Dockerfile b/oracle-graalvm-17/Dockerfile
@@ -1,6 +1,6 @@
 FROM container-registry.oracle.com/graalvm/native-image:17
 
-RUN microdnf --refresh -y install findutils which
+RUN microdnf --refresh -y install findutils
 
 # common for all images
 ENV MAVEN_HOME /usr/share/maven

diff --git a/oracle-graalvm-21/Dockerfile b/oracle-graalvm-21/Dockerfile
@@ -1,6 +1,6 @@
 FROM container-registry.oracle.com/graalvm/native-image:21
 
-RUN microdnf --refresh -y install findutils which
+RUN microdnf --refresh -y install findutils
 
 # common for all images
 ENV MAVEN_HOME /usr/share/maven

diff --git a/tests/tests.bats b/tests/tests.bats
@@ -83,7 +83,8 @@ base_image=eclipse-temurin-11
 			[[ "$SUT_TAG" == "amazoncorretto-"* ]] ||
 			[[ "$SUT_TAG" == "azulzulu-"* ]] ||
 			[[ "$SUT_TAG" == "ibmjava-"* ]] ||
-			[[ "$SUT_TAG" == "libericaopenjdk-"* ]]
+			[[ "$SUT_TAG" == "libericaopenjdk-"* ]] ||
+			[[ "$SUT_TAG" == *"graalvm"* ]]
 	); then
 		[ $status -eq 0 ]
 	else
@@ -116,7 +117,8 @@ base_image=eclipse-temurin-11
 	if ! (
 		[[ "$SUT_TAG" == libericaopenjdk-? ]] ||
 			[[ "$SUT_TAG" == libericaopenjdk-?? ]] ||
-			[[ "$SUT_TAG" == openjdk-?? ]]
+			[[ "$SUT_TAG" == openjdk-?? ]] ||
+			[[ "$SUT_TAG" == *"oracle"* ]]
 	); then
 		[ $status -eq 0 ]
 	else
@@ -134,7 +136,9 @@ base_image=eclipse-temurin-11
 	if ! (
 		[[ "$SUT_TAG" == "amazoncorretto-"* ]] ||
 			[[ "$SUT_TAG" == libericaopenjdk-*-debian ]] ||
-			[[ "$SUT_TAG" == openjdk-?? ]]
+			[[ "$SUT_TAG" == openjdk-?? ]] ||
+			[[ "$SUT_TAG" == *"graalvm"* ]]
+
 	); then
 		[ $status -eq 0 ]
 
@@ -151,7 +155,8 @@ base_image=eclipse-temurin-11
 			[[ "$SUT_TAG" == amazoncorretto-*-al2023 ]] ||
 			[[ "$SUT_TAG" == libericaopenjdk-? ]] ||
 			[[ "$SUT_TAG" == libericaopenjdk-?? ]] ||
-			[[ "$SUT_TAG" == openjdk-?? ]]
+			[[ "$SUT_TAG" == openjdk-?? ]] ||
+			[[ "$SUT_TAG" == *"graalvm"* ]]
 	); then
 		[ $status -eq 0 ]
 	else