Refactor e2e tests (#100)

Author: mathetake

.github/workflows/workflow.yaml

@@ -37,14 +37,16 @@ jobs:
       - name: checkout
         uses: actions/checkout@v2
 
-      - name: build examples
-        run: find ./examples -type f -name "main.go" | xargs -Ip tinygo build -o p.wasm -scheduler=none -target=wasi -wasm-abi=generic p
-
-      - name: upload wasm-binaries
-        uses: actions/upload-artifact@v2
+      - name: cache built examples
+        uses: actions/cache@v2
+        id: cache-built-examples
         with:
-          name: wasm-binaries
           path: examples
+          key: ${{ hashFiles('examples/**', 'proxywasm/**') }}
+
+      - name: build examples
+        if: steps.cache-built-examples.outputs.cache-hit != 'true'
+        run: find ./examples -type f -name "main.go" | xargs -Ip tinygo build -o p.wasm -scheduler=none -target=wasi -wasm-abi=generic p
 
   e2e-tests-envoy:
     strategy:
@@ -59,11 +61,11 @@ jobs:
       - name: checkout
         uses: actions/checkout@v2
 
-      - name: download wasm-binaries
-        uses: actions/download-artifact@v2
+      - name: cache built examples
+        uses: actions/cache@v2
         with:
-          name: wasm-binaries
           path: examples
+          key: ${{ hashFiles('examples/**', 'proxywasm/**') }}
 
       - name: set up go 1.15
         uses: actions/setup-go@v1
@@ -81,16 +83,21 @@ jobs:
     needs: build-examples
     runs-on: ubuntu-latest
     container:
-      image: getenvoy/proxy-wasm-go-sdk-ci:istio-${{ matrix.istio-version }}
+      image: istio/proxyv2:${{ matrix.istio-version }}
     steps:
       - name: checkout
         uses: actions/checkout@v2
 
-      - name: download wasm-binaries
-        uses: actions/download-artifact@v2
+      - name: set up go 1.15
+        uses: actions/setup-go@v1
+        with:
+          go-version: 1.15
+
+      - name: fetch built examples
+        uses: actions/cache@v2
         with:
-          name: wasm-binaries
           path: examples
+          key: ${{ hashFiles('examples/**', 'proxywasm/**') }}
 
       - name: run e2e test
-        run: go test ./e2e/... -v
+        run: CGO_ENABLED=0 go test ./e2e/... -v

Makefile

@@ -1,7 +1,5 @@
 .DEFAULT_GOAL := build.examples
 
-ISTIO_VERSION ?= 1.7.3
-
 .PHONY: build.example build.example.docker build.examples build.examples.docker lint test test.sdk test.e2e
 
 build.example:
@@ -26,10 +24,10 @@ test:
 	go test -tags=proxytest $(shell go list ./... | grep -v e2e | sed 's/github.com\/tetratelabs\/proxy-wasm-go-sdk/./g')
 
 test.e2e:
-	docker run -it -w /tmp/proxy-wasm-go -v $(shell pwd):/tmp/proxy-wasm-go getenvoy/proxy-wasm-go-sdk-ci:istio-${ISTIO_VERSION} go test -v ./e2e
+	go test -v ./e2e
 
 test.e2e.single:
-	docker run -it -w /tmp/proxy-wasm-go -v $(shell pwd):/tmp/proxy-wasm-go getenvoy/proxy-wasm-go-sdk-ci:istio-${ISTIO_VERSION} go test -v ./e2e -run ${name}
+	go test -v ./e2e -run ${name}
 
 run:
 	docker run --entrypoint='/usr/local/bin/envoy' \

README.md

@@ -71,7 +71,11 @@ make run name=helloworld
 ```bash
 make test # run local tests without running envoy processes
 
+## requires you to have the Envoy binary locally
 make test.e2e # run e2e tests
+
+## requires you to have the Envoy binary locally
+make test.e2e.single name=helloworld # run e2e tests
 ```
 
 ## limitations and considerations