ci: use emqx-builder for otp 26

emqx · Dec 2, 2023 · 7d2f473 · 7d2f473
1 parent c1344b7
commit 7d2f473
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 7 deletions.
diff --git a/.github/workflows/build_packages.yaml b/.github/workflows/build_packages.yaml
@@ -19,6 +19,7 @@ jobs:
               builder:
                 - 5.0-26:1.13.4-24.3.4.2-1
                 - 5.1-4:1.14.5-25.3.2-2
+                - 5.2-7:1.15.7-26.1.2-1
               os:
                 - ubuntu20.04
                 - ubuntu18.04

diff --git a/.github/workflows/run_test_case.yaml b/.github/workflows/run_test_case.yaml
@@ -19,7 +19,7 @@ jobs:
                 docker_image:
                   - "ghcr.io/emqx/emqx-builder/5.0-26:1.13.4-24.3.4.2-1-ubuntu20.04"
                   - "ghcr.io/emqx/emqx-builder/5.1-4:1.14.5-25.3.2-2-ubuntu20.04"
-                  - "public.ecr.aws/docker/library/erlang:26"
+                  - "ghcr.io/emqx/emqx-builder/5.2-7:1.15.7-26.1.2-1-ubuntu20.04"
 
         steps:
         - name: Checkout
@@ -36,12 +36,7 @@ jobs:
             set -e
             docker build -t testimage --build-arg BUILD_FROM=${DOCKER_IMAGE} -f Dockerfile.test .
             docker network create --ipv6 --subnet 2001:0DB8::/112 testnet
-            # TODO: stable QUIC tests in OTP 26
-            if [[ "${DOCKER_IMAGE}" == *erlang:26* ]]; then
-              docker run -d --net testnet --name testcontainer -e BUILD_WITHOUT_QUIC=1 testimage bash -c "tail -f /dev/null"
-            else
-              docker run -d --net testnet --name testcontainer testimage bash -c "tail -f /dev/null"
-            fi
+            docker run -d --net testnet --name testcontainer testimage bash -c "tail -f /dev/null"
             docker exec testcontainer bash -c 'make eunit'
             docker exec testcontainer bash -c 'make ct'
             docker exec testcontainer bash -c 'make cover'