From 9bce83c10d4536ef78c0112302f8964358779df2 Mon Sep 17 00:00:00 2001
From: William Yang <mscame@gmail.com>
Date: Thu, 28 Apr 2022 16:11:12 +0200
Subject: [PATCH 1/2] ci(self-hosted): ct docker

---
 .github/workflows/run_test_cases.yaml | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/.github/workflows/run_test_cases.yaml b/.github/workflows/run_test_cases.yaml
index 98ae52b14..861828220 100644
--- a/.github/workflows/run_test_cases.yaml
+++ b/.github/workflows/run_test_cases.yaml
@@ -30,7 +30,6 @@ jobs:
         container: "ghcr.io/emqx/emqx-builder/5.0-10:${{ matrix.elixir }}-${{ matrix.otp }}-${{ matrix.os }}"
 
         steps:
-        - uses: AutoModality/action-clean@v1
         - uses: actions/checkout@v2
 
         - name: Get deps git refs for cache
@@ -67,7 +66,6 @@ jobs:
           run:
             shell: bash
         steps:
-        - uses: AutoModality/action-clean@v1
         - uses: actions/checkout@v2
         - name: find apps
           id: run_find_apps
@@ -87,13 +85,12 @@ jobs:
               - "erlang23"
               - "erlang24"
 
-        runs-on: ubuntu-20.04
+        runs-on: aws-amd64
         defaults:
           run:
             shell: bash
 
         steps:
-        - uses: AutoModality/action-clean@v1
         - uses: actions/checkout@v2
         - name: docker compose up
           env:
@@ -150,7 +147,6 @@ jobs:
             shell: bash
 
         steps:
-        - uses: AutoModality/action-clean@v1
         - uses: actions/checkout@v2
           # produces <app-name>.coverdata
         - name: run common test
@@ -186,7 +182,6 @@ jobs:
       runs-on: aws-amd64
       container: "ghcr.io/emqx/emqx-builder/5.0-10:${{ matrix.elixir }}-${{ matrix.otp }}-${{ matrix.os }}"
       steps:
-      - uses: AutoModality/action-clean@v1
       - uses: actions/checkout@v2
 
       - name: Get deps git refs for cache

From be375ae6219d4e47814964fbf4316c12363f3cd6 Mon Sep 17 00:00:00 2001
From: William Yang <mscame@gmail.com>
Date: Thu, 28 Apr 2022 18:01:12 +0200
Subject: [PATCH 2/2] ci: use docker image cache in aws

---
 .github/workflows/run_test_cases.yaml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/run_test_cases.yaml b/.github/workflows/run_test_cases.yaml
index 861828220..b4c7d1ff6 100644
--- a/.github/workflows/run_test_cases.yaml
+++ b/.github/workflows/run_test_cases.yaml
@@ -27,7 +27,7 @@ jobs:
               - amd64
 
         runs-on: aws-amd64
-        container: "ghcr.io/emqx/emqx-builder/5.0-10:${{ matrix.elixir }}-${{ matrix.otp }}-${{ matrix.os }}"
+        container: "emqx/emqx-builder/5.0-10:${{ matrix.elixir }}-${{ matrix.otp }}-${{ matrix.os }}"
 
         steps:
         - uses: actions/checkout@v2
@@ -58,7 +58,7 @@ jobs:
 
     find_apps:
         runs-on: aws-amd64
-        container: ghcr.io/emqx/emqx-builder/5.0-10:1.13.3-24.2.1-1-ubuntu20.04
+        container: emqx/emqx-builder/5.0-10:1.13.3-24.2.1-1-ubuntu20.04
         outputs:
           fast_ct_apps: ${{ steps.run_find_apps.outputs.fast_ct_apps }}
           docker_ct_apps: ${{ steps.run_find_apps.outputs.docker_ct_apps }}
@@ -141,7 +141,7 @@ jobs:
             arch:
               - amd64
         runs-on: aws-amd64
-        container: "ghcr.io/emqx/emqx-builder/5.0-10:${{ matrix.elixir }}-${{ matrix.otp }}-${{ matrix.os }}"
+        container: "emqx/emqx-builder/5.0-10:${{ matrix.elixir }}-${{ matrix.otp }}-${{ matrix.os }}"
         defaults:
           run:
             shell: bash
@@ -180,7 +180,7 @@ jobs:
             - amd64
 
       runs-on: aws-amd64
-      container: "ghcr.io/emqx/emqx-builder/5.0-10:${{ matrix.elixir }}-${{ matrix.otp }}-${{ matrix.os }}"
+      container: "emqx/emqx-builder/5.0-10:${{ matrix.elixir }}-${{ matrix.otp }}-${{ matrix.os }}"
       steps:
       - uses: actions/checkout@v2