Merge pull request #120 from puppetlabs/eol_platform_cleanup

(maint) Remove EOL platforms
puppetlabs-toy-chest · Nov 16, 2017 · e599428 · e599428
2 parents 3a86859 + 8b7d482
commit e599428
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 5 deletions.
diff --git a/manifests/mock/pe_mockset.pp b/manifests/mock/pe_mockset.pp
@@ -1,15 +1,11 @@
 define rpmbuilder::mock::pe_mockset (
   $mock_root = "/etc/mock",
 ) {
-  rpmbuilder::mock::pe_mock { "pupent-${name}-el4-i386":      pe_ver  => $name, release => '4', arch => 'i386', mock_root => $mock_root, }
-  rpmbuilder::mock::pe_mock { "pupent-${name}-el4-x86_64":    pe_ver  => $name, release => '4', arch => 'x86_64', mock_root => $mock_root, }
   rpmbuilder::mock::pe_mock { "pupent-${name}-el5-i386":      pe_ver  => $name, release => '5', arch => 'i386', mock_root => $mock_root, }
   rpmbuilder::mock::pe_mock { "pupent-${name}-el5-x86_64":    pe_ver  => $name, release => '5', arch => 'x86_64', mock_root => $mock_root, }
   rpmbuilder::mock::pe_mock { "pupent-${name}-el6-i386":      pe_ver  => $name, release => '6', arch => 'i386', mock_root => $mock_root, }
   rpmbuilder::mock::pe_mock { "pupent-${name}-el6-x86_64":    pe_ver  => $name, release => '6', arch => 'x86_64', mock_root => $mock_root, }
   rpmbuilder::mock::pe_mock { "pupent-${name}-el7-x86_64":    pe_ver  => $name, release => '7', arch => 'x86_64', mock_root => $mock_root, }
-  rpmbuilder::mock::pe_mock { "pupent-${name}-sles10-i386":   pe_ver  => $name, dist => "sles", release => '10', sp => 'sp4', arch => 'i386', mock_root => $mock_root, }
-  rpmbuilder::mock::pe_mock { "pupent-${name}-sles10-x86_64": pe_ver  => $name, dist => "sles", release => '10', sp => 'sp4', arch => 'x86_64', mock_root => $mock_root, }
   rpmbuilder::mock::pe_mock { "pupent-${name}-sles11-i386":   pe_ver  => $name, dist => "sles", release => '11', arch => 'i386', mock_root => $mock_root, }
   rpmbuilder::mock::pe_mock { "pupent-${name}-sles11-x86_64": pe_ver  => $name, dist => "sles", release => '11', arch => 'x86_64', mock_root => $mock_root, }
   rpmbuilder::mock::pe_mock { "pupent-${name}-sles12-x86_64": pe_ver  => $name, dist => "sles", release => '12', arch => 'x86_64', mock_root => $mock_root, }

diff --git a/manifests/mock/puppetlabs_mocks.pp b/manifests/mock/puppetlabs_mocks.pp
@@ -1,5 +1,5 @@
 class rpmbuilder::mock::puppetlabs_mocks (
-  $fedora_releases  = ["14","17","20","21","22"],
+  $fedora_releases  = ["14"],
   $el_releases      = ["5","6","7"],
   $sles_releases    = ["11","12"],
   $vendor           = undef,