diff --git a/tests/setuponlytests/pufferfish/docker-compose.yml b/tests/setuponlytests/pufferfish/docker-compose.yml index 2804253ecee..bad46b0d3ad 100644 --- a/tests/setuponlytests/pufferfish/docker-compose.yml +++ b/tests/setuponlytests/pufferfish/docker-compose.yml @@ -8,6 +8,7 @@ services: EULA: "TRUE" SETUP_ONLY: "TRUE" TYPE: PUFFERFISH - VERSION: ${MINECRAFT_VERSION:-LATEST} + VERSION: 1.18 + PUFFERFISH_BUILD: 50 volumes: - ./data:/data diff --git a/tests/setuponlytests/pufferfish/require.sh b/tests/setuponlytests/pufferfish/require.sh deleted file mode 100644 index 65b61c6c8dd..00000000000 --- a/tests/setuponlytests/pufferfish/require.sh +++ /dev/null @@ -1 +0,0 @@ -[[ $MINECRAFT_VERSION == LATEST ]] || exit 1 diff --git a/tests/setuponlytests/pufferfish/verify.sh b/tests/setuponlytests/pufferfish/verify.sh index 7b35f3729d5..197e8725d9c 100644 --- a/tests/setuponlytests/pufferfish/verify.sh +++ b/tests/setuponlytests/pufferfish/verify.sh @@ -1,3 +1 @@ -#!/bin/bash - -mc-image-helper assert fileExists "/data/pufferfish-*" +mc-image-helper assert fileExists "/data/pufferfish-*.jar" diff --git a/tests/setuponlytests/test.sh b/tests/setuponlytests/test.sh index ff80ad4cbf3..36ac6a473f0 100644 --- a/tests/setuponlytests/test.sh +++ b/tests/setuponlytests/test.sh @@ -37,11 +37,11 @@ setupOnlyMinecraftTest(){ result=1 elif [ -f verify.sh ]; then if ! docker run --rm --entrypoint bash -v "${PWD}/data":/data -v "${PWD}/verify.sh":/verify "${IMAGE_TO_TEST:-itzg/minecraft-server}" -e /verify; then - echo "${folder} verify FAILED" + echo "Verify ${folder} FAILED" outputContainerLog "$logs" result=1 else - echo "${folder} verify PASS" + echo "Verify ${folder} PASS" fi else echo "${folder} PASS"