build: perform validation on all base images for PRs (#1610)

2026-03-12 09:41:24 +00:00 · 2022-07-20 20:24:05 -05:00
parent a0a046f9f6
commit eb22d4cadc
22 changed files with 110 additions and 108 deletions
--- a/tests/setuponlytests/conflicting_world_for_vanilla_server/docker-compose.yml
+++ b/tests/setuponlytests/conflicting_world_for_vanilla_server/docker-compose.yml
@@ -7,8 +7,13 @@ services:
    environment:
      EULA: "TRUE"
      SETUP_ONLY: "TRUE"
-      VERSION: ${MINECRAFT_VERSION:-LATEST}
      WORLD: /worlds/world-for-testing.zip
+      # the following are only used to speed up test execution
+      TYPE: CUSTOM
+      CUSTOM_SERVER: /servers/fake.jar
+      VERSION: 1.18.1
    volumes:
      - ./worlds:/worlds:ro
      - ./data:/data
+      # the following are only used to speed up test execution
+      - ./verify.sh:/servers/fake.jar
--- a/tests/setuponlytests/forgeapimods_file/docker-compose.yml
+++ b/tests/setuponlytests/forgeapimods_file/docker-compose.yml
@@ -15,7 +15,7 @@ services:
      CUSTOM_SERVER: /servers/fake.jar
      VERSION: 1.18.2
      MODS_FORGEAPI_FILE: /config/forgeapi_mods.json
-      # Key is defined in .github/workflows/pr.yml and ci.yml
+      # Key is passed by Github Workflow
      # This should be coming from github secrets.
      MODS_FORGEAPI_KEY: ${MODS_FORGEAPI_KEY}
      REMOVE_OLD_FORGEAPI_MODS: "TRUE"
--- a/tests/setuponlytests/generic-packs-prefix/docker-compose.yml
+++ b/tests/setuponlytests/generic-packs-prefix/docker-compose.yml
@@ -10,6 +10,12 @@ services:
      GENERIC_PACKS_PREFIX: /packs/
      GENERIC_PACKS_SUFFIX: .zip
      DEBUG: "true"
+      # the following are only used to speed up test execution
+      TYPE: CUSTOM
+      CUSTOM_SERVER: /servers/fake.jar
+      VERSION: 1.18.1
    volumes:
      - ./packs:/packs
      - ./data:/data
+      # the following are only used to speed up test execution
+      - ./verify.sh:/servers/fake.jar
--- a/tests/setuponlytests/ops_from_scratch/docker-compose.yml
+++ b/tests/setuponlytests/ops_from_scratch/docker-compose.yml
@@ -7,7 +7,12 @@ services:
    environment:
      EULA: "TRUE"
      SETUP_ONLY: "TRUE"
-      VERSION: ${MINECRAFT_VERSION:-LATEST}
      OPS: itzg
+      # the following are only used to speed up test execution
+      TYPE: CUSTOM
+      CUSTOM_SERVER: /servers/fake.jar
+      VERSION: 1.18.1
    volumes:
      - ./data:/data
+      # the following are only used to speed up test execution
+      - ./verify.sh:/servers/fake.jar
--- a/tests/setuponlytests/spiget/docker-compose.yml
+++ b/tests/setuponlytests/spiget/docker-compose.yml
@@ -8,6 +8,8 @@ services:
      EULA: "TRUE"
      SETUP_ONLY: "TRUE"
      TYPE: PAPER
+      # jar doesn't need to exist for setuponly tests
+      PAPER_CUSTOM_JAR: /servers/fake.jar
      SPIGET_RESOURCES: "34315,3836,6245,2124"
    volumes:
      - ./data:/data
--- a/tests/setuponlytests/spigot_world_for_spigot_server/docker-compose.yml
+++ b/tests/setuponlytests/spigot_world_for_spigot_server/docker-compose.yml
@@ -7,9 +7,11 @@ services:
    environment:
      EULA: "TRUE"
      SETUP_ONLY: "TRUE"
-      VERSION: ${MINECRAFT_VERSION:-LATEST}
      TYPE: "PAPER"
      WORLD: /worlds/world-for-testing.zip
+      # the following are only used to speed up test execution
+      VERSION: 1.18.1
+      PAPER_CUSTOM_JAR: /servers/fake.jar
    volumes:
      - ./worlds:/worlds:ro
      - ./data:/data
--- a/tests/setuponlytests/spigot_world_for_vanilla_server/docker-compose.yml
+++ b/tests/setuponlytests/spigot_world_for_vanilla_server/docker-compose.yml
@@ -7,8 +7,13 @@ services:
    environment:
      EULA: "TRUE"
      SETUP_ONLY: "TRUE"
-      VERSION: ${MINECRAFT_VERSION:-LATEST}
      WORLD: /worlds/world-for-testing.zip
+      # the following are only used to speed up test execution
+      TYPE: CUSTOM
+      CUSTOM_SERVER: /servers/fake.jar
+      VERSION: 1.18.1
    volumes:
      - ./worlds:/worlds:ro
      - ./data:/data
+      # the following are only used to speed up test execution
+      - ./verify.sh:/servers/fake.jar
--- a/tests/setuponlytests/vanilla_world_for_spigot_server/docker-compose.yml
+++ b/tests/setuponlytests/vanilla_world_for_spigot_server/docker-compose.yml
@@ -7,9 +7,11 @@ services:
    environment:
      EULA: "TRUE"
      SETUP_ONLY: "TRUE"
-      VERSION: ${MINECRAFT_VERSION:-LATEST}
      TYPE: "PAPER"
      WORLD: /worlds/world-for-testing.zip
+      # the following are only used to speed up test execution
+      VERSION: 1.18.1
+      PAPER_CUSTOM_JAR: /servers/fake.jar
    volumes:
      - ./worlds:/worlds:ro
      - ./data:/data
--- a/tests/setuponlytests/vanilla_world_for_vanilla_server/docker-compose.yml
+++ b/tests/setuponlytests/vanilla_world_for_vanilla_server/docker-compose.yml
@@ -7,8 +7,13 @@ services:
    environment:
      EULA: "TRUE"
      SETUP_ONLY: "TRUE"
-      VERSION: ${MINECRAFT_VERSION:-LATEST}
      WORLD: /worlds/world-for-testing.zip
+      # the following are only used to speed up test execution
+      TYPE: CUSTOM
+      CUSTOM_SERVER: /servers/fake.jar
+      VERSION: 1.18.1
    volumes:
      - ./worlds:/worlds:ro
      - ./data:/data
+      # the following are only used to speed up test execution
+      - ./verify.sh:/servers/fake.jar
--- a/tests/setuponlytests/vanillatweaks_file/docker-compose.yml
+++ b/tests/setuponlytests/vanillatweaks_file/docker-compose.yml
@@ -5,14 +5,17 @@ services:
    restart: "no"
    image: ${IMAGE_TO_TEST:-itzg/minecraft-server}
    environment:
+      VANILLATWEAKS_FILE: /config/vt-datapacks.json,/config/vt-craftingtweaks.json,/config/vt-resourcepacks.json
      EULA: "TRUE"
      SETUP_ONLY: "TRUE"
+      # the following are only used to speed up test execution
+      TYPE: CUSTOM
      CUSTOM_SERVER: /servers/fake.jar
-      VANILLATWEAKS_FILE: /config/vt-datapacks.json,/config/vt-craftingtweaks.json,/config/vt-resourcepacks.json
-      REMOVE_OLD_VANILLATWEAKS: "FALSE"
+      VERSION: 1.18.1
    volumes:
      - ./data:/data
      - ./vt-datapacks.json:/config/vt-datapacks.json:ro
      - ./vt-craftingtweaks.json:/config/vt-craftingtweaks.json:ro
      - ./vt-resourcepacks.json:/config/vt-resourcepacks.json:ro
-      - ./fake.jar:/servers/fake.jar
+      # the following are only used to speed up test execution
+      - ./verify.sh:/servers/fake.jar
--- a/tests/setuponlytests/vanillatweaks_file/fake.jar
+++ b/tests/setuponlytests/vanillatweaks_file/fake.jar
--- a/tests/setuponlytests/vanillatweaks_sharecode/docker-compose.yml
+++ b/tests/setuponlytests/vanillatweaks_sharecode/docker-compose.yml
@@ -5,10 +5,14 @@ services:
    restart: "no"
    image: ${IMAGE_TO_TEST:-itzg/minecraft-server}
    environment:
+      VANILLATWEAKS_SHARECODE: MGr52E,tF1zL2,LnEDwT
      EULA: "TRUE"
      SETUP_ONLY: "TRUE"
+      # the following are only used to speed up test execution
+      TYPE: CUSTOM
      CUSTOM_SERVER: /servers/fake.jar
-      VANILLATWEAKS_SHARECODE: MGr52E,tF1zL2,LnEDwT
+      VERSION: 1.18.1
    volumes:
      - ./data:/data
-      - ./fake.jar:/servers/fake.jar
+      # the following are only used to speed up test execution
+      - ./verify.sh:/servers/fake.jar
--- a/tests/setuponlytests/vanillatweaks_sharecode/fake.jar
+++ b/tests/setuponlytests/vanillatweaks_sharecode/fake.jar
--- a/tests/setuponlytests/whitelist_from_scratch/docker-compose.yml
+++ b/tests/setuponlytests/whitelist_from_scratch/docker-compose.yml
@@ -7,9 +7,14 @@ services:
    environment:
      EULA: "TRUE"
      SETUP_ONLY: "TRUE"
-      VERSION: ${MINECRAFT_VERSION:-LATEST}
      WHITELIST: itzg
      ENFORCE_WHITELIST: "true"
      OVERRIDE_SERVER_PROPERTIES: "true"
+      # the following are only used to speed up test execution
+      TYPE: CUSTOM
+      CUSTOM_SERVER: /servers/fake.jar
+      VERSION: 1.18.1
    volumes:
      - ./data:/data
+      # the following are only used to speed up test execution
+      - ./verify.sh:/servers/fake.jar
--- a/tests/setuponlytests/world_from_tar/docker-compose.yml
+++ b/tests/setuponlytests/world_from_tar/docker-compose.yml
@@ -7,8 +7,13 @@ services:
    environment:
      EULA: "TRUE"
      SETUP_ONLY: "TRUE"
-      VERSION: ${MINECRAFT_VERSION:-LATEST}
      WORLD: /worlds/world-for-testing.tar
+      # the following are only used to speed up test execution
+      TYPE: CUSTOM
+      CUSTOM_SERVER: /servers/fake.jar
+      VERSION: 1.18.1
    volumes:
      - ./worlds:/worlds:ro
      - ./data:/data
+      # the following are only used to speed up test execution
+      - ./verify.sh:/servers/fake.jar