Skip to content
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.

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

feat: synchronize ui folder with ui repository #21090

Merged
merged 8 commits into from
Mar 31, 2021
Merged

Conversation

williamhbaker
Copy link
Contributor

Related: influxdata/ui#212 & influxdata/idpe#8963

This change modifies the build process for influxd related to the UI assets. Pre-built UI assets will now be downloaded from tagged releases on the influxdata/ui repository and embedded into the influxd binary. This pull request includes modifications to the Makefile in the ui folder necessary to accomplish this. It also includes adjustments to the e2e Cypress tests to allow them to work with the up-to-date UI from the influxdata/ui repository. Test adjustments were made to update the tests to match the correct selectors and reduce "flakyness" of the tests.

Efforts are being planned to integrate OSS with the monitor-ci e2e tests, see influxdata/ui#1007. Once this is complete, additional cleanup work can be done in the influxdata/influxdb repository related to UI assets once the e2e tests do not need to be run out of influxdata/influxdb.

Copy link
Contributor

@danxmoran danxmoran left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Will you delete all the UI source files from ui/ as part of this?

CHANGELOG.md Outdated Show resolved Hide resolved
ui/fetch_ui_assets.sh Outdated Show resolved Hide resolved
@williamhbaker
Copy link
Contributor Author

williamhbaker commented Mar 30, 2021

Will you delete all the UI source files from ui/ as part of this?

@danxmoran Parts of the UI source are still needed to run the e2e tests - when I tried deleting the ui/src they wouldn't run anymore. It probably just needs the type definitions but I didn't spend much time investigating. Once the e2e tests are set up to run with OSS in monitor-ci we can definitely delete the ui/src and most everything else from the ui folder, but for now I am planning to leave it alone.

@williamhbaker williamhbaker marked this pull request as ready for review March 30, 2021 14:55
Copy link
Contributor

@danxmoran danxmoran left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Already seeing some good wins on total CI time (apart from the deleted steps, build is taking about half as long, and I think cross_build is faster too). Nice work!

@williamhbaker williamhbaker merged commit 4237dda into master Mar 31, 2021
@williamhbaker williamhbaker deleted the wb-ui-sync branch March 31, 2021 14:56
williamhbaker added a commit that referenced this pull request Apr 1, 2021
* feat: synchronize ui folder with ui repository

* docs: updated README in /ui to reflect new UI asset build process

* chore: update CHANGELOG

* chore: re-worded CHANGELOG message and added trailing newline to fetch_ui_assets.sh script

* fix: leveraged queryBuilder test code from ui repo to fix flaky queryBuilder test on chrome

* docs: added comments to fetch_ui_assets script explaining where the assets come from

* chore: empty commit to trigger CI
williamhbaker added a commit that referenced this pull request Apr 1, 2021
* feat: synchronize ui folder with ui repository (#21090)

* feat: synchronize ui folder with ui repository

* docs: updated README in /ui to reflect new UI asset build process

* chore: update CHANGELOG

* chore: re-worded CHANGELOG message and added trailing newline to fetch_ui_assets.sh script

* fix: leveraged queryBuilder test code from ui repo to fix flaky queryBuilder test on chrome

* docs: added comments to fetch_ui_assets script explaining where the assets come from

* chore: empty commit to trigger CI

* chore: update URL in fetch_ui_assets.sh to point to the correct release branch in ui repo

* chore: update CHANGELOG
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants