From 4e224fe0aa80dcf7d6b69dfabeec46ebdd6bf154 Mon Sep 17 00:00:00 2001
From: Oliver Gugger <gugger@gmail.com>
Date: Fri, 8 Oct 2021 16:32:17 +0200
Subject: [PATCH] GitHub: fix matrix, package log files before upload

It turns out we were using the wrong matrix variable in the actual
make command and ran the same itest 6 times with no arguments, all
resulting in running the btcd test.

To avoid uploading too many files in individual requests, we zip them
first before uploading the zip itself.
---
 .github/workflows/main.yml                 | 44 ++++++++++++++--------
 docs/release-notes/release-notes-0.14.0.md |  3 ++
 2 files changed, 32 insertions(+), 15 deletions(-)

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index ec145f50..6f35225a 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -251,13 +251,19 @@ jobs:
       # Allow other tests in the matrix to continue if one fails.
       fail-fast: false
       matrix:
-        integration_type:
-          - backend=btcd
-          - backend=bitcoind
-          - backend="bitcoind notxindex"
-          - backend=bitcoind dbbackend=etcd
-          - backend=bitcoind dbbackend=postgres
-          - backend=neutrino
+        include:
+          - name: btcd
+            args: backend=btcd
+          - name: bitcoind
+            args: backend=bitcoind
+          - name: bitcoind-notxindex
+            args: backend="bitcoind notxindex"
+          - name: bitcoind-etcd
+            args: backend=bitcoind dbbackend=etcd
+          - name: bitcoind-postgres
+            args: backend=bitcoind dbbackend=postgres
+          - name: neutrino
+            args: backend=neutrino
     steps:
       - name: git checkout
         uses: actions/checkout@v2
@@ -281,15 +287,19 @@ jobs:
       - name: install bitcoind
         run: ./scripts/install_bitcoind.sh
 
-      - name: run ${{ matrix.unit_type }}
-        run: make itest-parallel ${{ matrix.unit_type }}
+      - name: run ${{ matrix.name }}
+        run: make itest-parallel ${{ matrix.args }}
 
-      - name: Upload Artifact
-        uses: actions/upload-artifact@v2
+      - name: Zip log files on failure
+        if: ${{ failure() }}
+        run: 7z a logs-itest-${{ matrix.name }}.zip lntest/itest/**/*.log
+
+      - name: Upload log files on failure
+        uses: actions/upload-artifact@v2.2.4
         if: ${{ failure() }}
         with:
-          name: logs-itest-${{ job.id }}
-          path: lntest/itest/**/*.log
+          name: logs-itest-${{ matrix.name }}
+          path: logs-itest-${{ matrix.name }}.zip
           retention-days: 5
 
   ########################
@@ -324,12 +334,16 @@ jobs:
       - name: run itest
         run: make itest-parallel windows=1 tranches=2 parallel=2
 
-      - name: Upload Artifact
+      - name: Zip log files on failure
+        if: ${{ failure() }}
+        run: 7z a logs-itest-windows.zip lntest/itest/**/*.log
+
+      - name: Upload log files on failure
         uses: actions/upload-artifact@v2
         if: ${{ failure() }}
         with:
           name: logs-itest-windows
-          path: lntest/itest/**/*.log
+          path: logs-itest-windows.zip
           retention-days: 5
 
   ########################
diff --git a/docs/release-notes/release-notes-0.14.0.md b/docs/release-notes/release-notes-0.14.0.md
index 22105168..323aa798 100644
--- a/docs/release-notes/release-notes-0.14.0.md
+++ b/docs/release-notes/release-notes-0.14.0.md
@@ -417,6 +417,9 @@ messages directly. There is no routing/path finding involved.
 
 * [Include htlc amount in bandwidth hints](https://github.com/lightningnetwork/lnd/pull/5512).
 
+* [Fix REST/WebSocket API itest that lead to overall test
+  timeout](https://github.com/lightningnetwork/lnd/pull/5845).
+
 ## Database
 
 * [Ensure single writer for legacy