Update Defold version used in tests. Add new config for frontend-app-…

…test instance.
defold · Nov 4, 2024 · c2852c7 · c2852c7
1 parent f94b57e
commit c2852c7
Show file tree

Hide file tree

Showing 3 changed files with 34 additions and 105 deletions.
diff --git a/server/configs/application-test-app.yml b/server/configs/application-test-app.yml
@@ -0,0 +1,31 @@
+extender:
+    remote-builder:
+        enabled: true
+        platforms:
+            android-ndk25:
+                url: http://android-ndk25:9000
+                instanceId: android-ndk25
+                alwaysOn: true
+            emsdk-3155:
+                url: http://emsdk-3155:9000
+                instanceId: emsdk-3155
+            emsdk-3165:
+                url: http://emsdk-3165:9000
+                instanceId: emsdk-3165
+            linux-latest:
+                url: http://linux:9000
+                instanceId: linux
+            nssdk-1832:
+                url: http://10.0.0.4:9000
+                instanceId: nssdk-1832
+            ps4-12000:
+                url: http://ps4-12000:9000
+                instanceId: ps4-12000
+            ps5-10000:
+                url: http://ps5-10000:9000
+                instanceId: ps5-10000
+            winsdk-2022:
+                url: http://winsdk-2022:9000
+                instanceId: winsdk-2022
+
+logging.pattern.level: "%5p [${spring.application.name:},%X{traceId:-},%X{spanId:-}]"
diff --git a/server/docker/docker-compose.yml b/server/docker/docker-compose.yml
@@ -55,34 +55,6 @@ services:
       default:
         aliases:
           - android-ndk25
-  emscripten_2011-dev:
-    image: europe-west1-docker.pkg.dev/extender-426409/extender-public-registry/extender-emsdk-2011-env:latest
-    environment:
-      - INSTANCE_ID=emsdk-2011-local
-    extends:
-      file: common-services.yml
-      service: remote_builder
-    profiles:
-      - all
-      - web
-    networks:
-      default:
-        aliases:
-          - emsdk-2011
-  emscripten_3155-dev:
-    image: europe-west1-docker.pkg.dev/extender-426409/extender-public-registry/extender-emsdk-3155-env:latest
-    extends:
-      file: common-services.yml
-      service: remote_builder
-    environment:
-      - INSTANCE_ID=emsdk-3155-local
-    profiles:
-      - all
-      - web
-    networks:
-      default:
-        aliases:
-          - emsdk-3155
   emscripten_3165-dev:
     image: europe-west1-docker.pkg.dev/extender-426409/extender-public-registry/extender-emsdk-3165-env:latest
     extends:
@@ -97,21 +69,6 @@ services:
       default:
         aliases:
           - emsdk-3165
-  nssdk_1753-dev:
-    image: europe-west1-docker.pkg.dev/extender-426409/extender-nintendo-private-registry/extender-nssdk-1753-env:latest
-    extends:
-      file: common-services.yml
-      service: remote_builder
-    environment:
-      - INSTANCE_ID=nssdk-1753-local
-    profiles:
-      - all
-      - consoles
-      - nintendo
-    networks:
-      default:
-        aliases:
-          - nssdk-1753
   nssdk_1832-dev:
     image: europe-west1-docker.pkg.dev/extender-426409/extender-nintendo-private-registry/extender-nssdk-1832-env:latest
     extends:
@@ -142,36 +99,6 @@ services:
       default:
         aliases:
           - ps4-12000
-  ps4_11000-dev:
-    image: europe-west1-docker.pkg.dev/extender-426409/extender-ps4-private-registry/extender-ps4-11000-env:latest
-    extends:
-      file: common-services.yml
-      service: remote_builder
-    environment:
-      - INSTANCE_ID=ps4-11000-local
-    profiles:
-      - all
-      - consoles
-      - playstation
-    networks:
-      default:
-        aliases:
-          - ps4-11000
-  ps5_9000-dev:
-    image: europe-west1-docker.pkg.dev/extender-426409/extender-ps5-private-registry/extender-ps5-9000-env:latest
-    extends:
-      file: common-services.yml
-      service: remote_builder
-    environment:
-      - INSTANCE_ID=ps5-9000-local
-    profiles:
-      - all
-      - consoles
-      - playstation
-    networks:
-      default:
-        aliases:
-          - ps5-9000
   ps5_10000-dev:
     image: europe-west1-docker.pkg.dev/extender-426409/extender-ps5-private-registry/extender-ps5-10000-env:latest
     extends:
