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

Make Debian 10 the Debian default #492

Merged
merged 2 commits into from
May 17, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .rspec
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
--color
--require spec_helper
--format progress
--format documentation
3 changes: 2 additions & 1 deletion lib/kitchen/driver/aws/standard_platform/debian.rb
Original file line number Diff line number Diff line change
Expand Up @@ -26,12 +26,13 @@ class Debian < StandardPlatform
# 10/11 are listed last since we default to the first item in the hash
# and 10/11 are not released yet. When they're released move them up
DEBIAN_CODENAMES = {
10 => "buster",
9 => "stretch",
8 => "jessie",
7 => "wheezy",
6 => "squeeze",
11 => "bullseye",
10 => "buster",
12 => "bookworm",
}.freeze

# default username for this platform's ami
Expand Down
8 changes: 6 additions & 2 deletions spec/kitchen/driver/aws/image_selection_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -112,7 +112,11 @@ def new_instance(platform_name: "blarghle")

"debian" => [
{ name: "owner-id", values: %w{379101102735} },
{ name: "name", values: %w{debian-stretch-*} },
{ name: "name", values: %w{debian-buster-*} },
],
"debian-10" => [
{ name: "owner-id", values: %w{379101102735} },
{ name: "name", values: %w{debian-buster-*} },
],
"debian-9" => [
{ name: "owner-id", values: %w{379101102735} },
Expand All @@ -136,7 +140,7 @@ def new_instance(platform_name: "blarghle")
],
"debian-x86_64" => [
{ name: "owner-id", values: %w{379101102735} },
{ name: "name", values: %w{debian-stretch-*} },
{ name: "name", values: %w{debian-buster-*} },
{ name: "architecture", values: %w{x86_64} },
],
"debian-6-x86_64" => [
Expand Down