Fix CI

.github/workflows/test-build.yml

@@ -77,8 +77,8 @@ jobs:
       - name: npm run test-exports
         run: npm run test-exports
 
-  browser:
-    name: Test Browser using Node 14.x
+  browser-realtime:
+    name: Test Browser Realtime
     runs-on: ubuntu-latest
     needs: build
     steps:
@@ -95,15 +95,41 @@ jobs:
       - name: Start Streamr Docker Stack
         uses: streamr-dev/streamr-docker-dev-action@v1.0.0-alpha.3
         with:
-          services-to-start: "mysql redis core-api cassandra parity-node0 parity-sidechain-node0 bridge broker-node-no-storage-1 broker-node-no-storage-2 broker-node-storage-1 nginx smtp"
+          services-to-start: "mysql redis core-api cassandra parity-node0 parity-sidechain-node0 bridge brokers trackers nginx smtp"
+      - uses: nick-invision/retry@v2
+        name: Run Realtime Test
+        with:
+          max_attempts: 3
+          timeout_minutes: 3
+          retry_on: error
+          command: npm run test-browser-realtime
 
+  browser-resend:
+    name: Test Browser Realtime + Resend
+    runs-on: ubuntu-latest
+    needs: build
+    steps:
+      - uses: actions/checkout@v2
+      - uses: actions/setup-node@v2
+        with:
+          node-version: "14.x"
+      - uses: actions/download-artifact@v2
+        with:
+          name: build
+          path: dist
+      - name: npm ci
+        run: npm ci
+      - name: Start Streamr Docker Stack
+        uses: streamr-dev/streamr-docker-dev-action@v1.0.0-alpha.3
+        with:
+          services-to-start: "mysql redis core-api cassandra parity-node0 parity-sidechain-node0 bridge brokers trackers nginx smtp"
       - uses: nick-invision/retry@v2
-        name: Run Test
+        name: Run Resend Test
         with:
           max_attempts: 3
           timeout_minutes: 3
           retry_on: error
-          command: npm run test-browser
+          command: npm run test-browser-resend
 
   benchmarks:
     name: Test Benchmark using Node ${{ matrix.node-version }}
@@ -125,7 +151,7 @@ jobs:
       - name: Start Streamr Docker Stack
         uses: streamr-dev/streamr-docker-dev-action@v1.0.0-alpha.3
         with:
-          services-to-start: "mysql redis core-api cassandra parity-node0 parity-sidechain-node0 bridge broker-node-no-storage-1 broker-node-no-storage-2 broker-node-storage-1 nginx smtp"
+          services-to-start: "mysql redis core-api cassandra parity-node0 parity-sidechain-node0 bridge brokers trackers nginx smtp"
       - name: npm ci
         run: npm ci
       - name: benchmarks
@@ -159,6 +185,8 @@ jobs:
       NUM_MESSAGES: 20
       TEST_NAME: ${{ matrix.test-name }}
       CONFIG_NAME: ${{ matrix.config-name }}
+      LOG_LEVEL_JAVA_CLIENT: 'debug'
+      LOG_LEVEL_PUBLISHER_JS: 'debug'
     steps:
       - uses: actions/checkout@v2
       - name: Use Node.js 14
@@ -172,7 +200,7 @@ jobs:
       - name: Start Streamr Docker Stack
         uses: streamr-dev/streamr-docker-dev-action@v1.0.0-alpha.3
         with:
-          services-to-start: "mysql redis core-api cassandra parity-node0 parity-sidechain-node0 bridge broker-node-no-storage-1 broker-node-no-storage-2 broker-node-storage-1 nginx smtp"
+          services-to-start: "mysql redis core-api cassandra parity-node0 parity-sidechain-node0 bridge brokers trackers nginx smtp"
       - name: npm ci
         run: npm ci
       - name: npm link
@@ -194,7 +222,18 @@ jobs:
       - uses: nick-invision/retry@v2
         name: run-client-testing
         with:
-          max_attempts: 2
+          max_attempts: 5
           timeout_minutes: 15
           retry_on: error
           command: cd streamr-client-testing && DEBUG='' java -jar build/libs/client_testing-1.0-SNAPSHOT.jar -s $TEST_NAME -c config/$CONFIG_NAME.conf -n $NUM_MESSAGES
+      - name: Collect docker logs on failure
+        if: failure()
+        uses: jwalton/gh-docker-logs@v1
+        with:
+          dest: './logs'
+      - name: Upload logs to GitHub
+        if: failure()
+        uses: actions/upload-artifact@master
+        with:
+          name: docker-logs-${{ github.job }}-${{ github.run_number }}-${{ github.run_id }}
+          path: ./logs

.github/workflows/test-code.yml

@@ -85,15 +85,15 @@ jobs:
         websocket-url:
             - name: "default"
               url:  ""
-            - name: "storage-node-only"
-              url:  "ws://localhost:8890/api/v1/ws"
+            - name: "single-node-only"
+              url:  "ws://localhost:8690/api/v1/ws"
 
         exclude:
           # no need to test different ws urls for dataunion tests
           - test-name: "test-integration-dataunions"
             websocket-url:
-                - name: "storage-node-only"
-                - url:  "ws://localhost:8890/api/v1/ws"
+                - name: "single-node-only"
+                - url:  "ws://localhost:8690/api/v1/ws"
     env:
       TEST_NAME: ${{ matrix.test-name }}
       WEBSOCKET_URL: ${{ matrix.websocket-url.url}}
@@ -109,9 +109,20 @@ jobs:
       - name: Start Streamr Docker Stack
         uses: streamr-dev/streamr-docker-dev-action@v1.0.0-alpha.3
         with:
-          services-to-start: "mysql redis core-api cassandra parity-node0 parity-sidechain-node0 bridge broker-node-no-storage-1 broker-node-no-storage-2 broker-node-storage-1 nginx smtp"
+          services-to-start: "mysql redis core-api cassandra parity-node0 parity-sidechain-node0 bridge brokers trackers nginx smtp"
       - name: Run Test
         run: npm run $TEST_NAME
+      - name: Collect docker logs on failure
+        if: failure()
+        uses: jwalton/gh-docker-logs@v1
+        with:
+          dest: './logs'
+      - name: Upload logs to GitHub
+        if: failure()
+        uses: actions/upload-artifact@master
+        with:
+          name: docker-logs-${{ matrix.test-name }}-${{ matrix.websocket-url.name }}-node${{ matrix.node-version }}--${{ github.run_number }}-${{ github.run_id }}
+          path: ./logs
 
   flakey:
     name: Flakey Tests using Node ${{ matrix.node-version }}
@@ -131,7 +142,7 @@ jobs:
       - name: Start Streamr Docker Stack
         uses: streamr-dev/streamr-docker-dev-action@v1.0.0-alpha.3
         with:
-          services-to-start: "mysql redis core-api cassandra parity-node0 parity-sidechain-node0 bridge broker-node-no-storage-1 broker-node-no-storage-2 broker-node-storage-1 nginx smtp"
+          services-to-start: "mysql redis core-api cassandra parity-node0 parity-sidechain-node0 bridge brokers trackers nginx smtp"
       - uses: nick-invision/retry@v2
         name: Run Test
         with:
@@ -143,6 +154,7 @@ jobs:
   memory:
     name:  Memory Tests using Node ${{ matrix.node-version }}
     runs-on: ubuntu-latest
+    if: ${{ false }} # temporarily disable memory test until production resends are stable
     strategy:
       fail-fast: false
       matrix: