ci: Clean up and improve Java testing

This patch changes top-level OpenJ9 filename and data references to Java
to make them generic and launches tests against both HotSpot and OpenJ9
JVMs.

Signed-off-by: Younes Manton <ymanton@ca.ibm.com>

.github/workflows/java-test.yml

@@ -1,4 +1,4 @@
-name: OpenJ9 Test
+name: Java Test
 
 on: [push, pull_request]
 
@@ -7,5 +7,5 @@ jobs:
     runs-on: ubuntu-20.04
     steps:
     - uses: actions/checkout@v2
-    - name: Run OpenJ9 Test
+    - name: Run Java Test
-      run: sudo make -C scripts/ci openj9-test
+      run: sudo make -C scripts/ci java-test

scripts/ci/Makefile

@@ -85,8 +85,8 @@ podman-test:
 # overlayfs behaves differently on Ubuntu and breaks CRIU
 # https://bugs.launchpad.net/ubuntu/+source/linux/+bug/1857257
 # Switch to devicemapper
-openj9-test: restart-docker
+java-test: restart-docker
-	./openj9-test.sh
+	./java-test.sh
 
 setup-vagrant:
 	./vagrant.sh setup

scripts/ci/java-test.sh

@@ -0,0 +1,25 @@
+#!/bin/bash
+
+cd ../.. || exit 1
+
+failures=""
+
+docker build -t criu-openj9-ubuntu-test:latest -f scripts/build/Dockerfile.openj9-ubuntu .
+if ! docker run --rm --privileged criu-openj9-ubuntu-test:latest; then
+	failures="$failures openj9-ubuntu"
+fi
+
+docker build -t criu-hotspot-alpine-test:latest -f scripts/build/Dockerfile.hotspot-alpine .
+if ! docker run --rm --privileged criu-hotspot-alpine-test:latest; then
+	failures="$failures hotspot-alpine"
+fi
+
+docker build -t criu-hotspot-ubuntu-test:latest -f scripts/build/Dockerfile.hotspot-ubuntu .
+if ! docker run --rm --privileged criu-hotspot-ubuntu-test:latest; then
+	failures="$failures hotspot-ubuntu"
+fi
+
+if [ -n "$failures" ]; then
+	echo "Tests failed on $failures"
+	exit 1
+fi

scripts/ci/openj9-test.sh

@@ -1,20 +0,0 @@
-#!/bin/bash
-
-cd ../.. || exit 1
-
-failures=""
-
-docker build -t criu-openj9-ubuntu-test:latest -f scripts/build/Dockerfile.openj9-ubuntu .
-if ! docker run --rm --privileged criu-openj9-ubuntu-test:latest; then
-	failures="$failures ubuntu"
-fi
-
-docker build -t criu-openj9-alpine-test:latest -f scripts/build/Dockerfile.openj9-alpine .
-if ! docker run --rm --privileged criu-openj9-alpine-test:latest; then
-	failures="$failures alpine"
-fi
-
-if [ -n "$failures" ]; then
-	echo "Tests failed on $failures"
-	exit 1
-fi