Skip to content

Commit

Permalink
Minimize the places where we set OSES
Browse files Browse the repository at this point in the history 
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.
  • Loading branch information
@ekohl
ekohl committed Jul 30, 2024
1 parent ac8eab4 commit a3f9867
Show file tree
Hide file tree
Showing 29 changed files with 9 additions and 21 deletions.
1 change: 1 addition & 0 deletions releases/client/settings
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
FOREMAN_VERSION=$VERSION
KOJI_TAGS="foreman-client-@VERSION@-@OS@"
PACKAGING_SUBDIR="packages/client"
OSES="el7 el8 el9"
1 change: 1 addition & 0 deletions releases/foreman/3.4/settings
View file
Original file line number Diff line number Diff line change
@@ -1,2 +1,3 @@
FULLVERSION='3.4.1'
FULLGPGKEY='2A6F745AA62DE481567D3AF639D12077F120E13E'
OSES="el8"
1 change: 1 addition & 0 deletions releases/foreman/3.5/settings
View file
Original file line number Diff line number Diff line change
@@ -1,2 +1,3 @@
FULLVERSION='3.5.3'
FULLGPGKEY='51B9D1D1BADA3F001C8774046F7F9C618F5CA95B'
OSES="el8"
1 change: 1 addition & 0 deletions releases/foreman/3.6/settings
View file
Original file line number Diff line number Diff line change
@@ -1,2 +1,3 @@
FULLVERSION='3.6.2'
FULLGPGKEY='A21D56E01064415EDC8FC7597803ABC5FED77E93'
OSES="el8"
1 change: 1 addition & 0 deletions releases/foreman/3.7/settings
View file
Original file line number Diff line number Diff line change
@@ -1,2 +1,3 @@
FULLVERSION='3.7.1'
FULLGPGKEY='DC71C75A8B5438E972C645078FCB3EC0BDCC85AE'
OSES="el8"
1 change: 1 addition & 0 deletions releases/foreman/3.8/settings
View file
Original file line number Diff line number Diff line change
@@ -1,2 +1,3 @@
FULLVERSION='3.8.0'
FULLGPGKEY='79AAD6C6E922580DBC7BF46A0959620CCBE50FBE'
OSES="el8"
1 change: 1 addition & 0 deletions releases/foreman/3.9/settings
View file
Original file line number Diff line number Diff line change
@@ -1,2 +1,3 @@
FULLVERSION='3.9.3'
FULLGPGKEY='7EC13BEC88DA66692700BB9ACD9851C256641D7B'
OSES="el8"
1 change: 1 addition & 0 deletions releases/foreman/nightly/settings
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
OSES="el8 el9"
1 change: 0 additions & 1 deletion releases/foreman/settings
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,3 @@ TAR_PROJECTS="foreman foreman-proxy foreman-installer foreman-selinux"
RPM_PACKAGES=(foreman foreman-installer foreman-proxy foreman-release foreman-selinux)
KOJI_TAGS="foreman-@VERSION@-@OS@"
PACKAGING_SUBDIR="packages/foreman"
OSES="el8"
1 change: 0 additions & 1 deletion releases/katello/3.13/settings
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,2 @@
FULLVERSION='3.13.4'
FOREMAN_VERSION='1.23'
OSES="rhel7"
1 change: 0 additions & 1 deletion releases/katello/3.14/settings
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,2 @@
FULLVERSION='3.14.1'
FOREMAN_VERSION='1.24'
OSES="rhel7"
1 change: 0 additions & 1 deletion releases/katello/3.15/settings
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,2 @@
FULLVERSION='3.15.0-rc2'
FOREMAN_VERSION='2.0'
OSES="rhel7"
1 change: 0 additions & 1 deletion releases/katello/3.18/settings
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
FULLVERSION='3.18.0-rc2'
FOREMAN_VERSION='2.3'
OSES="rhel7 el8"
KOJI_TAGS="katello-@VERSION@-@OS@ katello-@VERSION@-thirdparty-candlepin-rhel7 katello-candlepin-@VERSION@-el8"
1 change: 0 additions & 1 deletion releases/katello/4.0/settings
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
FULLVERSION='4.0.1'
FOREMAN_VERSION='2.4'
OSES="rhel7 el8"
KOJI_TAGS="katello-@VERSION@-@OS@ katello-@VERSION@-thirdparty-candlepin-rhel7 katello-candlepin-@VERSION@-el8"
1 change: 0 additions & 1 deletion releases/katello/4.1/settings
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
FULLVERSION='4.1.0-rc2'
FOREMAN_VERSION='2.5'
OSES="rhel7 el8"
KOJI_TAGS="katello-@VERSION@-@OS@ katello-@VERSION@-thirdparty-candlepin-rhel7 katello-candlepin-@VERSION@-el8"
1 change: 0 additions & 1 deletion releases/katello/4.10/settings
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
FULLVERSION='4.10.0'
FOREMAN_VERSION='3.8'
OSES="el8"
KOJI_TAGS="katello-@VERSION@-@OS@ katello-candlepin-@VERSION@-el8"
1 change: 0 additions & 1 deletion releases/katello/4.11/settings
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
FULLVERSION='4.11.1'
FOREMAN_VERSION='3.9'
OSES="el8"
KOJI_TAGS="katello-@VERSION@-@OS@ katello-candlepin-@VERSION@-el8"
1 change: 0 additions & 1 deletion releases/katello/4.12/settings
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
FULLVERSION='4.12.1'
FOREMAN_VERSION='3.10'
OSES="el8 el9"
KOJI_TAGS="katello-@VERSION@-@OS@ katello-candlepin-@VERSION@-el8"
1 change: 0 additions & 1 deletion releases/katello/4.13/settings
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
FULLVERSION='4.13.1'
FOREMAN_VERSION='3.11'
OSES="el8 el9"
KOJI_TAGS="katello-@VERSION@-@OS@ katello-candlepin-@VERSION@-el8"
1 change: 0 additions & 1 deletion releases/katello/4.2/settings
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
FULLVERSION='4.2.2'
FOREMAN_VERSION='3.0'
OSES="rhel7 el8"
KOJI_TAGS="katello-@VERSION@-@OS@ katello-@VERSION@-thirdparty-candlepin-rhel7 katello-candlepin-@VERSION@-el8"
1 change: 0 additions & 1 deletion releases/katello/4.3/settings
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
FULLVERSION='4.3.1'
FOREMAN_VERSION='3.1'
OSES="rhel7 el8"
KOJI_TAGS="katello-@VERSION@-@OS@ katello-@VERSION@-thirdparty-candlepin-rhel7 katello-candlepin-@VERSION@-el8"
1 change: 0 additions & 1 deletion releases/katello/4.4/settings
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
FULLVERSION='4.4.2'
FOREMAN_VERSION='3.2'
OSES="rhel7 el8"
KOJI_TAGS="katello-@VERSION@-@OS@ katello-@VERSION@-thirdparty-candlepin-rhel7 katello-candlepin-@VERSION@-el8"
1 change: 0 additions & 1 deletion releases/katello/4.5/settings
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
FULLVERSION='4.5.1'
FOREMAN_VERSION='3.3'
OSES="rhel7 el8"
KOJI_TAGS="katello-@VERSION@-@OS@ katello-@VERSION@-thirdparty-candlepin-rhel7 katello-candlepin-@VERSION@-el8"
1 change: 0 additions & 1 deletion releases/katello/4.6/settings
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
FULLVERSION='4.6.0'
FOREMAN_VERSION='3.4'
OSES="el8"
KOJI_TAGS="katello-@VERSION@-@OS@ katello-candlepin-@VERSION@-el8"
1 change: 0 additions & 1 deletion releases/katello/4.7/settings
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
FULLVERSION='4.7.6'
FOREMAN_VERSION='3.5'
OSES="el8"
KOJI_TAGS="katello-@VERSION@-@OS@ katello-candlepin-@VERSION@-el8"
1 change: 0 additions & 1 deletion releases/katello/4.8/settings
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
FULLVERSION='4.8.4'
FOREMAN_VERSION='3.6'
OSES="el8"
KOJI_TAGS="katello-@VERSION@-@OS@ katello-candlepin-@VERSION@-el8"
1 change: 0 additions & 1 deletion releases/katello/4.9/settings
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
FULLVERSION='4.9.2'
FOREMAN_VERSION='3.7'
OSES="el8"
KOJI_TAGS="katello-@VERSION@-@OS@ katello-candlepin-@VERSION@-el8"
1 change: 0 additions & 1 deletion releases/plugins/settings
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,2 @@
FOREMAN_VERSION=$VERSION
OSES="el8"
PACKAGING_SUBDIR="packages/plugins"
2 changes: 1 addition & 1 deletion settings
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down

0 comments on commit a3f9867

Please sign in to comment.