Merge pull request #722 from imaqsood/PA-6277

joshcooper · web-flow · commit 89688c83ad09 · 2024-06-10T10:16:05.000-07:00
(PA-6277) change manifests for amazon 2 repo
diff --git a/manifests/osfamily/redhat.pp b/manifests/osfamily/redhat.pp
@@ -20,7 +20,6 @@
       'Amazon': {
         $major_version = $facts['os']['release']['major']
         $amz_el_version = "${major_version}" ? {
-          '2'              => '7',
           /^(2017|2018)$/  => '6',
           default          => $major_version,
         }
diff --git a/spec/classes/puppet_agent_osfamily_redhat_spec.rb b/spec/classes/puppet_agent_osfamily_redhat_spec.rb
@@ -21,7 +21,7 @@
     }
   end
 
-  [['Rocky', 'el/8', 8], ['AlmaLinux', 'el/8', 8], ['Fedora', 'fedora/f36', 36], ['CentOS', 'el/7', 7], ['Amazon', 'el/6', 2017], ['Amazon', 'el/6', 2018], ['Amazon', 'el/7', 2], ['Amazon', 'amazon/2023', 2023]].each do |os, urlbit, osmajor|
+  [['Rocky', 'el/8', 8], ['AlmaLinux', 'el/8', 8], ['Fedora', 'fedora/f36', 36], ['CentOS', 'el/7', 7], ['Amazon', 'el/6', 2017], ['Amazon', 'el/6', 2018], ['Amazon', 'amazon/2', 2], ['Amazon', 'amazon/2023', 2023]].each do |os, urlbit, osmajor|
     context "with #{os} and #{urlbit}" do
       let(:facts) do
         override_facts(super(), os: { name: os, release: { major: osmajor, }, })

Original file line number	Diff line number	Diff line change
`@@ -20,7 +20,6 @@`
`20`	`20`	`'Amazon': {`
`21`	`21`	`$major_version = $facts['os']['release']['major']`
`22`	`22`	`$amz_el_version = "${major_version}" ? {`
`23`		`- '2' => '7',`
`24`	`23`	`/^(2017\|2018)$/ => '6',`
`25`	`24`	`default => $major_version,`
`26`	`25`	`}`
Original file line number	Diff line number	Diff line change
`@@ -21,7 +21,7 @@`
`21`	`21`	`}`
`22`	`22`	`end`
`23`	`23`
`24`		`- [['Rocky', 'el/8', 8], ['AlmaLinux', 'el/8', 8], ['Fedora', 'fedora/f36', 36], ['CentOS', 'el/7', 7], ['Amazon', 'el/6', 2017], ['Amazon', 'el/6', 2018], ['Amazon', 'el/7', 2], ['Amazon', 'amazon/2023', 2023]].each do \|os, urlbit, osmajor\|`
	`24`	`+ [['Rocky', 'el/8', 8], ['AlmaLinux', 'el/8', 8], ['Fedora', 'fedora/f36', 36], ['CentOS', 'el/7', 7], ['Amazon', 'el/6', 2017], ['Amazon', 'el/6', 2018], ['Amazon', 'amazon/2', 2], ['Amazon', 'amazon/2023', 2023]].each do \|os, urlbit, osmajor\|`
`25`	`25`	`context "with #{os} and #{urlbit}" do`
`26`	`26`	`let(:facts) do`
`27`	`27`	`override_facts(super(), os: { name: os, release: { major: osmajor, }, })`