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

Update kitchen config for more platforms #213

Merged
merged 9 commits into from
Jun 27, 2018
Merged

Update kitchen config for more platforms #213

merged 9 commits into from
Jun 27, 2018

Conversation

tas50
Copy link
Contributor

@tas50 tas50 commented May 10, 2018

Simplify the configs by using dokken images and bento slugs. Make sure to fail on deprecation warnings to keep the cookbook ready for upcoming chef releases. Also add testing of Debian 9 / Ubuntu 18.04 and remove EOL Debian 7

@coveralls
Copy link

coveralls commented May 10, 2018

Coverage Status

Coverage remained the same at 100.0% when pulling c626845 on tas50:update_kitchen into 4c0f7ae on dev-sec:master.

Copy link
Member

@artem-sidorenko artem-sidorenko left a comment

Choose a reason for hiding this comment

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

@tas50 thank you! Looks good to me. May I ask you to add debian-9 to the DO tests?

@@ -23,9 +23,6 @@ platforms:
- name: centos-7
driver_config:
image: centos-7-x64
- name: debian-7
driver_config:
image: debian-7-x64
- name: debian-8
driver_config:
image: debian-8-x64
Copy link
Member

Choose a reason for hiding this comment

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

@tas50 can you please add debian-9 here? image is debian-9-x64

@@ -20,20 +20,20 @@ env:
- INSTANCE=centos-6 KITCHEN_LOCAL_YAML=.kitchen.do.yml
- INSTANCE=centos-7 KITCHEN_LOCAL_YAML=.kitchen.do.yml
- INSTANCE=centos-7 CHEF_VERSION=12.14.60 KITCHEN_LOCAL_YAML=.kitchen.do.yml
- INSTANCE=debian-7 KITCHEN_LOCAL_YAML=.kitchen.do.yml
- INSTANCE=debian-8 KITCHEN_LOCAL_YAML=.kitchen.do.yml
Copy link
Member

Choose a reason for hiding this comment

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

@tas50 can you please add debian-9 here?

Copy link
Member

@chris-rock chris-rock left a comment

Choose a reason for hiding this comment

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

@tas50 Thank you for this improvement. I propose we split Ubuntu 18.04 into own PR, since we need to investigate why the log group from the baseline does not fit https://github.com/dev-sec/linux-baseline/blob/master/controls/os_spec.rb#L21

<% if ENV['CHEF_VERSION'] %>
chef_version: <%= ENV['CHEF_VERSION'] %>
<% end %>
chef_version: <%= ENV['CHEF_VERSION'] || 'current' %>
Copy link
Member

Choose a reason for hiding this comment

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

+1

tas50 and others added 9 commits June 27, 2018 09:37
It's EOL

Signed-off-by: Tim Smith <[email protected]>
Signed-off-by: Tim Smith <[email protected]>

Signed-off-by: Tim Smith <[email protected]>
Add Ubuntu 18.04 / Debian 9

We push bento images named after the major release now that get updated for all the minors. No need to update the config all the time with the new box names

Signed-off-by: Tim Smith <[email protected]>
Add Ubuntu 18.04 / Debian 9
Use the dokken images that already have packages like procps in them
Order the platforms alphabetically

Signed-off-by: Tim Smith <[email protected]>
till we resolved all problems

Signed-off-by: Artem Sidorenko <[email protected]>
@chris-rock chris-rock merged commit aa9202b into dev-sec:master Jun 27, 2018
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants