Merge branch 'main' into md-serverless

opensearch-project · May 15, 2023 · 2df5ad5 · 2df5ad5
2 parents 1d347da + 8121c9d
commit 2df5ad5
Show file tree

Hide file tree

Showing 4 changed files with 41 additions and 3 deletions.
diff --git a/.github/workflows/build_and_test_workflow.yml b/.github/workflows/build_and_test_workflow.yml
@@ -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:
@@ -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]
@@ -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: |

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -148,6 +148,7 @@ Inspired from [Keep a Changelog](https://keepachangelog.com/en/1.0.0/)
 - Upgrade yarn version to be compatible with @openearch-project/opensearch ([#3443](https://github.com/opensearch-project/OpenSearch-Dashboards/pull/3443))
 - [CI] Reduce redundancy by using matrix strategy on Windows and Linux workflows ([#3514](https://github.com/opensearch-project/OpenSearch-Dashboards/pull/3514))
 - Add an achievement badger to the PR ([#3721](https://github.com/opensearch-project/OpenSearch-Dashboards/pull/3721))
+- Install chrome driver for functional tests from path set by environment variable `TEST_BROWSER_BINARY_PATH`([#3997](https://github.com/opensearch-project/OpenSearch-Dashboards/pull/3997))
 
 ### 📝 Documentation
 
@@ -254,6 +255,7 @@ Inspired from [Keep a Changelog](https://keepachangelog.com/en/1.0.0/)
 - [Console] Fix dev tool console autocomplete not loading issue ([#3775](https://github.com/opensearch-project/OpenSearch-Dashboards/pull/3775))
 - [Console] Fix dev tool console run command with query parameter error ([#3813](https://github.com/opensearch-project/OpenSearch-Dashboards/pull/3813))
 - Add clarifying tooltips to header navigation ([#3573](https://github.com/opensearch-project/OpenSearch-Dashboards/issues/3573))
+- [Dashboards Listing] Fix listing limit to utilize `savedObjects:listingLimit` instead of `savedObjects:perPage` ([#4021](https://github.com/opensearch-project/OpenSearch-Dashboards/pull/4021))
 
 ### 🚞 Infrastructure
 

diff --git a/scripts/upgrade_chromedriver.js b/scripts/upgrade_chromedriver.js
@@ -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',

diff --git a/src/plugins/dashboard/public/application/legacy_app.js b/src/plugins/dashboard/public/application/legacy_app.js
@@ -150,7 +150,7 @@ export function initDashboardApp(app, deps) {
               type: $scope.dashboardListTypes,
               search: search ? `${search}*` : undefined,
               fields: ['title', 'type', 'description', 'updated_at'],
-              perPage: $scope.initialPageSize,
+              perPage: $scope.listingLimit,
               page: 1,
               searchFields: ['title^3', 'type', 'description'],
               defaultSearchOperator: 'AND',