Combine diagnostic file upload in smoke tests

Signed-off-by: Tom Wieczorek <twieczorek@mirantis.com>

.github/workflows/go.yml

@@ -204,8 +204,9 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        smoke-suite: ${{ fromJson(needs.prepare.outputs.smoketest-matrix) }}
-
+        smoke-suite:
+          - singlenode
+          - network-conformance-kuberouter
     name: "Smoke test :: ${{ matrix.smoke-suite }}"
     needs: [prepare, build-k0s, build-airgap-image-bundle]
 

.github/workflows/smoketest.yaml

@@ -62,18 +62,12 @@ jobs:
           SMOKETEST_NAME: check-${{ inputs.name }}
         run: make -C inttest "$SMOKETEST_NAME"
 
-      - name: Collect k0s logs and support bundle
-        if: failure()
+      - name: Collect k0s logs, support bundle and conformance test results
+        # if: failure()
         uses: actions/upload-artifact@v4
         with:
           name: smoketest-${{ inputs.name }}-files
           path: |
             /tmp/*.log
             /tmp/support-bundle.tar.gz
-
-      - name: Collect sonobuoy results
-        if: failure() && contains(inputs.name, 'conformance')
-        uses: actions/upload-artifact@v4
-        with:
-          name: smoketest-${{ inputs.name }}-sonobuoy-results
-          path: /tmp/*_sonobuoy_*.tar.gz
+            /tmp/*_sonobuoy_*.tar.gz