@@ -208,7 +135,7 @@ services:
     extends:
       file: common-services.yml
       service: test_builder
-    command: ["--spring.config.location=classpath:./,file:/etc/defold/extender/", "--spring.profiles.active=local-dev-app"]
+    command: ["--spring.config.location=classpath:./,file:/etc/defold/extender/", "--spring.profiles.active=test-app"]
     expose:
       - "9000"
     ports:
@@ -244,17 +171,6 @@ services:
       default:
         aliases:
           - android-ndk25
-  emscripten_2011-integration-test:
-    image: europe-west1-docker.pkg.dev/extender-426409/extender-public-registry/extender-emsdk-2011-env:latest
-    extends:
-      file: common-services.yml
-      service: test_remote_builder
-    profiles:
-      - test
-    networks:
-      default:
-        aliases:
-          - emsdk-2011
   emscripten_3155-integration-test:
     image: europe-west1-docker.pkg.dev/extender-426409/extender-public-registry/extender-emsdk-3155-env:latest
     extends:
@@ -277,17 +193,6 @@ services:
       default:
         aliases:
           - emsdk-3165
-  win_2019-integration-test:
-    image: europe-west1-docker.pkg.dev/extender-426409/extender-public-registry/extender-winsdk-2019-env:latest
-    extends:
-      file: common-services.yml
-      service: test_remote_builder
-    profiles:
-      - test
-    networks:
-      default:
-        aliases:
-          - winsdk-2019
   win_2022-integration-test:
     image: europe-west1-docker.pkg.dev/extender-426409/extender-public-registry/extender-winsdk-2022-env:latest
     extends:

diff --git a/server/src/test/java/com/defold/extender/IntegrationTest.java b/server/src/test/java/com/defold/extender/IntegrationTest.java
@@ -113,21 +113,14 @@ public static Collection<TestConfiguration> data() {
                 // "a" is a made up sdk where we can more easily test build.yml fixes
                 // new DefoldVersion("a", new Version(0, 0, 0), new String[] {"armv7-android", "x86_64-win32"} ),
 
-                // // 2023-11-03 https://github.com/defold/defold/releases/tag/1.6.1
-                new DefoldVersion("a90c50928623cf23b3687a7eec05972d11427202", new Version(1, 6, 1), new String[] {"armv7-android", "x86_64-linux", "x86_64-win32", "js-web", "wasm-web"}),
-
-                // // ??????? https://github.com/defold/defold/releases/tag/1.6.2
-                new DefoldVersion("4e156b7cf37a380122aada30dacbf2b590ead76b", new Version(1, 6, 2), new String[] {"armv7-android", "x86_64-linux", "x86_64-win32", "js-web", "wasm-web"}),
-
-                // // 2024-03-11 https://github.com/defold/defold/releases/tag/1.7.0
-                new DefoldVersion("bf4dc66ab5fbbafd4294d32c2797c08b630c0be5", new Version(1, 7, 0), new String[] {"armv7-android", "x86_64-linux", "x86_64-win32", "js-web", "wasm-web"}),
-
                 // // ??????? https://github.com/defold/defold/releases/tag/1.8.0
                 new DefoldVersion("9141d9d3605e3f5d51c71293116d769da2613d39", new Version(1, 8, 0), new String[] {"armv7-android", "x86_64-linux", "x86_64-win32", "js-web", "wasm-web"}),
 
                 // // 2024-06-25 https://github.com/defold/defold/releases/tag/1.9.0
                 new DefoldVersion("d6882f432beca85d460ec42497888157c356d058", new Version(1, 9, 0), new String[] {"armv7-android", "x86_64-linux", "x86_64-win32", "js-web", "wasm-web"}),
 
+                // // 2024-10-29 https://github.com/defold/defold/releases/tag/1.9.4
+                new DefoldVersion("edfdbe31830c1f8aa4d96644569ae87a8ea32672", new Version(1, 9, 4), new String[] {"armv7-android", "x86_64-linux", "x86_64-win32", "js-web", "wasm-web"}),
                 // new DefoldVersion("e624625d90111ab8442e6b672b1335bb024b9885", new Version(1, 9, 0), new String[] {"armv7-android", "x86_64-linux", "x86_64-win32", "js-web", "wasm-web"}),
 
                 // Use test-data/createdebugsdk.sh to package your preferred platform sdk and it ends up in the sdk/debugsdk folder