reorder again

grafana · Dec 20, 2024 · d80c507 · d80c507
1 parent ebdebc5
commit d80c507
Showing 1 changed file with 23 additions and 22 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -161,60 +161,61 @@ jobs:
           echo "::set-output name=MIN_VERSION::$min_version"
           export MIN_VERSION=$min_version
 
-      - name: Start grafana server for e2e tests (latest)
-        run: ANONYMOUS_AUTH_ENABLED=false GRAFANA_VERSION=latest docker compose up -d
+      - name: Start grafana server for e2e tests (${{ steps.min-version.outputs.MIN_VERSION }})
+        continue-on-error: true
+        run: ANONYMOUS_AUTH_ENABLED=false GRAFANA_VERSION=${{ steps.min-version.outputs.MIN_VERSION }} docker compose up -d
         working-directory: ./${{ matrix.workingDir }}
 
-      - name: Wait for grafana server (latest)
+      - name: Wait for grafana server (${{ steps.min-version.outputs.MIN_VERSION }})
         uses: grafana/plugin-actions/wait-for-grafana@main
         with:
           url: http://localhost:3000/login
 
-      - name: Run e2e tests (latest)
-        id: run-e2e-tests
+      - name: Run e2e tests (${{ steps.min-version.outputs.MIN_VERSION }})
+        id: run-e2e-tests-oldest
         run: npm run e2e
         working-directory: ./${{ matrix.workingDir }}
 
-      - name: Stop grafana docker (latest)
+      - name: Stop grafana docker (${{ steps.min-version.outputs.MIN_VERSION }})
         run: docker stop ${{ matrix.workingDir }} && docker rm ${{ matrix.workingDir }}
         working-directory: ./${{ matrix.workingDir }}
 
-      - name: Publish report to GCS (latest)
-        if: ${{ github.repository_owner == 'grafana' && (failure() && steps.run-e2e-tests.outcome == 'failure') }}
+      - name: Publish report to GCS (${{ steps.min-version.outputs.MIN_VERSION }})
+        if: ${{ github.repository_owner == 'grafana' && (failure() && steps.run-e2e-tests-oldest.outcome == 'failure') }}
         uses: grafana/plugin-actions/publish-report@main
         with:
-          grafana-version: ${{ matrix.workingDir }}-latest
+          grafana-version: ${{ matrix.workingDir }}-${{ steps.min-version.outputs.MIN_VERSION }}
           path: ./${{ matrix.workingDir }}/playwright-report
 
-      - name: Delete playwright report
-        run: ls && rm -rf ./playwright-report && rm -rf ./test-results/ && rm -rf ./playwright/.cache/ && ls ./
-        working-directory: ./${{ matrix.workingDir }}
-
-      - name: Start grafana server for e2e tests (${{ steps.min-version.outputs.MIN_VERSION }})
-        run: ANONYMOUS_AUTH_ENABLED=false GRAFANA_VERSION=${{ steps.min-version.outputs.MIN_VERSION }} docker compose up -d
+      - name: Start grafana server for e2e tests (latest)
+        run: ANONYMOUS_AUTH_ENABLED=false GRAFANA_VERSION=latest docker compose up -d
         working-directory: ./${{ matrix.workingDir }}
 
-      - name: Wait for grafana server (${{ steps.min-version.outputs.MIN_VERSION }})
+      - name: Wait for grafana server (latest)
         uses: grafana/plugin-actions/wait-for-grafana@main
         with:
           url: http://localhost:3000/login
 
-      - name: Run e2e tests (${{ steps.min-version.outputs.MIN_VERSION }})
-        id: run-e2e-tests-oldest
+      - name: Run e2e tests (latest)
+        id: run-e2e-tests
         run: npm run e2e
         working-directory: ./${{ matrix.workingDir }}
 
-      - name: Stop grafana docker (${{ steps.min-version.outputs.MIN_VERSION }})
+      - name: Stop grafana docker (latest)
         run: docker stop ${{ matrix.workingDir }} && docker rm ${{ matrix.workingDir }}
         working-directory: ./${{ matrix.workingDir }}
 
-      - name: Publish report to GCS (${{ steps.min-version.outputs.MIN_VERSION }})
-        if: ${{ github.repository_owner == 'grafana' && (failure() && steps.run-e2e-tests-oldest.outcome == 'failure') }}
+      - name: Publish report to GCS (latest)
+        if: ${{ github.repository_owner == 'grafana' && (failure() && steps.run-e2e-tests.outcome == 'failure') }}
         uses: grafana/plugin-actions/publish-report@main
         with:
-          grafana-version: ${{ matrix.workingDir }}-${{ steps.min-version.outputs.MIN_VERSION }}
+          grafana-version: ${{ matrix.workingDir }}-latest
           path: ./${{ matrix.workingDir }}/playwright-report
 
+      # - name: Delete playwright report
+      #   run: ls && rm -rf ./playwright-report && rm -rf ./test-results/ && rm -rf ./playwright/.cache/ && ls ./
+      #   working-directory: ./${{ matrix.workingDir }}
+
       - name: Check plugin.json
         run: |
           cp -r dist/ ${{ matrix.workingDir }}