ci: prefer ipv4 resolution for e2e tests

Agoric · Jun 13, 2024 · dca7c5a · dca7c5a
1 parent 55bdf51
commit dca7c5a
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 5 deletions.
diff --git a/.github/workflows/e2e_tests.yml b/.github/workflows/e2e_tests.yml
@@ -57,8 +57,8 @@ jobs:
           docker-compose -f tests/e2e/docker-compose.yml --profile $SYNPRESS_PROFILE  up --build --exit-code-from synpress
         env:
           # conditionals based on github event
-          SYNPRESS_PROFILE: ${{ 'true' == 'true' && 'daily-tests' || 'synpress' }}
-          CYPRESS_AGORIC_NET: ${{ 'true' == 'true' && 'emerynet' || 'local' }}
+          SYNPRESS_PROFILE: ${{ env.IS_EMERYNET_TEST == 'true' && 'daily-tests' || 'synpress' }}
+          CYPRESS_AGORIC_NET: ${{ env.IS_EMERYNET_TEST == 'true' && 'emerynet' || 'local' }}
           # for docker-compose.yml
           COMPOSE_DOCKER_CLI_BUILD: 1
           DOCKER_BUILDKIT: 1

diff --git a/Dockerfile b/Dockerfile
@@ -1,6 +1,9 @@
 # syntax=docker/dockerfile:1
 FROM --platform=linux/amd64 synthetixio/docker-e2e:18.16-ubuntu as base
 
+# Prefer IPv4 for DNS resolution
+ENV NODE_OPTIONS=--dns-result-order=ipv4first
+
 RUN mkdir /app
 WORKDIR /app
 

diff --git a/package.json b/package.json
@@ -12,7 +12,7 @@
     "test": "vitest",
     "coverage": "vitest run --coverage",
     "test:e2e": "EXTENSION=keplr SKIP_EXTENSION_SETUP=true synpress run --configFile=tests/e2e/synpress.config.cjs",
-    "test:e2e:ci": "yarn dev & sleep 10 && yarn test:e2e"
+    "test:e2e:ci": "start-server-and-test 'yarn dev' http-get://localhost:5173 'yarn test:e2e'"
   },
   "dependencies": {
     "react": "^18.2.0",

diff --git a/tests/e2e/docker-compose.yml b/tests/e2e/docker-compose.yml
@@ -48,7 +48,7 @@ services:
       - ./docker/videos:/app/tests/e2e/videos
       - ./docker/screenshots:/app/tests/e2e/screenshots
     command: >
-      bash -c 'pnpm wait-on http://display:8080 && echo -n "======> remote noVNC URL: " && curl -s ngrok:4040/api/tunnels | jq -r .tunnels[0].public_url && if [ "$CYPRESS_AGORIC_NET" == "local" ]; then nginx; fi && yarn test:e2e:ci'
+      bash -c 'echo -n "======> local noVNC URL: http://localhost:8080/vnc.html?autoconnect=true " && pnpm wait-on http://display:8080 && echo -n "======> remote noVNC URL: " && curl -s ngrok:4040/api/tunnels | jq -r .tunnels[0].public_url && if [ "$CYPRESS_AGORIC_NET" == "local" ]; then nginx; fi && yarn test:e2e:ci'
     networks:
       - x11
 
@@ -104,7 +104,7 @@ services:
     profiles:
       - synpress
     container_name: agoric_chain
-    image: ghcr.io/agoric/agoric-3-proposals:latest
+    image: ghcr.io/agoric/agoric-3-proposals:main
     logging:
       driver: none
     platform: linux/amd64