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.

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

Jump to bottom

Add a vmware-dev variant #1292

Merged
merged 2 commits into from
Feb 16, 2021
Merged

Add a vmware-dev variant #1292

merged 2 commits into from
Feb 16, 2021

Conversation

zmrow
Copy link
Contributor

@zmrow zmrow commented Jan 27, 2021

Issue number:
N/A

Description of changes:
This change adds the necessary files for a VMWare development variant. The files are currently a copy of the aws-dev variant but will diverge over time.

This variant currently includes some AWS settings that are required to fully boot, but those settings will slowly disappear as we eliminate any AWS dependencies in the software.

Testing done:

Terms of contribution:

By submitting this pull request, I agree that this contribution is dual-licensed under the terms of both the Apache License, version 2.0, and the MIT license.

@zmrow zmrow requested review from tjkirch, bcressey and webern January 27, 2021 18:02
samuelkarp
samuelkarp approved these changes Jan 27, 2021
View reviewed changes
sources/models/src/vmware-dev/mod.rs Outdated Show resolved Hide resolved
tjkirch
tjkirch reviewed Jan 27, 2021
View reviewed changes
Copy link
Contributor

@tjkirch tjkirch left a comment •
edited
Loading

Choose a reason for hiding this comment

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

I think we should add this to .github/workflows/build.yml, as an optional build like aws-dev, to make sure we don't break it as we develop.

I guess we can wait on sources/models/src/lib.rs (for README generation) and variants/README.md until there's some useful difference, but let's not forget...

[edit] Actually, the cdrom difference is there, so it might be worth doing this now?

sources/models/src/vmware-dev/override-defaults.toml Outdated Show resolved Hide resolved
sources/logdog/conf/logdog.vmware-dev.conf Outdated Show resolved Hide resolved
@zmrow
Copy link
Contributor Author

zmrow commented Jan 27, 2021

I guess we can wait on sources/models/src/lib.rs (for README generation) and variants/README.md until there's some useful difference, but let's not forget...
[edit] Actually, the cdrom difference is there, so it might be worth doing this now?

Good catch - I completely missed this.

@zmrow zmrow force-pushed the vmware-dev-variant branch from 48977f7 to 9724c9d Compare January 27, 2021 23:04
@zmrow
Copy link
Contributor Author

zmrow commented Jan 27, 2021

^ Addressed all the comments!

tjkirch
tjkirch reviewed Jan 28, 2021
View reviewed changes
sources/models/src/lib.rs Show resolved Hide resolved
sources/models/src/lib.rs Outdated Show resolved Hide resolved
variants/README.md Outdated Show resolved Hide resolved
variants/README.md Outdated Show resolved Hide resolved
@zmrow zmrow force-pushed the vmware-dev-variant branch from 9724c9d to 6cfed36 Compare January 28, 2021 19:34
@zmrow
Copy link
Contributor Author

zmrow commented Jan 28, 2021

^ Addressed @tjkirch 's comments

@zmrow zmrow requested a review from tjkirch January 28, 2021 20:44
@zmrow
host-containers: Don't fail if host containers aren't defined
d54880b 
If a user doesn't define any host containers, it only means that this
program has nothing to do.  This change prevents the program from
failing, which causes other boot services to fail.
@zmrow zmrow force-pushed the vmware-dev-variant branch from 6cfed36 to 019784d Compare February 10, 2021 21:14
@zmrow
Copy link
Contributor Author

zmrow commented Feb 10, 2021

^ The above push:

  • Addresses the remaining comments
  • Takes advantage of the default settings refactor from Refactor default settings files to allow sharing #1303
  • Add a commit that fixes a small bug in host-containers. Previously if a user didn't define any host containers, the program would fail. The change ensures that the program continues on gracefully since it has nothing to do.

@zmrow zmrow requested a review from bcressey February 10, 2021 21:26
@zmrow
Add a vmware-dev variant
3df4ee2 
This change adds the necessary files for a VMWare development variant.
The files are currently a copy of the aws-dev variant but will diverge
over time.
@zmrow zmrow force-pushed the vmware-dev-variant branch from 019784d to 3df4ee2 Compare February 12, 2021 20:42
@zmrow
Copy link
Contributor Author

zmrow commented Feb 12, 2021

^ Integrate @tjkirch 's wording suggestion

@zmrow zmrow merged commit 721426a into bottlerocket-os:develop Feb 16, 2021
@zmrow zmrow deleted the vmware-dev-variant branch February 16, 2021 18:13
@tjkirch tjkirch mentioned this pull request Feb 19, 2021
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@samuelkarp samuelkarp samuelkarp approved these changes

@bcressey bcressey bcressey approved these changes

@tjkirch tjkirch tjkirch approved these changes

@webern webern Awaiting requested review from webern

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@zmrow @tjkirch @bcressey @samuelkarp