Skip to content

Commit

Permalink
Revert "Temporarily hardcode chromedriver to 112.0.0 to enable all ft…
Browse files Browse the repository at this point in the history
…r tests (opensearch-project#3976)"

This reverts commit 5ea0cbe.
  • Loading branch information
AMoo-Miki committed May 17, 2023
1 parent d3741b9 commit 8b7c699
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 22 deletions.
1 change: 0 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -215,7 +215,6 @@ Inspired from [Keep a Changelog](https://keepachangelog.com/en/1.0.0/)
- Prevent primitive linting limitations from being applied to unit tests found under `src/setup_node_env` ([#3403](https://github.com/opensearch-project/OpenSearch-Dashboards/pull/3403))
- [Tests] Fix unit tests for `get_keystore` ([#3854](https://github.com/opensearch-project/OpenSearch-Dashboards/pull/3854))
- [Tests] Use `scripts/use_node` instead of `node` in functional test plugins ([#3783](https://github.com/opensearch-project/OpenSearch-Dashboards/pull/3783))
- Temporarily hardcode the largest support `chromedriver` version to `112.0.0` to enable all ftr tests ([#3976](https://github.com/opensearch-project/OpenSearch-Dashboards/pull/3976))

## [2.x]

Expand Down
27 changes: 6 additions & 21 deletions scripts/upgrade_chromedriver.js
Original file line number Diff line number Diff line change
Expand Up @@ -71,31 +71,16 @@ versionCheckCommands.some((cmd) => {
const majorVersion = versionCheckOutput?.match?.(/(?:^|\s)(9\d|\d{3})\./)?.[1];

if (majorVersion) {
let targetVersion = `^${majorVersion}`;

// TODO: Temporary fix to install chromedriver 112.0.0 if major version is 112.
// Exit if major version is greater than 112.
// Revert this once node is bumped to 16+.
// https://github.com/opensearch-project/OpenSearch-Dashboards/issues/3975
if (parseInt(majorVersion) === 112) {
targetVersion = '112.0.0';
} else if (parseInt(majorVersion) > 112) {
console.error(
`::error::Chrome version (${majorVersion}) is not supported by this script. The largest chrome version we support is 112.`
);
process.exit(1);
}

if (process.argv.includes('--install')) {
console.log(`Installing chromedriver@${targetVersion}`);
console.log(`Installing chromedriver@^${majorVersion}`);

spawnSync(`yarn add --dev chromedriver@${targetVersion}`, {
spawnSync(`yarn add --dev chromedriver@^${majorVersion}`, {
stdio: 'inherit',
cwd: process.cwd(),
shell: true,
});
} else {
console.log(`Upgrading to chromedriver@${targetVersion}`);
console.log(`Upgrading to chromedriver@^${majorVersion}`);

let upgraded = false;
const writeStream = createWriteStream('package.json.upgrading-chromedriver', { flags: 'w' });
Expand All @@ -107,7 +92,7 @@ if (majorVersion) {
if (line.includes('"chromedriver": "')) {
line = line.replace(
/"chromedriver":\s*"[~^]?\d[\d.]*\d"/,
`"chromedriver": "${targetVersion}"`
`"chromedriver": "^${majorVersion}"`
);
upgraded = true;
}
Expand All @@ -122,11 +107,11 @@ if (majorVersion) {
renameSync('package.json', 'package.json.bak');
renameSync('package.json.upgrading-chromedriver', 'package.json');

console.log(`Backed up package.json and updated chromedriver to ${targetVersion}`);
console.log(`Backed up package.json and updated chromedriver to ${majorVersion}`);
} else {
unlinkSync('package.json.upgrading-chromedriver');
console.error(
`Failed to update chromedriver to ${targetVersion}. Try adding the \`--install\` switch.`
`Failed to update chromedriver to ${majorVersion}. Try adding the \`--install\` switch.`
);
}
});
Expand Down

0 comments on commit 8b7c699

Please sign in to comment.