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

chore(api): Add infrastructure for a br2-external tree for buildroot #3217

Merged
merged 3 commits into from
Mar 26, 2019

Conversation

sfoster1
Copy link
Member

More information can be found in https://buildroot.org/downloads/manual/manual.html. This change doesn't alter the normal build infrastructure; it's only used when included by buildroot externally.

This tooling provides definitions for our api server and a unit file to bring it up using systemd.

Closes #2877

More information can be found in https://buildroot.org/downloads/manual/manual.html. This change doesn't alter the normal build infrastructure; it's only used when included by buildroot externally.

This tooling provides definitions for our api server and a unit file to bring it up using systemd.
@sfoster1 sfoster1 added feature Ticket is a feature request / PR introduces a feature api Affects the `api` project DO NOT MERGE Indicates a PR should not be merged, even if there's a shiny green merge button available robot-os Affects the robot's operating system labels Mar 14, 2019
@sfoster1 sfoster1 requested a review from a team March 14, 2019 20:44
@codecov
Copy link

codecov bot commented Mar 14, 2019

Codecov Report

Merging #3217 into edge will increase coverage by 1.44%.
The diff coverage is n/a.

Impacted file tree graph

@@            Coverage Diff             @@
##             edge    #3217      +/-   ##
==========================================
+ Coverage   53.13%   54.58%   +1.44%     
==========================================
  Files         693      699       +6     
  Lines       20419    21602    +1183     
==========================================
+ Hits        10850    11791     +941     
- Misses       9569     9811     +242
Impacted Files Coverage Δ
...l-designer/src/top-selectors/tip-contents/index.js 0% <0%> (ø) ⬆️
api/src/opentrons/server/endpoints/update.py 100% <0%> (ø) ⬆️
...gner/src/components/modals/GateModal/SignUpForm.js 0% <0%> (ø) ⬆️
app/src/components/ConfigurePipette/ConfigForm.js 0% <0%> (ø) ⬆️
babel.config.js 0% <0%> (ø) ⬆️
app/src/components/modals/BottomButtonBar.js 0% <0%> (ø) ⬆️
...rc/components/InstrumentSettings/InstrumentInfo.js 0% <0%> (ø) ⬆️
...step-generation/commandCreators/atomic/dispense.js 100% <0%> (ø) ⬆️
protocol-designer/src/analytics/integrations.js 0% <0%> (ø) ⬆️
labware-library/src/index.js 0% <0%> (ø) ⬆️
... and 32 more

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update bcb9f53...54c93a4. Read the comment docs.

Udev isn’t necessary on the new system.
@sfoster1 sfoster1 added ready for review and removed DO NOT MERGE Indicates a PR should not be merged, even if there's a shiny green merge button available labels Mar 15, 2019
@@ -0,0 +1,3 @@
# Makefile inclusions for buildroot integration
include $(BR2_EXTERNAL_OPENTRONS_MONOREPO_PATH)/api/buildroot.mk
# include $(BR2_EXTERNAL_OPENTRONS_MONOREPO_PATH)/update-server/buildroot.mk
Copy link
Contributor

Choose a reason for hiding this comment

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

Is this comment meant to be here?

Copy link
Member Author

Choose a reason for hiding this comment

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

I could delete it if you want, it's mostly a memory aid for when we add the update server

Copy link
Contributor

Choose a reason for hiding this comment

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

Nope you can keep it in if it's useful for relevant work later on.

@sfoster1
Copy link
Member Author

sfoster1 commented Mar 25, 2019

This is ready for review. It only works in conjunction with Opentrons/buildroot#11, see that PR for more on testing

Copy link
Contributor

@mcous mcous left a comment

Choose a reason for hiding this comment

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

LGTM pending testing of Opentrons/buildroot#11

sfoster1 added a commit to Opentrons/buildroot that referenced this pull request Mar 26, 2019
- Adds a BR2_EXTERNAL tree from the
  monorepo (Opentrons/opentrons#3217) and pulls in the opentrons api server to the build.

- Fixes some issues in systemd services and targets. Codebuild rewrites
  broken (and maybe non-broken) absolute links to fit inside its chroot jail,
  which was breaking the absolute links that aren’t supposed to be valid until
  they’re on the robot

- Add a VERSIONS file taken from a combination of the buildroot version (from
  git) and opentrons api server versions (from package.json) and save to
  /etc/VERSIONS.json

- VERSIONS.json is a new artifact and also zipped up with the full images and
  update images when uploaded to s3

Closes Opentrons/opentrons#2877
@sfoster1 sfoster1 merged commit 60d7968 into edge Mar 26, 2019
@sfoster1 sfoster1 deleted the build_api-buildroot-integration branch March 26, 2019 22:11
sfoster1 added a commit to Opentrons/buildroot that referenced this pull request Mar 26, 2019
- Adds a BR2_EXTERNAL tree from the
  monorepo (Opentrons/opentrons#3217) and pulls in the opentrons api server to the build.

- Fixes some issues in systemd services and targets. Codebuild rewrites
  broken (and maybe non-broken) absolute links to fit inside its chroot jail,
  which was breaking the absolute links that aren’t supposed to be valid until
  they’re on the robot

- Add a VERSIONS file taken from a combination of the buildroot version (from
  git) and opentrons api server versions (from package.json) and save to
  /etc/VERSIONS.json

- VERSIONS.json is a new artifact and also zipped up with the full images and
  update images when uploaded to s3

Closes Opentrons/opentrons#2877
sfoster1 added a commit to Opentrons/buildroot that referenced this pull request Jan 4, 2024
- Adds a BR2_EXTERNAL tree from the
  monorepo (Opentrons/opentrons#3217) and pulls in the opentrons api server to the build.

- Fixes some issues in systemd services and targets. Codebuild rewrites
  broken (and maybe non-broken) absolute links to fit inside its chroot jail,
  which was breaking the absolute links that aren’t supposed to be valid until
  they’re on the robot

- Add a VERSIONS file taken from a combination of the buildroot version (from
  git) and opentrons api server versions (from package.json) and save to
  /etc/VERSIONS.json

- VERSIONS.json is a new artifact and also zipped up with the full images and
  update images when uploaded to s3

Closes Opentrons/opentrons#2877
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
api Affects the `api` project feature Ticket is a feature request / PR introduces a feature robot-os Affects the robot's operating system
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants