fix: r

Signed-off-by: Ashing Zheng <[email protected]>

Author: ronething

.github/workflows/apisix-e2e-test.yml

@@ -88,7 +88,8 @@ jobs:
 
       - name: Loading Docker Image to Kind Cluster
         run: |
-          make kind-load-images
+          make kind-load-adc-image
+          make kind-load-ingress-image
 
       - name: Install Gateway API And CRDs
         run: |

.github/workflows/conformance-test.yml

@@ -30,15 +30,16 @@ concurrency:
   cancel-in-progress: true
 
 jobs:
-  prepare:
-    name: Prepare
+  conformance-test:
+    timeout-minutes: 60
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
         uses: actions/checkout@v4
+        with:
+          submodules: recursive
 
       - name: Setup Go Env
-        id: go
         uses: actions/setup-go@v4
         with:
           go-version: "1.23"
@@ -53,21 +54,6 @@ jobs:
           chmod 700 get_helm.sh
           ./get_helm.sh
 
-  conformance-test:
-    timeout-minutes: 60
-    needs: 
-      - prepare
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v4
-        with:
-          submodules: recursive
-
-      - name: Setup Go Env
-        uses: actions/setup-go@v4
-        with:
-          go-version: "1.23"
       - name: Login to Registry
         uses: docker/login-action@v3
         with:

.github/workflows/e2e-test-k8s.yml

@@ -86,15 +86,6 @@ jobs:
           echo "building images..."
           make build-image
 
-      - name: Extract adc binary
-        run: |
-          echo "Extracting adc binary..."
-          docker create --name adc-temp api7/api7-ingress-controller:dev
-          docker cp adc-temp:/bin/adc /usr/local/bin/adc
-          docker rm adc-temp
-          chmod +x /usr/local/bin/adc
-          echo "ADC binary extracted to /usr/local/bin/adc"
-
       - name: Install v2 CRDs
         run: |
           make install-crds-nocel
@@ -107,6 +98,15 @@ jobs:
         run: |
           make kind-load-images
 
+      - name: Extract adc binary
+        if: ${{ env.ADC_VERSION == 'dev' }}
+        run: |
+          docker create --name adc-temp ghcr.io/api7/adc:dev
+          docker cp adc-temp:main.js adc.js
+          docker rm adc-temp
+          node $(pwd)/adc.js -v
+          echo "ADC_BIN=node $(pwd)/adc.js" >> $GITHUB_ENV
+
       - name: Run E2E test suite
         shell: bash
         env:

.github/workflows/e2e-test.yml

@@ -81,15 +81,6 @@ jobs:
           echo "building images..."
           make build-image
 
-      - name: Extract adc binary
-        run: |
-          echo "Extracting adc binary..."
-          docker create --name adc-temp api7/api7-ingress-controller:dev
-          docker cp adc-temp:/bin/adc /usr/local/bin/adc
-          docker rm adc-temp
-          chmod +x /usr/local/bin/adc
-          echo "ADC binary extracted to /usr/local/bin/adc"
-
       - name: Launch Kind Cluster
         run: |
           make kind-up
@@ -106,6 +97,15 @@ jobs:
         run: |
           make kind-load-images
 
+      - name: Extract adc binary
+        if: ${{ env.ADC_VERSION == 'dev' }}
+        run: |
+          docker create --name adc-temp ghcr.io/api7/adc:dev
+          docker cp adc-temp:main.js adc.js
+          docker rm adc-temp
+          node $(pwd)/adc.js -v
+          echo "ADC_BIN=node $(pwd)/adc.js" >> $GITHUB_ENV
+
       - name: Run E2E test suite
         shell: bash
         env:

Makefile

@@ -184,13 +184,12 @@ kind-down:
 		|| echo "kind cluster does not exist"
 
 .PHONY: kind-load-images
-kind-load-images: pull-infra-images kind-load-ingress-image
+kind-load-images: pull-infra-images kind-load-ingress-image kind-load-adc-image
 	@kind load docker-image hkccr.ccs.tencentyun.com/api7-dev/api7-ee-3-gateway:dev --name $(KIND_NAME)
 	@kind load docker-image hkccr.ccs.tencentyun.com/api7-dev/api7-ee-dp-manager:$(DASHBOARD_VERSION)  --name $(KIND_NAME)
 	@kind load docker-image hkccr.ccs.tencentyun.com/api7-dev/api7-ee-3-integrated:$(DASHBOARD_VERSION)  --name $(KIND_NAME)
 	@kind load docker-image kennethreitz/httpbin:latest --name $(KIND_NAME)
 	@kind load docker-image jmalloc/echo-server:latest --name $(KIND_NAME)
-	@kind load docker-image ghcr.io/api7/adc:dev --name $(KIND_NAME)
 	@kind load docker-image apache/apisix:dev --name $(KIND_NAME)
 
 .PHONY: kind-load-gateway-image