Minimize the places where we set OSES

This doesn't set a default OSES anymore, but instead always makes it explicit for every release. Changing the default meant changing all existing files anyway and this forces it to be up front. It also inherits the OSES for Katello from Foreman, except for where they are different.
theforeman · Jul 30, 2024 · 5018841 · 5018841
1 parent 52739ad
commit 5018841
Show file tree

Hide file tree

Showing 29 changed files with 9 additions and 21 deletions.
diff --git a/releases/client/settings b/releases/client/settings
@@ -1,2 +1,3 @@
 FOREMAN_VERSION=$VERSION
 PACKAGING_SUBDIR="packages/client"
+OSES="el7 el8 el9"
diff --git a/releases/foreman/3.4/settings b/releases/foreman/3.4/settings
@@ -1,2 +1,3 @@
 FULLVERSION='3.4.1'
 FULLGPGKEY='2A6F745AA62DE481567D3AF639D12077F120E13E'
+OSES="el8"
diff --git a/releases/foreman/3.5/settings b/releases/foreman/3.5/settings
@@ -1,2 +1,3 @@
 FULLVERSION='3.5.3'
 FULLGPGKEY='51B9D1D1BADA3F001C8774046F7F9C618F5CA95B'
+OSES="el8"
diff --git a/releases/foreman/3.6/settings b/releases/foreman/3.6/settings
@@ -1,2 +1,3 @@
 FULLVERSION='3.6.2'
 FULLGPGKEY='A21D56E01064415EDC8FC7597803ABC5FED77E93'
+OSES="el8"
diff --git a/releases/foreman/3.7/settings b/releases/foreman/3.7/settings
@@ -1,2 +1,3 @@
 FULLVERSION='3.7.1'
 FULLGPGKEY='DC71C75A8B5438E972C645078FCB3EC0BDCC85AE'
+OSES="el8"
diff --git a/releases/foreman/3.8/settings b/releases/foreman/3.8/settings
@@ -1,2 +1,3 @@
 FULLVERSION='3.8.0'
 FULLGPGKEY='79AAD6C6E922580DBC7BF46A0959620CCBE50FBE'
+OSES="el8"
diff --git a/releases/foreman/3.9/settings b/releases/foreman/3.9/settings
@@ -1,2 +1,3 @@
 FULLVERSION='3.9.3'
 FULLGPGKEY='7EC13BEC88DA66692700BB9ACD9851C256641D7B'
+OSES="el8"
diff --git a/releases/foreman/nightly/settings b/releases/foreman/nightly/settings
@@ -0,0 +1 @@
+OSES="el8 el9"
diff --git a/releases/foreman/settings b/releases/foreman/settings
@@ -1,4 +1,3 @@
 TAR_PROJECTS="foreman foreman-proxy foreman-installer foreman-selinux"
 RPM_PACKAGES=(foreman foreman-installer foreman-proxy foreman-release foreman-selinux)
 PACKAGING_SUBDIR="packages/foreman"
-OSES="el8"
diff --git a/releases/katello/3.13/settings b/releases/katello/3.13/settings
@@ -1,3 +1,2 @@
 FULLVERSION='3.13.4'
 FOREMAN_VERSION='1.23'
-OSES="rhel7"
diff --git a/releases/katello/3.14/settings b/releases/katello/3.14/settings
@@ -1,3 +1,2 @@
 FULLVERSION='3.14.1'
 FOREMAN_VERSION='1.24'
-OSES="rhel7"
diff --git a/releases/katello/3.15/settings b/releases/katello/3.15/settings
@@ -1,3 +1,2 @@
 FULLVERSION='3.15.0-rc2'
 FOREMAN_VERSION='2.0'
-OSES="rhel7"
diff --git a/releases/katello/3.18/settings b/releases/katello/3.18/settings
@@ -1,3 +1,2 @@
 FULLVERSION='3.18.0-rc2'
 FOREMAN_VERSION='2.3'
-OSES="rhel7 el8"
diff --git a/releases/katello/4.0/settings b/releases/katello/4.0/settings
@@ -1,3 +1,2 @@
 FULLVERSION='4.0.1'
 FOREMAN_VERSION='2.4'
-OSES="rhel7 el8"
diff --git a/releases/katello/4.1/settings b/releases/katello/4.1/settings
@@ -1,3 +1,2 @@
 FULLVERSION='4.1.0-rc2'
 FOREMAN_VERSION='2.5'
-OSES="rhel7 el8"
diff --git a/releases/katello/4.10/settings b/releases/katello/4.10/settings
@@ -1,3 +1,2 @@
 FULLVERSION='4.10.0'
 FOREMAN_VERSION='3.8'
-OSES="el8"
diff --git a/releases/katello/4.11/settings b/releases/katello/4.11/settings
@@ -1,3 +1,2 @@
 FULLVERSION='4.11.1'
 FOREMAN_VERSION='3.9'
-OSES="el8"
diff --git a/releases/katello/4.12/settings b/releases/katello/4.12/settings
@@ -1,3 +1,2 @@
 FULLVERSION='4.12.1'
 FOREMAN_VERSION='3.10'
-OSES="el8 el9"
diff --git a/releases/katello/4.13/settings b/releases/katello/4.13/settings
@@ -1,3 +1,2 @@
 FULLVERSION='4.13.1'
 FOREMAN_VERSION='3.11'
-OSES="el8 el9"
diff --git a/releases/katello/4.2/settings b/releases/katello/4.2/settings
@@ -1,3 +1,2 @@
 FULLVERSION='4.2.2'
 FOREMAN_VERSION='3.0'
-OSES="rhel7 el8"
diff --git a/releases/katello/4.3/settings b/releases/katello/4.3/settings
@@ -1,3 +1,2 @@
 FULLVERSION='4.3.1'
 FOREMAN_VERSION='3.1'
-OSES="rhel7 el8"
diff --git a/releases/katello/4.4/settings b/releases/katello/4.4/settings
@@ -1,3 +1,2 @@
 FULLVERSION='4.4.2'
 FOREMAN_VERSION='3.2'
-OSES="rhel7 el8"
diff --git a/releases/katello/4.5/settings b/releases/katello/4.5/settings
@@ -1,3 +1,2 @@
 FULLVERSION='4.5.1'
 FOREMAN_VERSION='3.3'
-OSES="rhel7 el8"
diff --git a/releases/katello/4.6/settings b/releases/katello/4.6/settings
@@ -1,3 +1,2 @@
 FULLVERSION='4.6.0'
 FOREMAN_VERSION='3.4'
-OSES="el8"
diff --git a/releases/katello/4.7/settings b/releases/katello/4.7/settings
@@ -1,3 +1,2 @@
 FULLVERSION='4.7.6'
 FOREMAN_VERSION='3.5'
-OSES="el8"
diff --git a/releases/katello/4.8/settings b/releases/katello/4.8/settings
@@ -1,3 +1,2 @@
 FULLVERSION='4.8.4'
 FOREMAN_VERSION='3.6'
-OSES="el8"
diff --git a/releases/katello/4.9/settings b/releases/katello/4.9/settings
@@ -1,3 +1,2 @@
 FULLVERSION='4.9.2'
 FOREMAN_VERSION='3.7'
-OSES="el8"
diff --git a/releases/plugins/settings b/releases/plugins/settings
@@ -1,3 +1,2 @@
 FOREMAN_VERSION=$VERSION
-OSES="el8"
 PACKAGING_SUBDIR="packages/plugins"
diff --git a/settings b/settings
@@ -44,7 +44,7 @@ fi
 
 SIGNER="[email protected]"
 SIGNER_NAME="Foreman Automatic Signing Key"
-OSES="el8"
+OSES=""
 RPMDIR="$RELEASEDIR/rpms"
 KEYDIR="$RELEASEDIR/gnupg"
 GNUPGHOME="$KEYDIR"