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

Fix build validation when variant packages aren't in bootstrap #1318

Merged
merged 2 commits into from
Mar 6, 2017

Conversation

branden
Copy link
Contributor

@branden branden commented Mar 2, 2017

High Level Description

This prevents an exception from being raised when a treeinfo's bootstrap package list doesn't pull in a package listed in the treeinfo's package variants. A treeinfo with bootstrap_package_list is expected to produce a bootstrap tarball containing a subset of its complete set of packages, so it's not necessarily an error if a package variant isn't present within it.

Related Issues

Checklist for all PR's

Checklist for component/package updates:

If you are changing components or packages in DC/OS (e.g. you are bumping the sha or ref of anything underneath packages), then in addition to the above please also include:

  • Change log from the last version integrated (this should be a link to commits for easy verification and review): example
  • Test Results: [link to CI job test results for component]
  • Code Coverage (if available): [link to code coverage report]

@d2iq-mergebot
Copy link
Collaborator

This repo has @mesosphere-mergebot integration. You can interact with the following commands.

@mesosphere-mergebot bump-ee

@branden
Copy link
Contributor Author

branden commented Mar 2, 2017

Here's proof that the pkgpanda.build integration test fails with the fix removed: https://teamcity.mesosphere.io/viewLog.html?buildId=575029&buildTypeId=DcosIo_Dcos_CodeQuality

This prevents an exception from being raised when a bootstrap package
list doesn't include a package listed in a treeinfo's package variants.
A treeinfo with bootstrap_package_list is expected to produce a
bootstrap tarball containing a subset of all cluster packages, so it's
not necessarily an error if a package variant isn't present in it.
@branden branden force-pushed the package-variant-validation branch from 30408d5 to ec228bc Compare March 2, 2017 19:17
@branden
Copy link
Contributor Author

branden commented Mar 2, 2017

@BenWhitehead @orsenthil Ready for review.

Copy link
Contributor

@orsenthil orsenthil left a comment

Choose a reason for hiding this comment

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

LGTM.

Copy link
Contributor

@BenWhitehead BenWhitehead left a comment

Choose a reason for hiding this comment

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

🚢

orsenthil pushed a commit to mesosphere/dcos that referenced this pull request Mar 3, 2017
@orsenthil orsenthil mentioned this pull request Mar 3, 2017
orsenthil pushed a commit to mesosphere/dcos that referenced this pull request Mar 4, 2017
@lingmann lingmann merged commit ec228bc into dcos:master Mar 6, 2017
@branden branden deleted the package-variant-validation branch March 7, 2017 01:09
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants