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

Ma/license check #1674

Merged
merged 8 commits into from
Jun 19, 2019
Merged

Ma/license check #1674

merged 8 commits into from
Jun 19, 2019

Conversation

markan
Copy link
Contributor

@markan markan commented Jun 5, 2019

Description

This updates to chef-15, which requires license acceptance, and adds a license acceptance requirement to chef-server-ctl reconfigure.

This reprises #1672 which was closed because of a github oops. (Don't delete the base branch of a live PR.)

Issues Resolved

[List any existing issues this PR resolves, or any Discourse or
StackOverflow discussion that's relevant]

Check List

@markan markan requested a review from a team June 5, 2019 16:59
@markan markan force-pushed the ma/license-check branch from 6645d75 to bdfc106 Compare June 5, 2019 17:07
Copy link
Member

@marcparadise marcparadise left a comment

Choose a reason for hiding this comment

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

A couple of minor points inline, nothing blocking.

Is 'accept' what we want, or did we want 'accept-no-persist'?

omnibus/omnibus-test.sh Outdated Show resolved Hide resolved
omnibus_overrides.rb Outdated Show resolved Hide resolved
src/chef-server-ctl/bin/chef-server-ctl Show resolved Hide resolved
@markan markan force-pushed the ma/license-check branch 3 times, most recently from 82f0d0d to 7687175 Compare June 12, 2019 17:00
Move external dependencies earlier to avoid rebuilding them when internals change.

Signed-off-by: Mark Anderson <[email protected]>
@markan markan force-pushed the ma/license-check branch 3 times, most recently from 6076725 to e1f8f3b Compare June 17, 2019 22:12
@markan
Copy link
Contributor Author

markan commented Jun 18, 2019

Latest version is running in CI as https://buildkite.com/chef/chef-chef-server-master-omnibus-adhoc/builds/226

@markan markan force-pushed the ma/license-check branch from 7ad8aa7 to b778dab Compare June 18, 2019 16:31
@@ -46,100 +47,122 @@ GEM
specs:
addressable (2.6.0)
public_suffix (>= 2.0.2, < 4.0)
appbundler (0.12.0)
appbundler (0.13.0)
Copy link
Contributor

Choose a reason for hiding this comment

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

Looks like the current build failures are because 0.13.0 got yanked from Rubygems. @lamont-granquist Do you know if this is expected?

Copy link
Contributor

@tyler-ball tyler-ball left a comment

Choose a reason for hiding this comment

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

That accept-no-persist in chef-server-ctl LGTM!

@markan markan force-pushed the ma/license-check branch 3 times, most recently from 4e11a36 to b26bd81 Compare June 18, 2019 22:55
markan added 7 commits June 18, 2019 18:16
Use chef 15, ruby 2.6.3, bundler 1.17.2

Signed-off-by: Mark Anderson <[email protected]>
Use Chef 15, and add license acceptance support to chef-server-ctl reconfigure

Set license acceptance in environment so nested callouts to chef products work

Signed-off-by: Mark Anderson <[email protected]>
This adds license acceptance in chef-server infrastructure to ensure
that everything works correctly.

Signed-off-by: Mark Anderson <[email protected]>
Chef 15 merges nil attributes differently that previous versions. In prior versions a nil with a higher precedence value is dropped in favor of non-nil values at a lower value. In Chef 15 a nil at a higher precedence value is respected.

Signed-off-by: Mark Anderson <[email protected]>
Signed-off-by: Mark Anderson <[email protected]>
@markan markan force-pushed the ma/license-check branch from b26bd81 to 32a66f2 Compare June 19, 2019 01:21
@markan markan merged commit 4666e57 into master Jun 19, 2019
@markan markan deleted the ma/license-check branch June 19, 2019 01:38
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.

3 participants