Always output envoy logs during FTW and upload as GHA artifact (#74)

corazawaf · Nov 9, 2022 · faa761d · faa761d
1 parent 636eee4
commit faa761d
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 2 deletions.
diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
@@ -76,6 +76,11 @@ jobs:
       - name: Run regression tests (ftw)
         run: go run mage.go ftw
 
+      - uses: actions/upload-artifact@v3
+        with:
+          name: ftw-envoy-logs
+          path: build/ftw-envoy.log
+
       - name: Set up Docker Buildx
         uses: docker/setup-buildx-action@v2
 

diff --git a/ftw/docker-compose.yml b/ftw/docker-compose.yml
@@ -47,11 +47,13 @@ services:
     entrypoint: bash
     command:
       - -c
-      - tail -c +0 -f /home/envoy/logs/envoy.log
+      - tail -c +0 -f /home/envoy/logs/envoy.log > /build/ftw-envoy.log
     volumes:
       - logs:/home/envoy/logs:ro
+      - ../build:/build
   ftw:
     depends_on:
+      - envoy-logs
       - wasm-logs
     build: .
     environment:

diff --git a/ftw/tests.sh b/ftw/tests.sh
@@ -32,4 +32,4 @@ echo -e "\n[Ok] Got status code $status_code, expected 200. Ready to start."
 
 FTW_CLOUDMODE=${FTW_CLOUDMODE:-false}
 
-go-ftw run -d coreruleset/tests/regression/tests --config ftw.yml --read-timeout=10s --cloud=$FTW_CLOUDMODE || (cp /home/envoy/logs/envoy.log /build/ftw-envoy.log; exit 1)
+go-ftw run -d coreruleset/tests/regression/tests --config ftw.yml --read-timeout=10s --cloud=$FTW_CLOUDMODE || exit 1
Original file line number	Diff line number	Diff line change
Expand Up		@@ -32,4 +32,4 @@ echo -e "\n[Ok] Got status code $status_code, expected 200. Ready to start."

		FTW_CLOUDMODE=${FTW_CLOUDMODE:-false}

		go-ftw run -d coreruleset/tests/regression/tests --config ftw.yml --read-timeout=10s --cloud=$FTW_CLOUDMODE \|\| (cp /home/envoy/logs/envoy.log /build/ftw-envoy.log; exit 1)
		go-ftw run -d coreruleset/tests/regression/tests --config ftw.yml --read-timeout=10s --cloud=$FTW_CLOUDMODE \|\| exit 1