From 8c4b5b644510402e8441468fde3868f6c080a310 Mon Sep 17 00:00:00 2001 From: Josh Cooper Date: Mon, 3 Jun 2024 10:13:54 -0700 Subject: [PATCH] Rename Amazon 7 to 2 Amazon 7 is an implementation detail, the actual OS is named Amazon 2 --- configs/platforms/amazon-2-aarch64.rb | 3 +++ configs/platforms/amazon-7-aarch64.rb | 3 --- ext/build_defaults.yaml | 6 +++--- 3 files changed, 6 insertions(+), 6 deletions(-) create mode 100644 configs/platforms/amazon-2-aarch64.rb delete mode 100644 configs/platforms/amazon-7-aarch64.rb diff --git a/configs/platforms/amazon-2-aarch64.rb b/configs/platforms/amazon-2-aarch64.rb new file mode 100644 index 0000000000..909adb8826 --- /dev/null +++ b/configs/platforms/amazon-2-aarch64.rb @@ -0,0 +1,3 @@ +platform 'amazon-2-aarch64' do |plat| + plat.inherit_from_default +end diff --git a/configs/platforms/amazon-7-aarch64.rb b/configs/platforms/amazon-7-aarch64.rb deleted file mode 100644 index ac429c5557..0000000000 --- a/configs/platforms/amazon-7-aarch64.rb +++ /dev/null @@ -1,3 +0,0 @@ -platform 'amazon-7-aarch64' do |plat| - plat.inherit_from_default -end diff --git a/ext/build_defaults.yaml b/ext/build_defaults.yaml index 92c9c0f356..1253f8fada 100644 --- a/ext/build_defaults.yaml +++ b/ext/build_defaults.yaml @@ -6,7 +6,7 @@ project: 'puppet-agent' foss_platforms: - amazon-2023-x86_64 - amazon-2023-aarch64 - - amazon-7-aarch64 + - amazon-2-aarch64 - debian-10-amd64 - debian-11-amd64 - debian-11-aarch64 @@ -48,8 +48,8 @@ platform_repos: repo_location: repos/amazon/2023/**/x86_64 - name: amazon-2023-aarch64 repo_location: repos/amazon/2023/**/aarch64 - - name: amazon-7-aarch64 - repo_location: repos/amazon/7/**/aarch64 + - name: amazon-2-aarch64 + repo_location: repos/amazon/2/**/aarch64 - name: el-7-x86_64 repo_location: repos/el/7/**/x86_64 - name: el-8-x86_64