From 27bf55b4f5a0b9c3e293a3c7d3930dd773b71bbd Mon Sep 17 00:00:00 2001 From: Attila Vamos Date: Tue, 26 Nov 2024 17:05:13 +0000 Subject: [PATCH 1/5] HPCC-33039 Fix artifact download version of UI and Bundles test GH Actions .github/workflows/bundleTest-thor.md: .github/workflows/bundleTest-thor.yml: - Change 'Download Package' 'uses: actions/download-artifact@v3' to 'v4' .github/workflows/test-ui-gh_runner.yml: - Change 'Download Support Files' 'uses: actions/download-artifact@v3' to 'v4' Signed-off-by: Attila Vamos --- .github/workflows/bundleTest-thor.md | 4 ++-- .github/workflows/bundleTest-thor.yml | 2 +- .github/workflows/test-ui-gh_runner.yml | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/bundleTest-thor.md b/.github/workflows/bundleTest-thor.md index 38497fe1dc9..91889f8cb14 100644 --- a/.github/workflows/bundleTest-thor.md +++ b/.github/workflows/bundleTest-thor.md @@ -106,7 +106,7 @@ The steps in the workflow run on the specified operating system, with Ubuntu-22. This step enables us to download the ready-to-install HPCC Platform's artifact built on the latest commit. ```yaml - name: Download Package - uses: actions/download-artifact@v3 + uses: actions/download-artifact@v4 with: name: ${{ inputs.asset-name }} path: ${{ inputs.asset-name }} @@ -457,4 +457,4 @@ If any logs, ZAP reports, or .trace files are generated, they are uploaded as ar /home/runner/HPCCSystems-regression/log/* /home/runner/HPCCSystems-regression/zap/* if-no-files-found: ignore - ``` \ No newline at end of file + ``` diff --git a/.github/workflows/bundleTest-thor.yml b/.github/workflows/bundleTest-thor.yml index a95c95c0d7a..2eaae32328a 100644 --- a/.github/workflows/bundleTest-thor.yml +++ b/.github/workflows/bundleTest-thor.yml @@ -51,7 +51,7 @@ jobs: sudo rm -rf /usr/local/lib/android - name: Download Package - uses: actions/download-artifact@v3 + uses: actions/download-artifact@v4 with: name: ${{ inputs.asset-name }} path: ${{ inputs.asset-name }} diff --git a/.github/workflows/test-ui-gh_runner.yml b/.github/workflows/test-ui-gh_runner.yml index 75c1b525de5..5031f8c6a53 100644 --- a/.github/workflows/test-ui-gh_runner.yml +++ b/.github/workflows/test-ui-gh_runner.yml @@ -80,7 +80,7 @@ jobs: path: ${{ inputs.asset-name }} - name: Download Support Files - uses: actions/download-artifact@v3 + uses: actions/download-artifact@v4 with: name: ${{ inputs.asset-name }}-support-files path: ${{ inputs.asset-name }}-support-files From 76361747cc4d23e7202f5229e9f00657c5078239 Mon Sep 17 00:00:00 2001 From: Attila Vamos Date: Tue, 26 Nov 2024 19:24:15 +0000 Subject: [PATCH 2/5] .github/workflows/test-ui-gh_runner.yml: - Fix result upload artifact name. (It needs to be unique.) Signed-off-by: Attila Vamos --- .github/workflows/test-ui-gh_runner.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/test-ui-gh_runner.yml b/.github/workflows/test-ui-gh_runner.yml index 5031f8c6a53..0e071aa7e6f 100644 --- a/.github/workflows/test-ui-gh_runner.yml +++ b/.github/workflows/test-ui-gh_runner.yml @@ -185,7 +185,7 @@ jobs: if: ${{ failure() || cancelled() || env.uploadArtifact == 'true' }} uses: actions/upload-artifact@v4 with: - name: ${{ inputs.asset-name }}-ecl_watch_ui_tests + name: ${{ inputs.asset-name }}-ecl_watch_ui_tests_result path: | ${{ inputs.asset-name }}-ecl_watch_ui_tests/*.log /home/runner/HPCCSystems-regression/log/*.json From 935e17f3e7d218877932f20f640a60f68b5ee2d3 Mon Sep 17 00:00:00 2001 From: Attila Vamos Date: Tue, 26 Nov 2024 19:58:39 +0000 Subject: [PATCH 3/5] .github/workflows/test-ui-gh_runner.yml: - Fix diverged chrome and chrome-driver versions Signed-off-by: Attila Vamos --- .github/workflows/test-ui-gh_runner.yml | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/.github/workflows/test-ui-gh_runner.yml b/.github/workflows/test-ui-gh_runner.yml index 0e071aa7e6f..990467aa326 100644 --- a/.github/workflows/test-ui-gh_runner.yml +++ b/.github/workflows/test-ui-gh_runner.yml @@ -146,8 +146,12 @@ jobs: sudo update-alternatives --set javac /usr/lib/jvm/java-21-openjdk-amd64/bin/javac export JAVA_HOME=/usr/lib/jvm/java-21-openjdk-amd64/bin/java export PATH=$PATH:$JAVA_HOME/bin - wget https://dl.google.com/linux/direct/google-chrome-stable_current_amd64.deb - sudo apt-get install -y ./google-chrome-stable_current_amd64.deb + + #wget https://dl.google.com/linux/direct/google-chrome-stable_current_amd64.deb + #sudo apt-get install -y ./google-chrome-stable_current_amd64.deb + wget 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 ./google-chrome-stable_126.0.6478.182-1_amd64.deb + wget https://storage.googleapis.com/chrome-for-testing-public/126.0.6478.126/linux64/chromedriver-linux64.zip unzip chromedriver-linux64.zip -d chromedriver sudo mv chromedriver/chromedriver-linux64/chromedriver /usr/bin/chromedriver From 378484a50e6574429864dea041bfb5766de72d87 Mon Sep 17 00:00:00 2001 From: Attila Vamos Date: Tue, 26 Nov 2024 20:15:56 +0000 Subject: [PATCH 4/5] .github/workflows/test-ui-gh_runner.yml: - Another attempt to fix chrome and chromedriver mismatch Signed-off-by: Attila Vamos --- .github/workflows/test-ui-gh_runner.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/test-ui-gh_runner.yml b/.github/workflows/test-ui-gh_runner.yml index 990467aa326..42d9e2365de 100644 --- a/.github/workflows/test-ui-gh_runner.yml +++ b/.github/workflows/test-ui-gh_runner.yml @@ -149,8 +149,9 @@ jobs: #wget https://dl.google.com/linux/direct/google-chrome-stable_current_amd64.deb #sudo apt-get install -y ./google-chrome-stable_current_amd64.deb + sudo apt-get remove -y google-chrome-stable wget 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 ./google-chrome-stable_126.0.6478.182-1_amd64.deb + sudo apt-get install -y --allow-downgrades ./google-chrome-stable_126.0.6478.182-1_amd64.deb wget https://storage.googleapis.com/chrome-for-testing-public/126.0.6478.126/linux64/chromedriver-linux64.zip unzip chromedriver-linux64.zip -d chromedriver From e4585df1ec8da77d618cd65015f3d3ecd9fa1acc Mon Sep 17 00:00:00 2001 From: Attila Vamos Date: Tue, 26 Nov 2024 22:35:05 +0000 Subject: [PATCH 5/5] .github/workflows/test-ui-gh_runner.yml: - Add comment to describe the current solution Signed-off-by: Attila Vamos --- .github/workflows/test-ui-gh_runner.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/test-ui-gh_runner.yml b/.github/workflows/test-ui-gh_runner.yml index 42d9e2365de..cb757d61774 100644 --- a/.github/workflows/test-ui-gh_runner.yml +++ b/.github/workflows/test-ui-gh_runner.yml @@ -147,6 +147,8 @@ jobs: export JAVA_HOME=/usr/lib/jvm/java-21-openjdk-amd64/bin/java export PATH=$PATH:$JAVA_HOME/bin + # To-Do: Need to find a solution to install same version of chrome and chromedriver + # The chrome stable current is 128 #wget https://dl.google.com/linux/direct/google-chrome-stable_current_amd64.deb #sudo apt-get install -y ./google-chrome-stable_current_amd64.deb sudo apt-get remove -y google-chrome-stable