Skip to content

[CI/CD] Add single version flag during bootstrap to fix version conflicts and update the snapshots #1454

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

Merged
joshuali925 merged 3 commits into from
Feb 20, 2024
Merged

[CI/CD] Add single version flag during bootstrap to fix version conflicts and update the snapshots #1454

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
5e87f39
Add single version flag during bootstrap to fix version conflicts
RyanL1997 Feb 19, 2024
6db6012
Add the flag to build workflow too
RyanL1997 Feb 19, 2024
281e763
update snapshots
joshuali925 Feb 19, 2024
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
6 changes: 3 additions & 3 deletions .github/workflows/dashboards-observability-test-and-build-workflow.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,15 +49,15 @@ 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: |
chown -R 1000:1000 `pwd`
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
Expand Down Expand Up @@ -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: |
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/ftr-e2e-dashboards-observability-test.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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: |
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/integration-tests-workflow.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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: |
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/lint.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
18 changes: 18 additions & 0 deletions ...grations/components/__tests__/__snapshots__/available_integration_card_view.test.tsx.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
>
<EuiIconBeaker
Expand All @@ -279,9 +280,12 @@ exports[`Available Integration Card View Test Renders nginx integration card vie
focusable="false"
role="img"
style={null}
title="list"
titleId="random_html_id"
>
<svg
aria-hidden={true}
aria-labelledby="random_html_id"
className="euiIcon euiIcon--medium euiIcon--inherit euiIcon-isLoading euiButtonContent__icon"
focusable="false"
height={16}
Expand All @@ -291,6 +295,11 @@ exports[`Available Integration Card View Test Renders nginx integration card vie
width={16}
xmlns="http://www.w3.org/2000/svg"
>
<title
id="random_html_id"
>
list
</title>
<path
d="M5.277 10.088c.02.014.04.03.057.047.582.55 1.134.812 1.666.812.586 0 1.84-.293 3.713-.88L9 6.212V2H7v4.212l-1.723 3.876Zm-.438.987L3.539 14h8.922l-1.32-2.969C9.096 11.677 7.733 12 7 12c-.74 0-1.463-.315-2.161-.925ZM6 2H5V1h6v1h-1v4l3.375 7.594A1 1 0 0 1 12.461 15H3.54a1 1 0 0 1-.914-1.406L6 6V2Z"
/>
Expand Down Expand Up @@ -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"
>
<EuiIconBeaker
Expand All @@ -392,9 +402,12 @@ exports[`Available Integration Card View Test Renders nginx integration card vie
focusable="false"
role="img"
style={null}
title="grid"
titleId="random_html_id"
>
<svg
aria-hidden={true}
aria-labelledby="random_html_id"
className="euiIcon euiIcon--medium euiIcon--inherit euiIcon-isLoading euiButtonContent__icon"
focusable="false"
height={16}
Expand All @@ -404,6 +417,11 @@ exports[`Available Integration Card View Test Renders nginx integration card vie
width={16}
xmlns="http://www.w3.org/2000/svg"
>
<title
id="random_html_id"
>
grid
</title>
<path
d="M5.277 10.088c.02.014.04.03.057.047.582.55 1.134.812 1.666.812.586 0 1.84-.293 3.713-.88L9 6.212V2H7v4.212l-1.723 3.876Zm-.438.987L3.539 14h8.922l-1.32-2.969C9.096 11.677 7.733 12 7 12c-.74 0-1.463-.315-2.161-.925ZM6 2H5V1h6v1h-1v4l3.375 7.594A1 1 0 0 1 12.461 15H3.54a1 1 0 0 1-.914-1.406L6 6V2Z"
/>
Expand Down
18 changes: 18 additions & 0 deletions ...rations/components/__tests__/__snapshots__/available_integration_table_view.test.tsx.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
>
<EuiIconBeaker
Expand All @@ -481,9 +482,12 @@ exports[`Available Integration Table View Test Renders nginx integration table v
focusable="false"
role="img"
style={null}
title="list"
titleId="random_html_id"
>
<svg
aria-hidden={true}
aria-labelledby="random_html_id"
className="euiIcon euiIcon--medium euiIcon--inherit euiIcon-isLoading euiButtonContent__icon"
focusable="false"
height={16}
Expand All @@ -493,6 +497,11 @@ exports[`Available Integration Table View Test Renders nginx integration table v
width={16}
xmlns="http://www.w3.org/2000/svg"
>
<title
id="random_html_id"
>
list
</title>
<path
d="M5.277 10.088c.02.014.04.03.057.047.582.55 1.134.812 1.666.812.586 0 1.84-.293 3.713-.88L9 6.212V2H7v4.212l-1.723 3.876Zm-.438.987L3.539 14h8.922l-1.32-2.969C9.096 11.677 7.733 12 7 12c-.74 0-1.463-.315-2.161-.925ZM6 2H5V1h6v1h-1v4l3.375 7.594A1 1 0 0 1 12.461 15H3.54a1 1 0 0 1-.914-1.406L6 6V2Z"
/>
Expand Down Expand Up @@ -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"
>
<EuiIconBeaker
Expand All @@ -594,9 +604,12 @@ exports[`Available Integration Table View Test Renders nginx integration table v
focusable="false"
role="img"
style={null}
title="grid"
titleId="random_html_id"
>
<svg
aria-hidden={true}
aria-labelledby="random_html_id"
className="euiIcon euiIcon--medium euiIcon--inherit euiIcon-isLoading euiButtonContent__icon"
focusable="false"
height={16}
Expand All @@ -606,6 +619,11 @@ exports[`Available Integration Table View Test Renders nginx integration table v
width={16}
xmlns="http://www.w3.org/2000/svg"
>
<title
id="random_html_id"
>
grid
</title>
<path
d="M5.277 10.088c.02.014.04.03.057.047.582.55 1.134.812 1.666.812.586 0 1.84-.293 3.713-.88L9 6.212V2H7v4.212l-1.723 3.876Zm-.438.987L3.539 14h8.922l-1.32-2.969C9.096 11.677 7.733 12 7 12c-.74 0-1.463-.315-2.161-.925ZM6 2H5V1h6v1h-1v4l3.375 7.594A1 1 0 0 1 12.461 15H3.54a1 1 0 0 1-.914-1.406L6 6V2Z"
/>
Expand Down