From 5e87f390803e971edc2c7e7de10f7f7dd3bcd015 Mon Sep 17 00:00:00 2001 From: Ryan Liang Date: Mon, 19 Feb 2024 13:52:29 -0800 Subject: [PATCH 1/3] Add single version flag during bootstrap to fix version conflicts Signed-off-by: Ryan Liang --- .github/workflows/ftr-e2e-dashboards-observability-test.yml | 2 +- .github/workflows/integration-tests-workflow.yml | 2 +- .github/workflows/lint.yml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/ftr-e2e-dashboards-observability-test.yml b/.github/workflows/ftr-e2e-dashboards-observability-test.yml index 2e8a133d0..29d93b150 100644 --- a/.github/workflows/ftr-e2e-dashboards-observability-test.yml +++ b/.github/workflows/ftr-e2e-dashboards-observability-test.yml @@ -105,7 +105,7 @@ jobs: - name: Bootstrap the plugin run: | cd OpenSearch-Dashboards/plugins/dashboards-observability - yarn osd bootstrap + yarn osd bootstrap --single-version=loose - name: Run OpenSearch Dashboards server run: | diff --git a/.github/workflows/integration-tests-workflow.yml b/.github/workflows/integration-tests-workflow.yml index 53367154c..ad103ffa3 100644 --- a/.github/workflows/integration-tests-workflow.yml +++ b/.github/workflows/integration-tests-workflow.yml @@ -128,7 +128,7 @@ jobs: - name: Bootstrap the plugin run: | cd OpenSearch-Dashboards/plugins/dashboards-observability - yarn osd bootstrap + yarn osd bootstrap --single-version=loose - name: Run OpenSearch Dashboards server run: | diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml index 9d996b8b7..c51b4de33 100644 --- a/.github/workflows/lint.yml +++ b/.github/workflows/lint.yml @@ -46,7 +46,7 @@ jobs: - name: Bootstrap the plugin working-directory: OpenSearch-Dashboards/plugins/${{ env.PLUGIN_NAME }} - run: yarn osd bootstrap + run: yarn osd bootstrap --single-version=loose - name: Get list of changed files using GitHub Action uses: lots0logs/gh-action-get-changed-files@2.2.2 From 6db60123b5af633de5e659b05658f3a7c517fe50 Mon Sep 17 00:00:00 2001 From: Ryan Liang Date: Mon, 19 Feb 2024 14:26:33 -0800 Subject: [PATCH 2/3] Add the flag to build workflow too Signed-off-by: Ryan Liang --- .../dashboards-observability-test-and-build-workflow.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/dashboards-observability-test-and-build-workflow.yml b/.github/workflows/dashboards-observability-test-and-build-workflow.yml index 5585bc229..2317e9431 100644 --- a/.github/workflows/dashboards-observability-test-and-build-workflow.yml +++ b/.github/workflows/dashboards-observability-test-and-build-workflow.yml @@ -49,7 +49,7 @@ jobs: cd ./OpenSearch-Dashboards/ su `id -un 1000` -c "source $NVM_DIR/nvm.sh && nvm use && node -v && yarn -v && yarn config set network-timeout 1000000 -g && - yarn osd bootstrap" + yarn osd bootstrap --single-version=loose" - name: Test all dashboards-observability modules run: | @@ -57,7 +57,7 @@ jobs: cd ./OpenSearch-Dashboards/ su `id -un 1000` -c "source $NVM_DIR/nvm.sh && nvm use && node -v && yarn -v && cd plugins/dashboards-observability && - yarn osd bootstrap && yarn test --coverage --maxWorkers=100%" + yarn osd bootstrap --single-version=loose && yarn test --coverage --maxWorkers=100%" - name: Upload coverage uses: codecov/codecov-action@v1 @@ -131,7 +131,7 @@ jobs: command: | cd OpenSearch-Dashboards yarn config set network-timeout 1000000 -g - yarn osd bootstrap + yarn osd bootstrap --single-version=loose - name: Test all dashboards-observability modules run: | From 281e76343b654a04d0a574c3ac78173bff6b8802 Mon Sep 17 00:00:00 2001 From: Joshua Li Date: Mon, 19 Feb 2024 23:48:23 +0000 Subject: [PATCH 3/3] update snapshots Signed-off-by: Joshua Li --- ...ailable_integration_card_view.test.tsx.snap | 18 ++++++++++++++++++ ...ilable_integration_table_view.test.tsx.snap | 18 ++++++++++++++++++ 2 files changed, 36 insertions(+) diff --git a/public/components/integrations/components/__tests__/__snapshots__/available_integration_card_view.test.tsx.snap b/public/components/integrations/components/__tests__/__snapshots__/available_integration_card_view.test.tsx.snap index 6f47d925a..902d3f9d2 100644 --- a/public/components/integrations/components/__tests__/__snapshots__/available_integration_card_view.test.tsx.snap +++ b/public/components/integrations/components/__tests__/__snapshots__/available_integration_card_view.test.tsx.snap @@ -271,6 +271,7 @@ exports[`Available Integration Card View Test Renders nginx integration card vie className="euiButtonContent__icon" color="inherit" size="m" + title="list" type="list" > + + list + @@ -384,6 +393,7 @@ exports[`Available Integration Card View Test Renders nginx integration card vie className="euiButtonContent__icon" color="inherit" size="m" + title="grid" type="grid" > + + grid + diff --git a/public/components/integrations/components/__tests__/__snapshots__/available_integration_table_view.test.tsx.snap b/public/components/integrations/components/__tests__/__snapshots__/available_integration_table_view.test.tsx.snap index 585228061..df6ce6851 100644 --- a/public/components/integrations/components/__tests__/__snapshots__/available_integration_table_view.test.tsx.snap +++ b/public/components/integrations/components/__tests__/__snapshots__/available_integration_table_view.test.tsx.snap @@ -473,6 +473,7 @@ exports[`Available Integration Table View Test Renders nginx integration table v className="euiButtonContent__icon" color="inherit" size="m" + title="list" type="list" > + + list + @@ -586,6 +595,7 @@ exports[`Available Integration Table View Test Renders nginx integration table v className="euiButtonContent__icon" color="inherit" size="m" + title="grid" type="grid" > + + grid +