more

Signed-off-by: Takeshi Yoneda <[email protected]>

Author: mathetake

.github/workflows/build_and_test.yaml

@@ -136,15 +136,13 @@ jobs:
   test_extproc:
     needs: changes
     if: ${{ needs.changes.outputs.code == 'true' }}
-    name: External Processor Test (Envoy v${{ matrix.version }} on ${{ matrix.os }})
+    name: External Processor Test (${{ matrix.os }})
     strategy:
       fail-fast: false
       matrix:
-        include:
-          - version: 1.36.0
-            os: ubuntu-latest
-          - version: 1.36.0
-            os: macos-latest
+        os:
+          - ubuntu-latest
+          - macos-latest
     runs-on: ${{ matrix.os }}
     steps:
       - uses: actions/checkout@v4
@@ -170,7 +168,7 @@ jobs:
           TEST_DEEPINFRA_API_KEY: ${{ secrets.ENVOY_AI_GATEWAY_DEEPINFRA_API_KEY }}
           TEST_GITHUB_ACCESS_TOKEN: ${{ secrets.GITHUB_TOKEN }}
           # This will be picked up by func-e to run the specified Envoy version.
-          ENVOY_VERSION: ${{ matrix.version }}
+          ENVOY_VERSION: 1.36.0
         run: make test-extproc
 
   test_e2e:

Makefile

@@ -155,8 +155,8 @@ test-crdcel: apigen ## Run the integration tests of CEL validation in CRD defini
 .PHONY: test-extproc # This requires the extproc binary to be built.
 test-extproc: build.extproc ## Run the integration tests for extproc without controller or k8s at all.
 	@$(MAKE) build.testupstream CMD_PATH_PREFIX=tests/internal/testupstreamlib
-	@echo "Ensure func-e is built for test-extproc"
-	@@$(GO_TOOL) func-e help >/dev/null 2>&1
+	@echo "Ensure func-e is built and Envoy is installed"
+	@@$(GO_TOOL) func-e run --help >/dev/null 2>&1
 	@echo "Run ExtProc test"
 	@EXTPROC_BIN=$(OUTPUT_DIR)/extproc-$(shell go env GOOS)-$(shell go env GOARCH) go test ./tests/extproc/... $(GO_TEST_E2E_ARGS)