From 446f79881ad6c7395e8619c2f5ea005a4252a31e Mon Sep 17 00:00:00 2001 From: Richard Cox Date: Thu, 5 Sep 2024 16:53:17 +0100 Subject: [PATCH 01/15] Switch to org runners --- .github/actions/setup-node/action.yaml | 18 +++++++++ .github/actions/setup/action.yaml | 8 ++-- .github/workflows/check-plugins.yaml | 13 ++----- .github/workflows/docusaurus.yaml | 13 +++---- .github/workflows/pr-gh-project.yaml | 3 +- .github/workflows/storybook.yaml | 9 ++--- .github/workflows/test.yaml | 51 +++++++++++++++----------- shell/scripts/test-plugins-build.sh | 7 +++- 8 files changed, 72 insertions(+), 50 deletions(-) create mode 100644 .github/actions/setup-node/action.yaml diff --git a/.github/actions/setup-node/action.yaml b/.github/actions/setup-node/action.yaml new file mode 100644 index 00000000000..98059c70676 --- /dev/null +++ b/.github/actions/setup-node/action.yaml @@ -0,0 +1,18 @@ +name: Setup Node +description: Setup node, including yarn + +runs: + using: 'composite' + steps: + - name: Setup yarn + shell: bash + # if we have yarn, no op + # if no yarn, install (probably running in non-containerized runners) + run: | + yarn || curl -fsSL -o ~/bin/yarn https://github.com/yarnpkg/yarn/releases/download/v1.22.17/yarn-1.22.17.js && chmod +x ~/bin/yarn && echo "~/bin" >> $GITHUB_PATH + + - name: Setup Node.js + uses: actions/setup-node@v4 + with: + node-version-file: '.nvmrc' + cache: 'yarn' diff --git a/.github/actions/setup/action.yaml b/.github/actions/setup/action.yaml index df7dcdfcfb6..308f532bf73 100644 --- a/.github/actions/setup/action.yaml +++ b/.github/actions/setup/action.yaml @@ -1,13 +1,11 @@ name: Setup UI Env -description: Setup node, python and call bootstrap script +description: Setup node, yarn install runs: using: 'composite' steps: - - uses: actions/setup-node@v4 - with: - node-version-file: '.nvmrc' - cache: 'yarn' + - name: Setup Node + uses: ./.github/actions/setup-node - name: Install packages shell: bash diff --git a/.github/workflows/check-plugins.yaml b/.github/workflows/check-plugins.yaml index a8fbb48be66..dfa73bac488 100644 --- a/.github/workflows/check-plugins.yaml +++ b/.github/workflows/check-plugins.yaml @@ -7,19 +7,14 @@ env: TEST_PERSIST_BUILD: true jobs: validate: - runs-on: ubuntu-latest + # Resource starved when running in container, so run in non-container runner + runs-on: runs-on,runner=8cpu-linux-x64,run-id=${{ github.run_id }} steps: - name: Checkout uses: actions/checkout@v4 - - name: Enable Corepack - run: corepack enable - - - name: Setup Node.js - uses: actions/setup-node@v4 - with: - node-version-file: '.nvmrc' - cache: 'yarn' + - name: Setup Node + uses: ./.github/actions/setup-node - name: Validate Plugin build system run: ./shell/scripts/test-plugins-build.sh diff --git a/.github/workflows/docusaurus.yaml b/.github/workflows/docusaurus.yaml index 38056fe0316..78f768712e8 100644 --- a/.github/workflows/docusaurus.yaml +++ b/.github/workflows/docusaurus.yaml @@ -10,14 +10,12 @@ on: jobs: build: name: Build - runs-on: ubuntu-latest + container: registry.suse.com/bci/nodejs:20 + runs-on: org-${{ github.repository_owner_id }}-amd64-k8s steps: - uses: actions/checkout@v2 - - uses: actions/setup-node@v4 - with: - node-version-file: '.nvmrc' - cache: yarn - + - name: Setup Node + uses: ./.github/actions/setup-node - name: Install dependencies run: cd docusaurus/ && yarn install:ci - name: Build website @@ -38,7 +36,8 @@ jobs: deploy: name: Publish if: ${{ github.event_name == 'push' && github.repository_owner == 'rancher' }} - runs-on: ubuntu-latest + container: registry.suse.com/bci/nodejs:20 + runs-on: org-${{ github.repository_owner_id }}-amd64-k8s needs: build # This is required to avoid https://github.com/actions/deploy-pages/issues/271 diff --git a/.github/workflows/pr-gh-project.yaml b/.github/workflows/pr-gh-project.yaml index dcb875c3dac..72774afc4d7 100644 --- a/.github/workflows/pr-gh-project.yaml +++ b/.github/workflows/pr-gh-project.yaml @@ -10,7 +10,8 @@ jobs: pull-requests: write repository-projects: write id-token: write - runs-on: ubuntu-latest + container: registry.suse.com/bci/nodejs:20 + runs-on: org-${{ github.repository_owner_id }}-amd64-k8s steps: - uses: actions/checkout@v2 - name: Use Node.js diff --git a/.github/workflows/storybook.yaml b/.github/workflows/storybook.yaml index b71bc7a58c8..8a5b3fd0388 100644 --- a/.github/workflows/storybook.yaml +++ b/.github/workflows/storybook.yaml @@ -10,13 +10,12 @@ on: - master jobs: storybook: - runs-on: ubuntu-latest + container: registry.suse.com/bci/nodejs:20 + runs-on: org-${{ github.repository_owner_id }}-amd64-k8s steps: - uses: actions/checkout@v4 - - name: Use Node.js - uses: actions/setup-node@v4 - with: - node-version-file: '.nvmrc' + - name: Setup Node + uses: ./.github/actions/setup-node - name: Install packages run: yarn install - name: Build Storybook diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml index e0f265c5c25..e2e61d94528 100644 --- a/.github/workflows/test.yaml +++ b/.github/workflows/test.yaml @@ -35,13 +35,19 @@ env: jobs: e2e-ui-build: if: "!contains( github.event.pull_request.labels.*.name, 'ci/skip-e2e')" - runs-on: ubuntu-latest + container: registry.suse.com/bci/nodejs:20 + runs-on: org-${{ github.repository_owner_id }}-amd64-k8s steps: - uses: actions/checkout@v4 with: fetch-depth: 1 - name: Setup env uses: ./.github/actions/setup + - name: Ensure repo dir is accepted as safe by git + # in bci user who runs git commands and repo folder owner is different + shell: bash + run: | + git config --global --add safe.directory $PWD - name: Build e2e run: yarn e2e:build - name: Upload e2e build @@ -61,15 +67,16 @@ jobs: retention-days: 10 compression-level: 9 - e2e-test: if: "!contains( github.event.pull_request.labels.*.name, 'ci/skip-e2e')" needs: e2e-ui-build + # Cannot run container (rancher) in container (runner), so run in non-container runner + runs-on: runs-on,runner=8cpu-linux-x64,run-id=${{ github.run_id }} strategy: fail-fast: false matrix: role: [ - { username: 'admin', tag: '@adminUser' }, + { username: 'admin', tag: '@adminUser' }, { username: 'standard_user', tag: '@standardUser' } ] features: [ @@ -84,11 +91,11 @@ jobs: ['@components'], ['@vai'] ] - runs-on: ubuntu-latest steps: - uses: actions/checkout@v4 with: fetch-depth: 1 + - name: Setup env uses: ./.github/actions/setup @@ -119,7 +126,7 @@ jobs: - name: Setup Rancher and user run: | yarn e2e:prod - env: + env: GREP_TAGS: ${{ matrix.role.tag }}Setup+${{ matrix.features[0] }} --@jenkins ${{ matrix.role.tag }}Setup+${{ matrix.features[1] || matrix.features[0] }} --@jenkins TEST_USERNAME: admin TEST_ONLY: setup @@ -127,7 +134,7 @@ jobs: run: | yarn e2e:prod [ "$BUILD_DASHBOARD" != "false" ] || exit 0 - env: + env: TEST_SKIP: setup GREP_TAGS: ${{ matrix.role.tag }}+${{ matrix.features[0] }} --@jenkins ${{ matrix.role.tag }}+${{ matrix.features[1] || matrix.features[0] }} --@jenkins TEST_USERNAME: ${{ matrix.role.username }} @@ -139,9 +146,9 @@ jobs: name: ${{github.run_number}}-${{github.run_attempt}}-screenshots-${{ matrix.role.tag }}+${{ matrix.features[0] }} path: cypress/screenshots - unit-test: - runs-on: ubuntu-latest + container: registry.suse.com/bci/nodejs:20 + runs-on: org-${{ github.repository_owner_id }}-amd64-k8s steps: - uses: actions/checkout@v4 with: @@ -162,9 +169,9 @@ jobs: name: ${{github.run_number}}-${{github.run_attempt}}-coverage path: coverage-artifacts/**/* - i18n: - runs-on: ubuntu-latest + container: registry.suse.com/bci/nodejs:20 + runs-on: org-${{ github.repository_owner_id }}-amd64-k8s steps: - uses: actions/checkout@v4 with: @@ -173,9 +180,9 @@ jobs: - name: Run i18n lint uses: ./.github/actions/i18n-lint - lint: - runs-on: ubuntu-latest + container: registry.suse.com/bci/nodejs:20 + runs-on: org-${{ github.repository_owner_id }}-amd64-k8s steps: - uses: actions/checkout@v4 with: @@ -184,16 +191,15 @@ jobs: - name: Run tests uses: ./.github/actions/lint - check-i18n: - runs-on: ubuntu-latest + container: registry.suse.com/bci/nodejs:20 + runs-on: org-${{ github.repository_owner_id }}-amd64-k8s steps: - uses: actions/checkout@v4 with: fetch-depth: 1 - - uses: actions/setup-node@v4 - with: - node-version-file: '.nvmrc' + - name: Setup Node + uses: ./.github/actions/setup-node - name: Install packages run: yarn install:ci @@ -204,14 +210,14 @@ jobs: ./scripts/check-i18n -s -x check-i18n-links: - runs-on: ubuntu-latest + container: registry.suse.com/bci/nodejs:20 + runs-on: org-${{ github.repository_owner_id }}-amd64-k8s steps: - uses: actions/checkout@v4 with: fetch-depth: 1 - - uses: actions/setup-node@v4 - with: - node-version-file: '.nvmrc' + - name: Setup Node + uses: ./.github/actions/setup-node - name: Install packages run: yarn install:ci @@ -245,7 +251,8 @@ jobs: # 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 + container: registry.suse.com/bci/nodejs:20 + runs-on: org-${{ github.repository_owner_id }}-amd64-k8s steps: - uses: actions/checkout@v4 with: diff --git a/shell/scripts/test-plugins-build.sh b/shell/scripts/test-plugins-build.sh index bbac4cc4f74..1be2e98f98b 100755 --- a/shell/scripts/test-plugins-build.sh +++ b/shell/scripts/test-plugins-build.sh @@ -128,7 +128,10 @@ if [ "${SKIP_STANDALONE}" == "false" ]; then pushd test-app > /dev/null yarn install - FORCE_COLOR=true yarn build | cat + + echo "Building skeleton app" + + NODE_OPTIONS=--max_old_space_size=4096 FORCE_COLOR=true yarn build | cat # Add test list component to the test package # Validates rancher-components imports @@ -228,3 +231,5 @@ function clone_repo_test_extension_build() { # clone_repo_test_extension_build "capi-ui-extension" "capi" echo "All done" +# Force an exit +exit 0 From fabea787097c1e1ac3240f21b5b0f0c6fc69f463 Mon Sep 17 00:00:00 2001 From: Richard Cox Date: Thu, 5 Sep 2024 17:24:11 +0100 Subject: [PATCH 02/15] alternative chrome location --- .github/workflows/test.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml index e2e61d94528..99b4bbebe82 100644 --- a/.github/workflows/test.yaml +++ b/.github/workflows/test.yaml @@ -105,7 +105,7 @@ jobs: run: | sudo apt-get install -y wget cd /tmp - wget -q http://mirror.cs.uchicago.edu/google-chrome/pool/main/g/google-chrome-stable/google-chrome-stable_127.0.6533.72-1_amd64.deb + wget -q http://dl.google.com/linux/chrome/deb/pool/main/g/google-chrome-stable/google-chrome-stable_127.0.6533.72-1_amd64.deb sudo apt-get install -y --allow-downgrades ./google-chrome-stable_127.0.6533.72-1_amd64.deb google-chrome --version From 833dc5522b39738a5d5f25eac46f106124428f26 Mon Sep 17 00:00:00 2001 From: Richard Cox Date: Fri, 6 Sep 2024 13:14:01 +0100 Subject: [PATCH 03/15] Ensure url is updated before going to edit page --- cypress/e2e/po/components/sortable-table.po.ts | 10 ++++++++-- cypress/e2e/po/pages/explorer/config-map.po.ts | 2 +- cypress/e2e/po/pages/explorer/network-policy.po.ts | 2 +- 3 files changed, 10 insertions(+), 4 deletions(-) diff --git a/cypress/e2e/po/components/sortable-table.po.ts b/cypress/e2e/po/components/sortable-table.po.ts index 39412587d89..0cc211013c8 100644 --- a/cypress/e2e/po/components/sortable-table.po.ts +++ b/cypress/e2e/po/components/sortable-table.po.ts @@ -80,11 +80,17 @@ export default class SortableTablePo extends ComponentPo { * @param searchText * @returns */ - filter(searchText: string) { - return this.filterComponent() + filter(searchText: string, checkQuery = false) { + const res = this.filterComponent() .focus() .clear() .type(searchText); + + if (checkQuery) { + cy.url().should('include', `q=${ searchText }`); + } + + return res; } resetFilter() { diff --git a/cypress/e2e/po/pages/explorer/config-map.po.ts b/cypress/e2e/po/pages/explorer/config-map.po.ts index 60459d0536d..6204f51e63f 100644 --- a/cypress/e2e/po/pages/explorer/config-map.po.ts +++ b/cypress/e2e/po/pages/explorer/config-map.po.ts @@ -39,7 +39,7 @@ export class ConfigMapPagePo extends PagePo { } searchForConfigMap(name: string) { - return this.list().resourceTable().sortableTable().filter(name); + return this.list().resourceTable().sortableTable().filter(name, true); } title() { diff --git a/cypress/e2e/po/pages/explorer/network-policy.po.ts b/cypress/e2e/po/pages/explorer/network-policy.po.ts index ad229c9d6ab..77999c094af 100644 --- a/cypress/e2e/po/pages/explorer/network-policy.po.ts +++ b/cypress/e2e/po/pages/explorer/network-policy.po.ts @@ -39,6 +39,6 @@ export class NetworkPolicyPagePo extends PagePo { } searchForNetworkPolicy(name: string) { - return this.list().resourceTable().sortableTable().filter(name); + return this.list().resourceTable().sortableTable().filter(name, true); } } From 0e73fcef600ea7e757b3063094d509d690823b6c Mon Sep 17 00:00:00 2001 From: Richard Cox Date: Fri, 18 Oct 2024 19:21:35 +0100 Subject: [PATCH 04/15] test --- .github/workflows/test.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml index 99b4bbebe82..bda8dc81399 100644 --- a/.github/workflows/test.yaml +++ b/.github/workflows/test.yaml @@ -104,6 +104,7 @@ jobs: - name: Install Chrome 127 run: | sudo apt-get install -y wget + sudo apt-get install libu2f-udev cd /tmp wget -q http://dl.google.com/linux/chrome/deb/pool/main/g/google-chrome-stable/google-chrome-stable_127.0.6533.72-1_amd64.deb sudo apt-get install -y --allow-downgrades ./google-chrome-stable_127.0.6533.72-1_amd64.deb From 85eec6b270dc8b1bd758c4a15161ab65f4976db0 Mon Sep 17 00:00:00 2001 From: Richard Cox Date: Fri, 18 Oct 2024 19:41:02 +0100 Subject: [PATCH 05/15] test2 --- .github/workflows/test.yaml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml index bda8dc81399..aa71df3a41a 100644 --- a/.github/workflows/test.yaml +++ b/.github/workflows/test.yaml @@ -25,7 +25,7 @@ env: CYPRESS_API_URL: http://139.59.134.103:1234/ TEST_RUN_ID: ${{github.run_number}}-${{github.run_attempt}}-${{github.event.pull_request.title || github.event.head_commit.message}} # Build the dashboard to use in tests. When set to false it will grab `latest` from CDN (useful for running e2e tests quickly) - BUILD_DASHBOARD: true + BUILD_DASHBOARD: false E2E_BUILD_DIST_NAME: dist E2E_BUILD_DIST_DIR: dist @@ -103,8 +103,9 @@ jobs: # Leaving this here again in case we need to pin to a specific Chrome version in the future - name: Install Chrome 127 run: | + hostnamectl || lsb_release || cat /etc/os-release sudo apt-get install -y wget - sudo apt-get install libu2f-udev + sudo apt-get install libgconf2-4 libnss3-1d libxss1 cd /tmp wget -q http://dl.google.com/linux/chrome/deb/pool/main/g/google-chrome-stable/google-chrome-stable_127.0.6533.72-1_amd64.deb sudo apt-get install -y --allow-downgrades ./google-chrome-stable_127.0.6533.72-1_amd64.deb From 5e4c53d5b4392c2dfe962597c2808932f4a0211c Mon Sep 17 00:00:00 2001 From: Richard Cox Date: Fri, 25 Oct 2024 10:17:38 +0100 Subject: [PATCH 06/15] test3 --- .github/workflows/test.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml index aa71df3a41a..263730bf3c3 100644 --- a/.github/workflows/test.yaml +++ b/.github/workflows/test.yaml @@ -103,12 +103,12 @@ jobs: # Leaving this here again in case we need to pin to a specific Chrome version in the future - name: Install Chrome 127 run: | - hostnamectl || lsb_release || cat /etc/os-release + cat /etc/os-release sudo apt-get install -y wget - sudo apt-get install libgconf2-4 libnss3-1d libxss1 cd /tmp wget -q http://dl.google.com/linux/chrome/deb/pool/main/g/google-chrome-stable/google-chrome-stable_127.0.6533.72-1_amd64.deb - sudo apt-get install -y --allow-downgrades ./google-chrome-stable_127.0.6533.72-1_amd64.deb + sudo apt-get install -y --allow-downgrades ./google-chrome-stable_127.0.6533.72-1_amd64.deb || true + sudo apt --fix-broken install google-chrome --version - name: Download e2e build From c7f9437adedd7dd2d70d850c0b1f1dee09f3afdd Mon Sep 17 00:00:00 2001 From: Richard Cox Date: Fri, 25 Oct 2024 11:10:12 +0100 Subject: [PATCH 07/15] test4 --- .github/workflows/test.yaml | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml index 263730bf3c3..868c1d639f5 100644 --- a/.github/workflows/test.yaml +++ b/.github/workflows/test.yaml @@ -107,8 +107,10 @@ jobs: sudo apt-get install -y wget cd /tmp wget -q http://dl.google.com/linux/chrome/deb/pool/main/g/google-chrome-stable/google-chrome-stable_127.0.6533.72-1_amd64.deb - sudo apt-get install -y --allow-downgrades ./google-chrome-stable_127.0.6533.72-1_amd64.deb || true - sudo apt --fix-broken install + # sudo apt-get install -y --allow-downgrades ./google-chrome-stable_127.0.6533.72-1_amd64.deb || true + # sudo apt --fix-broken install + sudo dpkg -i google-chrome-stable_127.0.6533.72-1_amd64.deb + sudo apt install --assume-yes --fix-broken google-chrome --version - name: Download e2e build From 154bc969313854f278391ecdcdee3a96b1869d5d Mon Sep 17 00:00:00 2001 From: Richard Cox Date: Fri, 25 Oct 2024 11:28:43 +0100 Subject: [PATCH 08/15] test5 --- .github/workflows/test.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml index 868c1d639f5..8dbe2526441 100644 --- a/.github/workflows/test.yaml +++ b/.github/workflows/test.yaml @@ -104,6 +104,7 @@ jobs: - name: Install Chrome 127 run: | cat /etc/os-release + sudo apt-get remove google-chrome-stable sudo apt-get install -y wget cd /tmp wget -q http://dl.google.com/linux/chrome/deb/pool/main/g/google-chrome-stable/google-chrome-stable_127.0.6533.72-1_amd64.deb From 3737f9ff70e80ce116fb55b6d8d487eee4a49bf9 Mon Sep 17 00:00:00 2001 From: Richard Cox Date: Fri, 25 Oct 2024 16:45:12 +0100 Subject: [PATCH 09/15] test6 --- .github/workflows/test.yaml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml index 8dbe2526441..411e23934bc 100644 --- a/.github/workflows/test.yaml +++ b/.github/workflows/test.yaml @@ -104,13 +104,14 @@ jobs: - name: Install Chrome 127 run: | cat /etc/os-release - sudo apt-get remove google-chrome-stable + # sudo apt-get remove google-chrome-stable + sudo dpkg -r google-chrome-stable. sudo apt-get install -y wget cd /tmp wget -q http://dl.google.com/linux/chrome/deb/pool/main/g/google-chrome-stable/google-chrome-stable_127.0.6533.72-1_amd64.deb # sudo apt-get install -y --allow-downgrades ./google-chrome-stable_127.0.6533.72-1_amd64.deb || true # sudo apt --fix-broken install - sudo dpkg -i google-chrome-stable_127.0.6533.72-1_amd64.deb + sudo dpkg -i google-chrome-stable_127.0.6533.72-1_amd64.deb || true sudo apt install --assume-yes --fix-broken google-chrome --version From 3286e7fa5899ce51bfa521756a350db48cb60865 Mon Sep 17 00:00:00 2001 From: Richard Cox Date: Thu, 31 Oct 2024 14:39:45 +0000 Subject: [PATCH 10/15] testw efsd dfgfh dfg gcxbdfzg erg egf dg fdg --- .github/workflows/test.yaml | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml index 411e23934bc..b84d9e69a70 100644 --- a/.github/workflows/test.yaml +++ b/.github/workflows/test.yaml @@ -105,13 +105,14 @@ jobs: run: | cat /etc/os-release # sudo apt-get remove google-chrome-stable - sudo dpkg -r google-chrome-stable. + # sudo dpkg -r google-chrome-stable. + google-chrome --version sudo apt-get install -y wget cd /tmp - wget -q http://dl.google.com/linux/chrome/deb/pool/main/g/google-chrome-stable/google-chrome-stable_127.0.6533.72-1_amd64.deb + wget -q http://dl.google.com/linux/chrome/deb/pool/main/g/google-chrome-stable/google-chrome-stable_126.0.6478.182-1_amd64.deb # sudo apt-get install -y --allow-downgrades ./google-chrome-stable_127.0.6533.72-1_amd64.deb || true # sudo apt --fix-broken install - sudo dpkg -i google-chrome-stable_127.0.6533.72-1_amd64.deb || true + sudo dpkg -i google-chrome-stable_126.0.6478.182-1_amd64.deb sudo apt install --assume-yes --fix-broken google-chrome --version From bb9c1b4dd8379b885d64291b321a5285b2c7fdba Mon Sep 17 00:00:00 2001 From: Richard Cox Date: Thu, 31 Oct 2024 15:49:11 +0000 Subject: [PATCH 11/15] fgdh yfngjng --- .github/workflows/test.yaml | 23 ++++++++++++++++++----- 1 file changed, 18 insertions(+), 5 deletions(-) diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml index b84d9e69a70..3598ac1dade 100644 --- a/.github/workflows/test.yaml +++ b/.github/workflows/test.yaml @@ -103,17 +103,30 @@ jobs: # Leaving this here again in case we need to pin to a specific Chrome version in the future - name: Install Chrome 127 run: | + echo "OS Info" cat /etc/os-release - # sudo apt-get remove google-chrome-stable - # sudo dpkg -r google-chrome-stable. + + echo "Chrome installed by default" google-chrome --version + + echo "uninstal chrome" + # sudo apt-get remove google-chrome-stable + sudo dpkg -r google-chrome-stable + + echo "install wget" sudo apt-get install -y wget + + echo "download target chrome" cd /tmp - wget -q http://dl.google.com/linux/chrome/deb/pool/main/g/google-chrome-stable/google-chrome-stable_126.0.6478.182-1_amd64.deb + wget -q http://dl.google.com/linux/chrome/deb/pool/main/g/google-chrome-stable/google-chrome-stable_130.0.6723.91-1_amd64.deb # sudo apt-get install -y --allow-downgrades ./google-chrome-stable_127.0.6533.72-1_amd64.deb || true # sudo apt --fix-broken install - sudo dpkg -i google-chrome-stable_126.0.6478.182-1_amd64.deb - sudo apt install --assume-yes --fix-broken + + echo "install target chrome" + sudo dpkg -i google-chrome-stable_130.0.6723.91-1_amd64.deb + # sudo apt install --assume-yes --fix-broken + + echo "check target chrome" google-chrome --version - name: Download e2e build From 6916109623580f0627a87ab6837dd17bd0f2a5ee Mon Sep 17 00:00:00 2001 From: Richard Cox Date: Thu, 31 Oct 2024 16:32:45 +0000 Subject: [PATCH 12/15] uninstalling 130.0.6723.91-1 then installing it works... trying 27.0.6533.72-1 --- .github/workflows/test.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml index 3598ac1dade..8a184acef56 100644 --- a/.github/workflows/test.yaml +++ b/.github/workflows/test.yaml @@ -118,12 +118,12 @@ jobs: echo "download target chrome" cd /tmp - wget -q http://dl.google.com/linux/chrome/deb/pool/main/g/google-chrome-stable/google-chrome-stable_130.0.6723.91-1_amd64.deb + wget -q http://dl.google.com/linux/chrome/deb/pool/main/g/google-chrome-stable/google-chrome-stable_127.0.6533.72-1_amd64.deb # sudo apt-get install -y --allow-downgrades ./google-chrome-stable_127.0.6533.72-1_amd64.deb || true # sudo apt --fix-broken install echo "install target chrome" - sudo dpkg -i google-chrome-stable_130.0.6723.91-1_amd64.deb + sudo dpkg -i google-chrome-stable_127.0.6533.72-1_amd64.deb # sudo apt install --assume-yes --fix-broken echo "check target chrome" From 2da3b554b1b506f957e6c0bdd8d5d968b88380e3 Mon Sep 17 00:00:00 2001 From: Richard Cox Date: Thu, 31 Oct 2024 17:14:31 +0000 Subject: [PATCH 13/15] try latest 127 (127.0.6533.119-1) --- .github/workflows/test.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml index 8a184acef56..5df464ff67a 100644 --- a/.github/workflows/test.yaml +++ b/.github/workflows/test.yaml @@ -118,12 +118,12 @@ jobs: echo "download target chrome" cd /tmp - wget -q http://dl.google.com/linux/chrome/deb/pool/main/g/google-chrome-stable/google-chrome-stable_127.0.6533.72-1_amd64.deb - # sudo apt-get install -y --allow-downgrades ./google-chrome-stable_127.0.6533.72-1_amd64.deb || true + wget -q http://dl.google.com/linux/chrome/deb/pool/main/g/google-chrome-stable/google-chrome-stable_127.0.6533.119-1_amd64.deb + # sudo apt-get install -y --allow-downgrades ./google-chrome-stable_127.0.6533.119-1_amd64.deb || true # sudo apt --fix-broken install echo "install target chrome" - sudo dpkg -i google-chrome-stable_127.0.6533.72-1_amd64.deb + sudo dpkg -i google-chrome-stable_127.0.6533.119-1_amd64.deb # sudo apt install --assume-yes --fix-broken echo "check target chrome" From 7a55f0765cdf6bc20e4b32f969fc215f5373b297 Mon Sep 17 00:00:00 2001 From: Richard Cox Date: Thu, 31 Oct 2024 20:06:45 +0000 Subject: [PATCH 14/15] try 128.0.6613.137-1 --- .github/workflows/test.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml index 5df464ff67a..66b54d3d942 100644 --- a/.github/workflows/test.yaml +++ b/.github/workflows/test.yaml @@ -118,12 +118,12 @@ jobs: echo "download target chrome" cd /tmp - wget -q http://dl.google.com/linux/chrome/deb/pool/main/g/google-chrome-stable/google-chrome-stable_127.0.6533.119-1_amd64.deb - # sudo apt-get install -y --allow-downgrades ./google-chrome-stable_127.0.6533.119-1_amd64.deb || true + wget -q http://dl.google.com/linux/chrome/deb/pool/main/g/google-chrome-stable/google-chrome-stable_128.0.6613.137-1_amd64.deb + # sudo apt-get install -y --allow-downgrades ./google-chrome-stable_128.0.6613.137-1_amd64.deb || true # sudo apt --fix-broken install echo "install target chrome" - sudo dpkg -i google-chrome-stable_127.0.6533.119-1_amd64.deb + sudo dpkg -i google-chrome-stable_128.0.6613.137-1_amd64.deb # sudo apt install --assume-yes --fix-broken echo "check target chrome" From 0fb7e0192db3d50ce6850cbdda6b535d3446e791 Mon Sep 17 00:00:00 2001 From: Richard Cox Date: Fri, 1 Nov 2024 15:48:41 +0000 Subject: [PATCH 15/15] cannot be 128 (https://github.com/rancher/dashboard/pull/11775). use latest 129 --- .github/workflows/test.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml index 66b54d3d942..a557cc0fd1b 100644 --- a/.github/workflows/test.yaml +++ b/.github/workflows/test.yaml @@ -118,12 +118,12 @@ jobs: echo "download target chrome" cd /tmp - wget -q http://dl.google.com/linux/chrome/deb/pool/main/g/google-chrome-stable/google-chrome-stable_128.0.6613.137-1_amd64.deb - # sudo apt-get install -y --allow-downgrades ./google-chrome-stable_128.0.6613.137-1_amd64.deb || true + wget -q http://dl.google.com/linux/chrome/deb/pool/main/g/google-chrome-stable/google-chrome-stable_129.0.6668.100-1_amd64.deb + # sudo apt-get install -y --allow-downgrades ./google-chrome-stable_129.0.6668.100-1_amd64.deb || true # sudo apt --fix-broken install echo "install target chrome" - sudo dpkg -i google-chrome-stable_128.0.6613.137-1_amd64.deb + sudo dpkg -i google-chrome-stable_129.0.6668.100-1_amd64.deb # sudo apt install --assume-yes --fix-broken echo "check target chrome"