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

Switch CentOS 7 to new AWS account owner, add CentOS stream to search #597

Merged
merged 1 commit into from
Mar 9, 2023
Merged

Switch CentOS 7 to new AWS account owner, add CentOS stream to search #597

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
25 changes: 1 addition & 24 deletions lib/kitchen/driver/aws/standard_platform/centos.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,43 +24,20 @@ class Centos < StandardPlatform
StandardPlatform.platforms["centos"] = self

CENTOS_OWNER_ID = "125523088429".freeze
PRODUCT_CODES = {
"6" => "6x5jmcajty9edm3f211pqjfn2",
"7" => "aw0evgkw8e5c1q413zgy5pjce",
# It appears that v8 is not published to the
# AWS marketplace and hence does not have a product code
}.freeze

# default username for this platform's ami
# @return [String]
def username
# Centos 6.x images use root as the username (but the "centos 6"
# updateable image uses "centos")
return "root" if version && version.start_with?("6.")

"centos"
end

def image_search
# Version 8+ are published directly, not to the AWS marketplace. Use OWNER ID.
search = {
"owner-id" => CENTOS_OWNER_ID,
"name" => ["CentOS #{version}*", "CentOS-#{version}*-GA-*"],
"name" => ["CentOS #{version}*", "CentOS-#{version}*-GA-*", "CentOS Linux #{version}*", "CentOS Stream #{version}*"],
}

if version && version.split(".").first.to_i < 8
# Versions <8 are published to the AWS marketplace and use a different naming convention
search = {
"owner-alias" => "aws-marketplace",
"name" => ["CentOS Linux #{version}*", "CentOS-#{version}*-GA-*"],
}
# For versions published to aws-marketplace, additionally filter on product code to
# avoid non-official AMIs. Can't use CentOS owner ID here, as the owner ID is that of aws marketplace.
# https://github.com/test-kitchen/kitchen-ec2/issues/456
PRODUCT_CODES.keys.each do |major_version|
search["product-code"] = PRODUCT_CODES[major_version] if version.start_with?(major_version)
end
end
search["architecture"] = architecture if architecture
search
end
Expand Down
32 changes: 7 additions & 25 deletions spec/kitchen/driver/aws/image_selection_spec.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,42 +81,24 @@ def new_instance(platform_name: "blarghle")

"centos" => [
{ name: "owner-id", values: %w{125523088429} },
{ name: "name", values: ["CentOS *", "CentOS-*-GA-*"] },
{ name: "name", values: ["CentOS *", "CentOS-*-GA-*", "CentOS Linux *", "CentOS Stream *"] },
],
"centos-8" => [
{ name: "owner-id", values: %w{125523088429} },
{ name: "name", values: ["CentOS 8*", "CentOS-8*-GA-*"] },
{ name: "name", values: ["CentOS 8*", "CentOS-8*-GA-*", "CentOS Linux 8*", "CentOS Stream 8*"] },
],
"centos-7" => [
{ name: "owner-alias", values: %w{aws-marketplace} },
{ name: "name", values: ["CentOS Linux 7*", "CentOS-7*-GA-*"] },
{ name: "product-code", values: ["aw0evgkw8e5c1q413zgy5pjce"] },
],
"centos-6" => [
{ name: "owner-alias", values: %w{aws-marketplace} },
{ name: "name", values: ["CentOS Linux 6*", "CentOS-6*-GA-*"] },
{ name: "product-code", values: ["6x5jmcajty9edm3f211pqjfn2"] },
],
"centos-6.3" => [
{ name: "owner-alias", values: %w{aws-marketplace} },
{ name: "name", values: ["CentOS Linux 6.3*", "CentOS-6.3*-GA-*"] },
{ name: "product-code", values: ["6x5jmcajty9edm3f211pqjfn2"] },
{ name: "owner-id", values: %w{125523088429} },
{ name: "name", values: ["CentOS 7*", "CentOS-7*-GA-*", "CentOS Linux 7*", "CentOS Stream 7*"] },
],
"centos-x86_64" => [
{ name: "owner-id", values: %w{125523088429} },
{ name: "name", values: ["CentOS *", "CentOS-*-GA-*"] },
{ name: "architecture", values: %w{x86_64} },
],
"centos-6.3-x86_64" => [
{ name: "owner-alias", values: %w{aws-marketplace} },
{ name: "name", values: ["CentOS Linux 6.3*", "CentOS-6.3*-GA-*"] },
{ name: "product-code", values: ["6x5jmcajty9edm3f211pqjfn2"] },
{ name: "name", values: ["CentOS *", "CentOS-*-GA-*", "CentOS Linux *", "CentOS Stream *"] },
{ name: "architecture", values: %w{x86_64} },
],
"centos-7-x86_64" => [
{ name: "owner-alias", values: %w{aws-marketplace} },
{ name: "name", values: ["CentOS Linux 7*", "CentOS-7*-GA-*"] },
{ name: "product-code", values: ["aw0evgkw8e5c1q413zgy5pjce"] },
{ name: "owner-id", values: %w{125523088429} },
{ name: "name", values: ["CentOS 7*", "CentOS-7*-GA-*", "CentOS Linux 7*", "CentOS Stream 7*"] },
{ name: "architecture", values: %w{x86_64} },
],

Expand Down