Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[Backport 2.7] [CI] setup Chrome and utilize binary path #4014

Merged
merged 2 commits into from
May 17, 2023
Merged

[Backport 2.7] [CI] setup Chrome and utilize binary path #4014

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
dc7c390
[CI] setup Chrome and utilize binary path (#3997)
github-actions[bot] May 11, 2023
8a2d894
Merge branch '2.7' into backport/backport-3997-to-2.7
abbyhu2000 May 16, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 19 additions & 0 deletions .github/workflows/build_and_test_workflow.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,8 @@ env:
TEST_OPENSEARCH_TRANSPORT_PORT: 9403
TEST_OPENSEARCH_PORT: 9400
OSD_SNAPSHOT_SKIP_VERIFY_CHECKSUM: true
# Version 112.0.5615.0
CHROME_VERSION: 1109208

jobs:
build-lint-test:
Expand Down Expand Up @@ -122,6 +124,7 @@ jobs:
functional-tests:
name: Run functional tests on ${{ matrix.name }} (ciGroup${{ matrix.group }})
strategy:
fail-fast: false
matrix:
os: [ubuntu-latest, windows-latest]
group: [1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13]
Expand All @@ -134,6 +137,22 @@ jobs:
steps:
- run: echo Running functional tests for ciGroup${{ matrix.group }}

- name: Setup Chrome
id: setup-chrome
uses: browser-actions/setup-chrome@v1
with:
chrome-version: ${{ env.CHROME_VERSION }}

- name: Set Chrome Path
if: matrix.os != 'windows-latest'
run: |
echo "TEST_BROWSER_BINARY_PATH=${{ steps.setup-chrome.outputs.chrome-path }}" >> $GITHUB_ENV

- name: Set Chrome Path (Windows)
if: matrix.os == 'windows-latest'
run: |
echo "TEST_BROWSER_BINARY_PATH=${{ steps.setup-chrome.outputs.chrome-path }}" >> $env:GITHUB_ENV

- name: Configure git's autocrlf (Windows only)
if: matrix.os == 'windows-latest'
run: |
Expand Down
21 changes: 19 additions & 2 deletions scripts/upgrade_chromedriver.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,17 +25,34 @@ const versionCheckCommands = [];
switch (process.platform) {
case 'win32':
versionCheckCommands.push(
'powershell "(Get-Item \\"$Env:Programfiles/Google/Chrome/Application/chrome.exe\\").VersionInfo.FileVersion"'
...[
...(process.env.TEST_BROWSER_BINARY_PATH
? [
`powershell "(Get-Item \\"${process.env.TEST_BROWSER_BINARY_PATH}\\").VersionInfo.FileVersion"`,
]
: []),
'powershell "(Get-Item \\"$Env:Programfiles/Google/Chrome/Application/chrome.exe\\").VersionInfo.FileVersion"',
]
);
break;

case 'darwin':
versionCheckCommands.push(
'/Applications/Google\\ Chrome.app/Contents/MacOS/Google\\ Chrome --version'
...[
...(process.env.TEST_BROWSER_BINARY_PATH
? [`${process.env.TEST_BROWSER_BINARY_PATH} --version`]
: []),
'/Applications/Google\\ Chrome.app/Contents/MacOS/Google\\ Chrome --version',
]
);
break;

default:
versionCheckCommands.push(
...(process.env.TEST_BROWSER_BINARY_PATH
? [`${process.env.TEST_BROWSER_BINARY_PATH} --version`]
: [])
);
versionCheckCommands.push(
...[
'/usr/bin',
Expand Down