fix after rebase

rancher · Aug 14, 2024 · c006f3d · c006f3d
1 parent 7481a96
commit c006f3d
Showing 1 changed file with 0 additions and 253 deletions.
diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml
@@ -32,19 +32,11 @@ env:
   E2E_BUILD_DIST_EMBER_NAME: dist_ember
   E2E_BUILD_DIST_EMBER_DIR: dist_ember
 
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
->>>>>>> aef1a47c78 (comment workflows)
 jobs:
   e2e-ui-build:
     if: "!contains( github.event.pull_request.labels.*.name, 'ci/skip-e2e')"
     runs-on: ubuntu-latest
     steps:
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
->>>>>>> c4682884ea (revert test.yaml)
       - uses: actions/checkout@v4
         with:
           fetch-depth: 1
@@ -70,34 +62,6 @@ jobs:
           compression-level: 9
 
 
-<<<<<<< HEAD
-=======
-     - uses: actions/checkout@v3
-       with:
-        fetch-depth: 1
-     - name: Setup env
-       uses: ./.github/actions/setup
-     - name: Build e2e
-       run: yarn e2e:build
-     - name: Upload e2e build
-       uses: actions/upload-artifact@v4
-       with:
-        name: ${{ env.E2E_BUILD_DIST_NAME }}
-        path: ${{ env.E2E_BUILD_DIST_DIR }}/
-        if-no-files-found: error
-        retention-days: 10
-        compression-level: 9
-     - name: Upload e2e build ember
-       uses: actions/upload-artifact@v4
-       with:
-        name: ${{ env.E2E_BUILD_DIST_EMBER_NAME }}
-        path: ${{ env.E2E_BUILD_DIST_EMBER_DIR }}/
-        if-no-files-found: error
-        retention-days: 10
-        compression-level: 9
->>>>>>> aef1a47c78 (comment workflows)
-=======
->>>>>>> c4682884ea (revert test.yaml)
   e2e-test:
     if: "!contains( github.event.pull_request.labels.*.name, 'ci/skip-e2e')"
     needs: e2e-ui-build
@@ -121,80 +85,11 @@ jobs:
         ]
     runs-on: ubuntu-latest
     steps:
-<<<<<<< HEAD
-<<<<<<< HEAD
       - uses: actions/checkout@v4
-=======
-      - uses: actions/checkout@v3
->>>>>>> aef1a47c78 (comment workflows)
-=======
-      - uses: actions/checkout@v4
->>>>>>> c4682884ea (revert test.yaml)
         with:
           fetch-depth: 1
       - name: Setup env
         uses: ./.github/actions/setup
-<<<<<<< HEAD
-=======
-# jobs:
-#   e2e-ui-build:
-#     if: "!contains( github.event.pull_request.labels.*.name, 'ci/skip-e2e')"
-#     runs-on: ubuntu-latest
-#     steps:
-#      - uses: actions/checkout@v3
-#        with:
-#         fetch-depth: 1
-#      - name: Setup env
-#        uses: ./.github/actions/setup
-#      - name: Build e2e
-#        run: yarn e2e:build
-#      - name: Upload e2e build
-#        uses: actions/upload-artifact@v4
-#        with:
-#         name: ${{ env.E2E_BUILD_DIST_NAME }}
-#         path: ${{ env.E2E_BUILD_DIST_DIR }}/
-#         if-no-files-found: error
-#         retention-days: 10
-#         compression-level: 9
-#      - name: Upload e2e build ember
-#        uses: actions/upload-artifact@v4
-#        with:
-#         name: ${{ env.E2E_BUILD_DIST_EMBER_NAME }}
-#         path: ${{ env.E2E_BUILD_DIST_EMBER_DIR }}/
-#         if-no-files-found: error
-#         retention-days: 10
-#         compression-level: 9
-#   e2e-test:
-#     if: "!contains( github.event.pull_request.labels.*.name, 'ci/skip-e2e')"
-#     needs: e2e-ui-build
-#     strategy:
-#       fail-fast: false
-#       matrix:
-#         role: [
-#           { username: 'admin', tag: '@adminUser' }, 
-#           { username: 'standard_user', tag: '@standardUser' }
-#         ]
-#         features:  [
-#           # ['@navigation', '@extensions'],
-#           # ['@charts'],
-#           ['@explorer'],
-#           # ['@fleet'],
-#           # ['@generic', '@globalSettings'],
-#           # ['@manager'],
-#           # ['@userMenu', '@usersAndAuths'],
-#           # ['@components'],
-#           # ['@vai']
-#         ]
-#     runs-on: ubuntu-latest
-#     steps:
-#       - uses: actions/checkout@v3
-#         with:
-#           fetch-depth: 1
-#       - name: Setup env
-#         uses: ./.github/actions/setup
->>>>>>> 991e9241ec (bind to only v2.9 to check if tests pass + comment other workflows)
-=======
->>>>>>> aef1a47c78 (comment workflows)
 
       # Installing fixed version of Chrome since latest version does not work (117-118 didn't work)
       # Leaving this here again in case we need to pin to a specific Chrome version in the future
@@ -237,40 +132,17 @@ jobs:
           TEST_USERNAME: ${{ matrix.role.username }}
 
       - name: Upload screenshots
