From 9caae4ebd9573395b16a4a18fba32defc8f4163b Mon Sep 17 00:00:00 2001 From: Junqiu Lei Date: Tue, 7 Feb 2023 10:05:17 -0800 Subject: [PATCH 1/2] Update 2.x branch version to 2.6 Signed-off-by: Junqiu Lei --- .github/workflows/cypress-workflow.yml | 4 ++-- .github/workflows/unit-tests-workflow.yml | 2 +- opensearch_dashboards.json | 4 ++-- package.json | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/cypress-workflow.yml b/.github/workflows/cypress-workflow.yml index ea0866b8..bbacbbfc 100644 --- a/.github/workflows/cypress-workflow.yml +++ b/.github/workflows/cypress-workflow.yml @@ -10,8 +10,8 @@ on: - main - 2.* env: - OPENSEARCH_DASHBOARDS_BRANCH: '2.5' - GEOSPATIAL_PLUGIN_BRANCH: '2.5' + OPENSEARCH_DASHBOARDS_BRANCH: '2.x' + GEOSPATIAL_PLUGIN_BRANCH: '2.x' jobs: tests: env: diff --git a/.github/workflows/unit-tests-workflow.yml b/.github/workflows/unit-tests-workflow.yml index 4928a66a..351341fc 100644 --- a/.github/workflows/unit-tests-workflow.yml +++ b/.github/workflows/unit-tests-workflow.yml @@ -11,7 +11,7 @@ on: - feature/** env: - OPENSEARCH_DASHBOARDS_BRANCH: '2.5' + OPENSEARCH_DASHBOARDS_BRANCH: '2.x' jobs: tests: strategy: diff --git a/opensearch_dashboards.json b/opensearch_dashboards.json index 9d7e117c..98566270 100644 --- a/opensearch_dashboards.json +++ b/opensearch_dashboards.json @@ -1,7 +1,7 @@ { "id": "customImportMapDashboards", - "version": "2.5.0.0", - "opensearchDashboardsVersion": "2.5.0", + "version": "2.6.0.0", + "opensearchDashboardsVersion": "2.6.0", "server": true, "ui": true, "requiredPlugins": ["regionMap", "opensearchDashboardsReact", "navigation", "savedObjects", "data"], diff --git a/package.json b/package.json index c96b52e1..ac80a9d2 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "customImportMap", - "version": "2.5.0.0", + "version": "2.6.0.0", "license": "Apache-2.0", "config": { "id": "customImportMapDashboards" From 044aaa9f30a802cfcfe18b5be20d6f8108460174 Mon Sep 17 00:00:00 2001 From: Junqiu Lei Date: Tue, 7 Feb 2023 12:04:42 -0800 Subject: [PATCH 2/2] Update cypress test Signed-off-by: Junqiu Lei --- .github/workflows/cypress-workflow.yml | 2 +- cypress/integration/documentsLayer.spec.js | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/cypress-workflow.yml b/.github/workflows/cypress-workflow.yml index bbacbbfc..b094a094 100644 --- a/.github/workflows/cypress-workflow.yml +++ b/.github/workflows/cypress-workflow.yml @@ -118,7 +118,7 @@ jobs: # Window is slow so wait longer - name: Sleep until OSD server starts - windows if: ${{ matrix.os == 'windows-latest' }} - run: Start-Sleep -s 400 + run: Start-Sleep -s 600 shell: powershell - name: Sleep until OSD server starts - non-windows diff --git a/cypress/integration/documentsLayer.spec.js b/cypress/integration/documentsLayer.spec.js index 58df4fc3..9e166306 100644 --- a/cypress/integration/documentsLayer.spec.js +++ b/cypress/integration/documentsLayer.spec.js @@ -45,6 +45,7 @@ describe('Documents layer', () => { cy.wait(5000).get('[data-test-subj="top-nav"]').click(); cy.wait(5000).get('[data-test-subj="savedObjectTitle"]').type(uniqueName); cy.wait(5000).get('[data-test-subj="confirmSaveSavedObjectButton"]').click(); + cy.wait(5000).get('[data-test-subj="breadcrumb last"]').should('contain', uniqueName); }); it('Open saved map with documents layer', () => {