Skip to content

Commit 18bb1e7

Browse files
rupal-bqjoshuali925opensearch-trigger-bot[bot]opensearch-ci-bot
authored
Update 2.x to be same as Reporting Repo (opensearch-project#2)
* Use front-end report generation instead of chromium (opensearch-project#586) * Increment version to 2.4.1-SNAPSHOT (opensearch-project#540) Signed-off-by: opensearch-ci-bot <[email protected]> Signed-off-by: opensearch-ci-bot <[email protected]> Co-authored-by: opensearch-ci-bot <[email protected]> * --wip-- Signed-off-by: Joshua Li <[email protected]> * Add initial implementation of client reporting generation Signed-off-by: Joshua Li <[email protected]> * Fix url with basepath Signed-off-by: Joshua Li <[email protected]> * Update header footer height Signed-off-by: Joshua Li <[email protected]> * Update dialog text to not close dialog Signed-off-by: Joshua Li <[email protected]> * Remove console.log Signed-off-by: Joshua Li <[email protected]> * Remove unused components Signed-off-by: Joshua Li <[email protected]> * Remove chromium references Signed-off-by: Joshua Li <[email protected]> * Add report generation error handling Signed-off-by: Joshua Li <[email protected]> * Minor refactors Signed-off-by: Joshua Li <[email protected]> * Add postinstall patch to support safari for html2canvas Signed-off-by: Joshua Li <[email protected]> * Add dompurify Signed-off-by: Joshua Li <[email protected]> * Fix build error Signed-off-by: Joshua Li <[email protected]> * Remove chromium from CI Signed-off-by: Joshua Li <[email protected]> * Update CI artifact name Signed-off-by: Joshua Li <[email protected]> Signed-off-by: opensearch-ci-bot <[email protected]> Signed-off-by: Joshua Li <[email protected]> Co-authored-by: opensearch-trigger-bot[bot] <98922864+opensearch-trigger-bot[bot]@users.noreply.github.com> Co-authored-by: opensearch-ci-bot <[email protected]> * Fix workflow Signed-off-by: Rupal Mahajan <[email protected]> * Fix build artifact name in workflow Signed-off-by: Rupal Mahajan <[email protected]> * Add missing bracket Signed-off-by: Rupal Mahajan <[email protected]> * Change nick-invision to nick-fields to fix worklfow actions Signed-off-by: Rupal Mahajan <[email protected]> Signed-off-by: opensearch-ci-bot <[email protected]> Signed-off-by: Joshua Li <[email protected]> Signed-off-by: Rupal Mahajan <[email protected]> Co-authored-by: Joshua Li <[email protected]> Co-authored-by: opensearch-trigger-bot[bot] <98922864+opensearch-trigger-bot[bot]@users.noreply.github.com> Co-authored-by: opensearch-ci-bot <[email protected]>
1 parent 425f8df commit 18bb1e7

29 files changed

+647
-1243
lines changed

‎.github/workflows/dashboards-reports-test-and-build-workflow.yml

Lines changed: 38 additions & 117 deletions
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,6 @@ jobs:
1313
linux-build:
1414
runs-on: ubuntu-latest
1515
steps:
16-
- name: Checkout Plugin
17-
uses: actions/checkout@v1
18-
1916
- name: Checkout OpenSearch Dashboards
2017
uses: actions/checkout@v1
2118
with:
@@ -25,90 +22,54 @@ jobs:
2522

2623
- name: Get node version
2724
id: versions_step
28-
run:
29-
echo "::set-output name=node_version::$(node -p "(require('../OpenSearch-Dashboards/package.json').engines.node).match(/[.0-9]+/)[0]")"
25+
run: echo "::set-output name=node_version::$(node -p "(require('../OpenSearch-Dashboards/package.json').engines.node).match(/[.0-9]+/)[0]")"
3026

3127
- name: Setup Node
3228
uses: actions/setup-node@v1
3329
with:
3430
node-version: ${{ steps.versions_step.outputs.node_version }}
3531
registry-url: 'https://registry.npmjs.org'
3632

37-
38-
- name: Move Dashboards Reports to Plugins Dir
39-
run: mv dashboards-reports ../OpenSearch-Dashboards/plugins/${{ env.PLUGIN_NAME }}
40-
41-
- name: Add Chromium Binary to Reporting for Testing
42-
run: |
43-
sudo apt update
44-
sudo apt install -y libnss3-dev fonts-liberation libfontconfig1
45-
cd ../OpenSearch-Dashboards/plugins/${{ env.PLUGIN_NAME }}
46-
wget https://github.com/opendistro-for-elasticsearch/kibana-reports/releases/download/chromium-1.12.0.0/chromium-linux-x64.zip
47-
unzip chromium-linux-x64.zip
48-
rm chromium-linux-x64.zip
33+
- name: Checkout Plugin
34+
uses: actions/checkout@v1
35+
with:
36+
path: OpenSearch-Dashboards/plugins/${{ env.PLUGIN_NAME }}
4937

5038
- name: OpenSearch Dashboards Plugin Bootstrap
51-
uses: nick-invision/retry@v1
39+
uses: nick-fields/retry@v1
5240
with:
5341
timeout_minutes: 30
5442
max_attempts: 3
55-
command: cd ../OpenSearch-Dashboards/plugins/${{ env.PLUGIN_NAME }}; yarn osd bootstrap
43+
command: yarn osd bootstrap
5644

5745
- name: Test
58-
uses: nick-invision/retry@v1
46+
uses: nick-fields/retry@v1
5947
with:
6048
timeout_minutes: 30
6149
max_attempts: 3
62-
command: cd ../OpenSearch-Dashboards/plugins/${{ env.PLUGIN_NAME }}; yarn test --coverage
50+
command: yarn test --coverage
6351

6452
- name: Upload coverage
6553
uses: codecov/codecov-action@v1
6654
with:
67-
flags: dashboards-reports
68-
directory: ../OpenSearch-Dashboards/plugins/
55+
flags: dashboards-report
56+
directory: ./OpenSearch-Dashboards/plugins/
6957
token: ${{ secrets.CODECOV_TOKEN }}
7058

7159
- name: Build Artifact
7260
run: |
73-
cd ../OpenSearch-Dashboards/plugins/${{ env.PLUGIN_NAME }}
7461
yarn build
62+
mv ./build/*.zip ./build/${{ env.ARTIFACT_NAME }}-${{ env.OPENSEARCH_PLUGIN_VERSION }}.zip
7563
76-
cd build
77-
mkdir -p ./{linux-x64,linux-arm64}/opensearch-dashboards/${{ env.PLUGIN_NAME }}
78-
cp ./${{ env.PLUGIN_NAME }}-*.zip ./linux-x64/${{ env.ARTIFACT_NAME }}-${{ env.OPENSEARCH_PLUGIN_VERSION }}-linux-x64.zip
79-
cp ./${{ env.PLUGIN_NAME }}-*.zip ./linux-arm64/${{ env.ARTIFACT_NAME }}-${{ env.OPENSEARCH_PLUGIN_VERSION }}-linux-arm64.zip
80-
81-
cd linux-x64
82-
wget https://github.com/opensearch-project/dashboards-reports/releases/download/chromium-1.12.0.0/chromium-linux-x64.zip
83-
unzip chromium-linux-x64.zip -d ./opensearch-dashboards/${{ env.PLUGIN_NAME }}
84-
zip -ur ./${{ env.ARTIFACT_NAME }}-*.zip ./opensearch-dashboards
85-
mv ./${{ env.ARTIFACT_NAME }}-*.zip ..
86-
cd ..
87-
88-
cd linux-arm64
89-
wget https://github.com/opensearch-project/dashboards-reports/releases/download/chromium-1.12.0.0/chromium-linux-arm64.zip
90-
unzip chromium-linux-arm64.zip -d ./opensearch-dashboards/${{ env.PLUGIN_NAME }}
91-
zip -ur ./${{ env.ARTIFACT_NAME }}-*.zip ./opensearch-dashboards
92-
mv ./${{ env.ARTIFACT_NAME }}-*.zip ..
93-
cd ..
94-
95-
- name: Upload Artifact For Linux x64
64+
- name: Upload Artifact For Linux
9665
uses: actions/upload-artifact@v1
9766
with:
98-
name: dashboards-reports-linux-x64
99-
path: ../OpenSearch-Dashboards/plugins/${{ env.PLUGIN_NAME }}/build/${{ env.ARTIFACT_NAME }}-${{ env.OPENSEARCH_PLUGIN_VERSION }}-linux-x64.zip
100-
101-
- name: Upload Artifact For Linux arm64
102-
uses: actions/upload-artifact@v1
103-
with:
104-
name: dashboards-reports-linux-arm64
105-
path: ../OpenSearch-Dashboards/plugins/${{ env.PLUGIN_NAME }}/build/${{ env.ARTIFACT_NAME }}-${{ env.OPENSEARCH_PLUGIN_VERSION }}-linux-arm64.zip
67+
name: dashboards-reports-linux
68+
path: ./build/${{ env.ARTIFACT_NAME }}-${{ env.OPENSEARCH_PLUGIN_VERSION }}.zip
10669

10770
windows-build:
10871
runs-on: windows-latest
10972
steps:
110-
- name: Checkout Plugin
111-
uses: actions/checkout@v1
11273

11374
# Enable longer filenames for windows
11475
- name: Enable longer filenames
@@ -133,63 +94,39 @@ jobs:
13394
registry-url: 'https://registry.npmjs.org'
13495

13596

136-
- name: Move Dashboards Reports to Plugins Dir
137-
run: mv dashboards-reports ../OpenSearch-Dashboards/plugins/${{ env.PLUGIN_NAME }}
138-
139-
- name: Add Chromium Binary to Reporting for Testing
140-
run: |
141-
cd ../OpenSearch-Dashboards/plugins/${{ env.PLUGIN_NAME }}
142-
curl.exe -LO https://github.com/opensearch-project/dashboards-reports/releases/download/chromium-1.12.0.0/chromium-windows-x64.zip
143-
Expand-Archive -Path 'chromium-windows-x64.zip'
144-
Move-Item -Path "./chromium-windows-x64/.chromium" -Destination "./.chromium"
145-
rd chromium-windows-x64.zip
146-
rd chromium-windows-x64
97+
- name: Checkout Plugin
98+
uses: actions/checkout@v1
99+
with:
100+
path: OpenSearch-Dashboards/plugins/${{ env.PLUGIN_NAME }}
147101

148102
- name: OpenSearch Dashboards Plugin Bootstrap
149-
uses: nick-invision/retry@v1
103+
uses: nick-fields/retry@v1
150104
with:
151105
timeout_minutes: 30
152106
max_attempts: 3
153-
command: cd ../OpenSearch-Dashboards/plugins/${{ env.PLUGIN_NAME }} && yarn osd bootstrap
107+
command: yarn osd bootstrap
154108

155109
- name: Test
156-
uses: nick-invision/retry@v1
110+
uses: nick-fields/retry@v1
157111
with:
158112
timeout_minutes: 30
159113
max_attempts: 3
160-
command: cd ../OpenSearch-Dashboards/plugins/${{ env.PLUGIN_NAME }} && yarn test
114+
command: yarn test
161115

162116
- name: Build Artifact
163117
run: |
164-
cd ../OpenSearch-Dashboards/plugins/${{ env.PLUGIN_NAME }}
165118
yarn build
166-
167-
cd build
168-
mkdir -p ./windows-x64/opensearch-dashboards/${{ env.PLUGIN_NAME }}
169-
mv ./${{ env.PLUGIN_NAME }}-*.zip ./windows-x64/${{ env.ARTIFACT_NAME }}-${{ env.OPENSEARCH_PLUGIN_VERSION }}-windows-x64.zip
170-
171-
cd windows-x64
172-
curl.exe -LO https://github.com/opensearch-project/dashboards-reports/releases/download/chromium-1.12.0.0/chromium-windows-x64.zip
173-
Expand-Archive -Path 'chromium-windows-x64.zip'
174-
Move-Item -Path "./chromium-windows-x64/.chromium" -Destination "./opensearch-dashboards/${{ env.PLUGIN_NAME }}"
175-
rd chromium-windows-x64.zip
176-
rd chromium-windows-x64
177-
Compress-Archive -Path "./${{ env.ARTIFACT_NAME }}-*.zip" -Destination "./opensearch-dashboards"
178-
mv ./${{ env.ARTIFACT_NAME }}-*.zip ..
179-
cd ..
119+
mv ./build/*.zip ./build/${{ env.ARTIFACT_NAME }}-${{ env.OPENSEARCH_PLUGIN_VERSION }}.zip
180120
181121
- name: Upload Artifact For Windows
182122
uses: actions/upload-artifact@v1
183123
with:
184-
name: dashboards-reports-windows-x64
185-
path: ../OpenSearch-Dashboards/plugins/${{ env.PLUGIN_NAME }}/build/${{ env.ARTIFACT_NAME }}-${{ env.OPENSEARCH_PLUGIN_VERSION }}-windows-x64.zip
124+
name: dashboards-reports-windows
125+
path: ./build/${{ env.ARTIFACT_NAME }}-${{ env.OPENSEARCH_PLUGIN_VERSION }}.zip
186126

187127
macos-build:
188128
runs-on: macos-latest
189129
steps:
190-
- name: Checkout Plugin
191-
uses: actions/checkout@v1
192-
193130
- name: Checkout OpenSearch Dashboards
194131
uses: actions/checkout@v1
195132
with:
@@ -209,48 +146,32 @@ jobs:
209146
registry-url: 'https://registry.npmjs.org'
210147

211148

212-
- name: Move Dashboards Reports to Plugins Dir
213-
run: mv dashboards-reports ../OpenSearch-Dashboards/plugins/${{ env.PLUGIN_NAME }}
214-
215-
- name: Add Chromium Binary to Reporting for Testing
216-
run: |
217-
cd ../OpenSearch-Dashboards/plugins/${{ env.PLUGIN_NAME }}
218-
wget https://github.com/opendistro-for-elasticsearch/kibana-reports/releases/download/chromium-1.12.0.0/chromium-macos-x64.zip
219-
unzip chromium-macos-x64.zip
220-
rm chromium-macos-x64.zip
149+
- name: Checkout Plugin
150+
uses: actions/checkout@v1
151+
with:
152+
path: OpenSearch-Dashboards/plugins/${{ env.PLUGIN_NAME }}
221153

222154
- name: OpenSearch Dashboards Plugin Bootstrap
223-
uses: nick-invision/retry@v1
155+
uses: nick-fields/retry@v1
224156
with:
225157
timeout_minutes: 30
226158
max_attempts: 3
227-
command: cd ../OpenSearch-Dashboards/plugins/${{ env.PLUGIN_NAME }}; yarn osd bootstrap
159+
command: yarn osd bootstrap
228160

229161
- name: Test
230-
uses: nick-invision/retry@v1
162+
uses: nick-fields/retry@v1
231163
with:
232164
timeout_minutes: 30
233165
max_attempts: 3
234-
command: cd ../OpenSearch-Dashboards/plugins/${{ env.PLUGIN_NAME }}; yarn test
166+
command: yarn test
235167

236168
- name: Build Artifact
237169
run: |
238-
cd ../OpenSearch-Dashboards/plugins/${{ env.PLUGIN_NAME }}
239170
yarn build
171+
mv ./build/*.zip ./build/${{ env.ARTIFACT_NAME }}-${{ env.OPENSEARCH_PLUGIN_VERSION }}.zip
240172
241-
cd build
242-
mkdir -p ./macos-x64/opensearch-dashboards/${{ env.PLUGIN_NAME }}
243-
mv ./${{ env.PLUGIN_NAME }}-*.zip ./macos-x64/${{ env.ARTIFACT_NAME }}-${{ env.OPENSEARCH_PLUGIN_VERSION }}-macos-x64.zip
244-
245-
cd macos-x64
246-
wget https://github.com/opensearch-project/dashboards-reports/releases/download/chromium-1.12.0.0/chromium-macos-x64.zip
247-
unzip chromium-macos-x64.zip -d ./opensearch-dashboards/${{ env.PLUGIN_NAME }}
248-
zip -ur ./${{ env.ARTIFACT_NAME }}-*.zip ./opensearch-dashboards
249-
mv ./${{ env.ARTIFACT_NAME }}-*.zip ..
250-
cd ..
251-
252-
- name: Upload Artifact For MacOS x64
173+
- name: Upload Artifact For MacOS
253174
uses: actions/upload-artifact@v1
254175
with:
255-
name: dashboards-reports-macosx-x64
256-
path: ../OpenSearch-Dashboards/plugins/${{ env.PLUGIN_NAME }}/build/${{ env.ARTIFACT_NAME }}-${{ env.OPENSEARCH_PLUGIN_VERSION }}-macos-x64.zip
176+
name: dashboards-reports-macosx
177+
path: ./build/${{ env.ARTIFACT_NAME }}-${{ env.OPENSEARCH_PLUGIN_VERSION }}.zip

‎.github/workflows/reports-scheduler-release-workflow.yml

Lines changed: 0 additions & 55 deletions
This file was deleted.

0 commit comments

Comments
 (0)