-<<<<<<< HEAD
-<<<<<<< HEAD
-        uses: actions/upload-artifact@v4
-=======
-        uses: actions/upload-artifact@v3
->>>>>>> aef1a47c78 (comment workflows)
-=======
         uses: actions/upload-artifact@v4
->>>>>>> c4682884ea (revert test.yaml)
         if: ${{ failure() }}
         with:
           name: ${{github.run_number}}-${{github.run_attempt}}-screenshots-${{ matrix.role.tag }}+${{ matrix.features[0] }}
           path: cypress/screenshots
 
-<<<<<<< HEAD
-<<<<<<< HEAD
 
   unit-test:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
-=======
-  unit-test:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v3
->>>>>>> aef1a47c78 (comment workflows)
-=======
-
-  unit-test:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v4
->>>>>>> c4682884ea (revert test.yaml)
         with:
           fetch-depth: 1
 
@@ -283,36 +155,6 @@ jobs:
           cp coverage/unit/coverage-final.json coverage-artifacts/coverage/coverage-unit.json
           cp -r coverage/unit/ coverage-artifacts/coverage/unit/
 
-<<<<<<< HEAD
-<<<<<<< HEAD
-      - name: Upload coverage
-        uses: actions/upload-artifact@v4
-        with:
-          name: ${{github.run_number}}-${{github.run_attempt}}-coverage
-          path: coverage-artifacts/**/*
-
-
-  i18n:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v4
-        with:
-          fetch-depth: 1
-=======
-#       - name: Upload coverage
-#         uses: actions/upload-artifact@v3
-#         with:
-#           name: ${{github.run_number}}-${{github.run_attempt}}-coverage
-#           path: coverage-artifacts/**/*
-
-#   i18n:
-#     runs-on: ubuntu-latest
-#     steps:
-#       - uses: actions/checkout@v3
-#         with:
-#           fetch-depth: 1
->>>>>>> 991e9241ec (bind to only v2.9 to check if tests pass + comment other workflows)
-=======
       - name: Upload coverage
         uses: actions/upload-artifact@v4
         with:
@@ -326,17 +168,10 @@ jobs:
       - uses: actions/checkout@v4
         with:
           fetch-depth: 1
->>>>>>> aef1a47c78 (comment workflows)
 
       - name: Run i18n lint
         uses: ./.github/actions/i18n-lint
 
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
->>>>>>> c4682884ea (revert test.yaml)
 
   lint:
     runs-on: ubuntu-latest
@@ -349,19 +184,6 @@ jobs:
         uses: ./.github/actions/lint
 
 
-<<<<<<< HEAD
-=======
-<<<<<<< HEAD
->>>>>>> 991e9241ec (bind to only v2.9 to check if tests pass + comment other workflows)
-=======
-<<<<<<< HEAD
-=======
->>>>>>> f0bfe54175 (comment workflows)
->>>>>>> aef1a47c78 (comment workflows)
-=======
->>>>>>> 087a32130d (update)
-=======
->>>>>>> c4682884ea (revert test.yaml)
   check-i18n:
     runs-on: ubuntu-latest
     steps:
@@ -380,81 +202,6 @@ jobs:
           # Falure won't fail the job (remove -x when all current issues are fixed)
           ./scripts/check-i18n -s -x
 
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-#   lint:
-#     runs-on: ubuntu-latest
-#     steps:
-#       - uses: actions/checkout@v3
-#         with:
-#           fetch-depth: 1
-=======
-  lint:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v3
-        with:
-          fetch-depth: 1
->>>>>>> aef1a47c78 (comment workflows)
-
-<<<<<<< HEAD
-<<<<<<< HEAD
-#       - name: Run tests
-#         uses: ./.github/actions/lint
-<<<<<<< HEAD
->>>>>>> 991e9241ec (bind to only v2.9 to check if tests pass + comment other workflows)
-=======
-<<<<<<< HEAD
->>>>>>> d1b20c1c90 (comment workflows)
-
-<<<<<<< HEAD
-  # coverage:
-  #   runs-on: ubuntu-latest
-  #   needs:
-  #     - unit-test
-  #   steps:
-  #     - uses: actions/checkout@v3
-  #       with:
-  #         fetch-depth: 1
-
-  #     - uses: actions/setup-node@v4
-  #       with:
-  #         node-version-file: '.nvmrc'
-
-  #     - name: Download Coverage Artifacts
-  #       uses: actions/download-artifact@v3
-  #       with:
-  #         name: ${{github.run_number}}-${{github.run_attempt}}-coverage
-
-  #     - name: Install Codecov CLI
-  #       run : .github/workflows/scripts/install-codecov.sh
-
-  #     - name: Upload tests coverage report to Codecov
-  #       run: ./codecov --verbose upload-process -t ${{ secrets.CODECOV_TOKEN }} -n ${{github.run_number}}-${{github.run_attempt}}-coverage -F unit -f ./coverage/coverage-unit.json
-
-  check-e2e-tags:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v4
-        with:
-          fetch-depth: 1
-      - uses: actions/setup-node@v4
-        with:
-          node-version-file: '.nvmrc'
-      - name: Check e2e tags
-        run: |
-          ./scripts/check-e2e-tests-for-tags
-=======
-=======
-=======
-=======
->>>>>>> 087a32130d (update)
-      - name: Run tests
-        uses: ./.github/actions/lint
-=======
->>>>>>> c4682884ea (revert test.yaml)
 
   # coverage:
   #   runs-on: ubuntu-latest