theforeman · ekohl · Jul 30, 2024 · Jul 30, 2024
diff --git a/README.md b/README.md
@@ -31,7 +31,6 @@ Below is a listing of access used.
 * Belong to the [Foreman GitHub release-engineering team](https://github.com/orgs/theforeman/teams/release-engineering)
 * [Foreman infrastructure access](https://theforeman.github.io/foreman-infra/#access) including [secrets](https://theforeman.github.io/foreman-infra/secrets/)
 * [Jenkins access](https://theforeman.github.io/foreman-infra/jenkins/#access)
-* [Koji access](https://theforeman.github.io/foreman-infra/koji/#using-koji-as-a-user)
 * [web01 stagingyum access](https://github.com/theforeman/foreman-infra/blob/master/puppet/modules/web/manifests/vhost/stagingyum.pp#L9)
 * [theforeman Fedora group member](https://copr.fedorainfracloud.org/groups/g/theforeman/coprs/) which can be viewed [through Fedora Account System](https://accounts.fedoraproject.org/?next=/group/theforeman/%3F)
 
@@ -165,18 +164,16 @@ Make sure `VERSION` is correct in `settings` and `FULLVERSION` in `releases/$PRO
 ./bump_rpm_packaging
 ./release_packages
 # These steps can happen during the build after RPMs have been built but DEBs are still running
-./download_rpms
-./sign_rpms
-./upload_rpm_signatures
-./upload_rpms
-./process_rpms
+./generate_stage_repository
+./sign_stage_rpms
+./upload_stage_rpms
 ```
 
 When handling non-Foreman releases (currently supported: Katello and Client), set `PROJECT` to the lowercase name of the project and `VERSION` to the version of the project (if it differs from the Foreman one).
 
 ```bash
-PROJECT=client ./download_rpms
-PROJECT=katello VERSION=3.13 ./download_rpms
+PROJECT=client ./generate_stage_repository
+PROJECT=katello VERSION=3.13 ./generate_stage_repository
 ```
 
 ### Generating a new GPG Key for a X.Y release
@@ -214,7 +211,6 @@ Settings can be customized in `settings.local`. The following settings are suppo
 ```sh
 GIT_DIR=$HOME/dev # Projects are cloned here
 GIT_REMOTE=upstream # Git remote for cloned projects
-KOJI_CMD=koji # Invoke koji. Change this if you also have Koji set up for Fedora development
 PACKAGING_PR=true # Create a PR in bump_{deb,rpm}_packaging
 ```
 

diff --git a/deploy_mash_configs b/deploy_mash_configs
diff --git a/download_extras b/download_extras
diff --git a/download_rpms b/download_rpms
diff --git a/procedures/foreman/release.md.erb b/procedures/foreman/release.md.erb
@@ -68,27 +68,13 @@ Note: If for some reason there was an issue with the tarballs that required uplo
   - [ ] [rpm/<%= short_version%>](https://github.com/theforeman/foreman-packaging/pulls?q=is%3Apr+is%3Aopen+base%3Arpm%2F<%= short_version %>)
   - [ ] [deb/<%= short_version%>](https://github.com/theforeman/foreman-packaging/pulls?q=is%3Apr+is%3Aopen+base%3Adeb%2F<%= short_version %>)
 - Sign the RPMs in the release
-<% if Gem::Version.new(foreman_version) < Gem::Version.new('3.9') -%>
-  - [ ] <%= rel_eng_script('download_rpms') %>
-  - [ ] <%= rel_eng_script('sign_rpms') %>
-  - [ ] <%= rel_eng_script('upload_rpm_signatures') %>
-  - [ ] <%= rel_eng_script('upload_rpms') %>
-<% else -%>
   - [ ] <%= rel_eng_script('generate_stage_repository') %>
   - [ ] <%= rel_eng_script('sign_stage_rpms') %>
   - [ ] <%= rel_eng_script('upload_stage_rpms') %>
-<% end -%>
 - Sign RPMs for client repos (call scripts with `PROJECT=client`)
-<% if Gem::Version.new(foreman_version) < Gem::Version.new('3.9') -%>
-  - [ ] <%= rel_eng_script('download_rpms') %>
-  - [ ] <%= rel_eng_script('sign_rpms') %>
-  - [ ] <%= rel_eng_script('upload_rpm_signatures') %>
-  - [ ] <%= rel_eng_script('upload_rpms') %>
-<% else -%>
   - [ ] <%= rel_eng_script('generate_stage_repository') %>
   - [ ] <%= rel_eng_script('sign_stage_rpms') %>
   - [ ] <%= rel_eng_script('upload_stage_rpms') %>
-<% end -%>
 - [ ] Kick off the [release pipeline](https://ci.theforeman.org/job/foreman-<%= short_version %>-release-pipeline/) by calling <%= rel_eng_script('release_pipeline') %>
 - [ ] Kick off the [client pipeline](https://ci.theforeman.org/job/foreman-client-<%= short_version %>-rpm-pipeline/) by calling `PROJECT=client ./release_pipeline`
 - [ ] Kick off the [plugins pipeline](https://ci.theforeman.org/job/foreman-plugins-<%= short_version %>-rpm-pipeline/) by calling <%= rel_eng_script('plugins_pipeline') %>

diff --git a/procedures/katello/release.md.erb b/procedures/katello/release.md.erb
@@ -69,14 +69,10 @@
   - [ ] Use <%= rel_eng_script('bump_rpm_packaging') %>: `PROJECT=katello VERSION=<%= short_version %> ./bump_rpm_packaging`
 - [ ] Merge packaging PR once job is green
 - [ ] Use <%= rel_eng_script('wait_packaging') %> to wait for [Jenkins to build the packages](https://ci.theforeman.org/job/foreman-packaging-rpm-<%= foreman_version %>-release/)
-<% if Gem::Version.new(foreman_version) >= Gem::Version.new('3.9') -%>
 - Sign the RPMs in the release
   - [ ] <%= rel_eng_script('generate_stage_repository') %>
   - [ ] <%= rel_eng_script('sign_stage_rpms') %>
   - [ ] <%= rel_eng_script('upload_stage_rpms') %>
-<% else -%>
-- [ ] <%= rel_eng_script('download_rpms') %>, <%= rel_eng_script('sign_rpms') %>, <%= rel_eng_script('upload_rpm_signatures') %>, <%= rel_eng_script('upload_rpms') %>
-<% end -%>
 - [ ] Use <%= rel_eng_script('release_pipeline') %> to kick off the [release pipeline](https://ci.theforeman.org/job/katello-<%= short_version %>-rpm-pipeline/)
 
 # Once release is out

diff --git a/procedures/pulpcore/update.md.erb b/procedures/pulpcore/update.md.erb
@@ -36,18 +36,7 @@ The `python-pulp_2to3_migration` package is named differently due to a tito bug
 
 Any change to packaging requires signing, as otherwise the repo can't be published.
 
-
-If working with Pulpcore 3.29+:
-
-* [ ] Sign the RPMs in the release, pass `PROJECT=pulpcore` and `VERSION=<%= release %>` to every invocation.
+* - Sign the RPMs in the release, pass `PROJECT=pulpcore` and `VERSION=<%= release %>` to every invocation.
   * [ ] <%= rel_eng_script('generate_stage_repository') %>
   * [ ] <%= rel_eng_script('sign_stage_rpms') %>
   * [ ] <%= rel_eng_script('upload_stage_rpms') %>
-
-If working with Pulpcore 3.28 or less:
-
-* [ ] Sign the RPMs in the release, pass `PROJECT=pulpcore` and `VERSION=<%= release %>` to every invocation.
-  * [ ] [Download](https://github.com/theforeman/theforeman-rel-eng/blob/master/download_rpms)
-  * [ ] [Sign](https://github.com/theforeman/theforeman-rel-eng/blob/master/sign_rpms)
-  * [ ] [Upload RPM signatures](https://github.com/theforeman/theforeman-rel-eng/blob/master/upload_rpm_signatures)
-  * [ ] [Upload RPMs](https://github.com/theforeman/theforeman-rel-eng/blob/master/upload_rpms)
diff --git a/process_rpms b/process_rpms
diff --git a/releases/client/settings b/releases/client/settings
@@ -1,3 +1,2 @@
 FOREMAN_VERSION=$VERSION
-KOJI_TAGS="foreman-client-@VERSION@-@OS@"
 PACKAGING_SUBDIR="packages/client"
diff --git a/releases/foreman/1.23/settings b/releases/foreman/1.23/settings
@@ -1,4 +1,3 @@
 FULLVERSION="1.23.2"
 FULLGPGKEY="4674C97BD8C2A3EF63BCB20788BB5C467B5B366A"
-KOJI_TAGS="foreman-@VERSION@-@OS@ foreman-@VERSION@-nonscl-@OS@ foreman-rails-@VERSION@-@OS@"
 OSES="rhel7"
diff --git a/releases/foreman/1.24/settings b/releases/foreman/1.24/settings
@@ -1,4 +1,3 @@
 FULLVERSION="1.24.3"
 FULLGPGKEY="D885D3D9B12FA857CDECE3F1B76498E45AA9BCAD"
-KOJI_TAGS="foreman-@VERSION@-@OS@ foreman-@VERSION@-nonscl-@OS@ foreman-rails-@VERSION@-@OS@"
 OSES="rhel7"
diff --git a/releases/foreman/2.0/settings b/releases/foreman/2.0/settings
@@ -1,4 +1,3 @@
 FULLVERSION='2.0.3'
 FULLGPGKEY='06ABEFE26C1997E0C9E56508926EA0100579BAEE'
 OSES="rhel7"
-KOJI_TAGS="foreman-@VERSION@-@OS@ foreman-@VERSION@-nonscl-rhel7"
diff --git a/releases/foreman/2.1/settings b/releases/foreman/2.1/settings
@@ -1,4 +1,3 @@
 FULLVERSION='2.1.4'
 FULLGPGKEY='0F71D9EAC889A0F2C2CD8190628005A4B6F08CCF'
 OSES="rhel7 el8"
-KOJI_TAGS="foreman-@VERSION@-@OS@ foreman-@VERSION@-nonscl-rhel7"
diff --git a/releases/foreman/2.2/settings b/releases/foreman/2.2/settings
@@ -1,4 +1,3 @@
 FULLVERSION='2.2.3'
 FULLGPGKEY='939E2FD66DF9A4104869FD182A63B068C7C509FA'
 OSES="rhel7 el8"
-KOJI_TAGS="foreman-@VERSION@-@OS@ foreman-@VERSION@-nonscl-rhel7"
diff --git a/releases/foreman/2.3/settings b/releases/foreman/2.3/settings
@@ -1,4 +1,3 @@
 FULLVERSION='2.3.5'
 FULLGPGKEY='1CC363863DD64AF30638DB79C101586BE0745924'
 OSES="rhel7 el8"
-KOJI_TAGS="foreman-@VERSION@-@OS@ foreman-@VERSION@-nonscl-rhel7"
diff --git a/releases/foreman/2.4/settings b/releases/foreman/2.4/settings
@@ -1,4 +1,3 @@
 FULLVERSION='2.4.1'
 FULLGPGKEY='643253F71B82B1BEAF2E1D4FA439BD55AC2AD9F1'
 OSES="rhel7 el8"
-KOJI_TAGS="foreman-@VERSION@-@OS@ foreman-@VERSION@-nonscl-rhel7"
diff --git a/releases/foreman/2.5/settings b/releases/foreman/2.5/settings
@@ -1,4 +1,3 @@
 FULLVERSION='2.5.4'
 FULLGPGKEY='7EF7E6EA4022F241BB89A149955C283E7522CC3F'
 OSES="rhel7 el8"
-KOJI_TAGS="foreman-@VERSION@-@OS@ foreman-@VERSION@-nonscl-rhel7"
diff --git a/releases/foreman/3.0/settings b/releases/foreman/3.0/settings
@@ -1,4 +1,3 @@
 FULLVERSION='3.0.2'
 FULLGPGKEY='C8B9E30B0DBCAB595E98DF5C965467189B776908'
 OSES="rhel7 el8"
-KOJI_TAGS="foreman-@VERSION@-@OS@ foreman-@VERSION@-nonscl-rhel7"
diff --git a/releases/foreman/3.1/settings b/releases/foreman/3.1/settings
@@ -1,4 +1,3 @@
 FULLVERSION='3.1.3'
 FULLGPGKEY='1CD4BC6A65EB598E53C66E176A3BF4ED1434F5D3'
 OSES="rhel7 el8"
-KOJI_TAGS="foreman-@VERSION@-@OS@ foreman-@VERSION@-nonscl-rhel7"
diff --git a/releases/foreman/3.2/settings b/releases/foreman/3.2/settings
@@ -1,4 +1,3 @@
 FULLVERSION='3.2.1'
 FULLGPGKEY='77F7076DFD4F373EF0F0E9AC8D746ED06DA7EB32'
 OSES="rhel7 el8"
-KOJI_TAGS="foreman-@VERSION@-@OS@ foreman-@VERSION@-nonscl-rhel7"
diff --git a/releases/foreman/3.3/settings b/releases/foreman/3.3/settings
@@ -1,4 +1,3 @@
 FULLVERSION='3.3.1'
 FULLGPGKEY='5E77807805888E7F2F31A50E8321CBCA2A6A4BAA'
 OSES="rhel7 el8"
-KOJI_TAGS="foreman-@VERSION@-@OS@ foreman-@VERSION@-nonscl-rhel7"
diff --git a/releases/foreman/settings b/releases/foreman/settings
@@ -1,5 +1,4 @@
 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"
diff --git a/releases/katello/3.16/settings b/releases/katello/3.16/settings
@@ -1,4 +1,3 @@
 FULLVERSION='3.16.0'
 FOREMAN_VERSION='2.1'
 OSES="rhel7"
-KOJI_TAGS="katello-@VERSION@-@OS@ katello-@VERSION@-thirdparty-candlepin-@OS@ katello-pulpcore-@VERSION@-el7"
diff --git a/releases/katello/3.17/settings b/releases/katello/3.17/settings
@@ -1,4 +1,3 @@
 FULLVERSION='3.17.0'
 FOREMAN_VERSION='2.2'
 OSES="rhel7"
-KOJI_TAGS="katello-@VERSION@-@OS@ katello-@VERSION@-thirdparty-candlepin-@OS@"
diff --git a/releases/katello/3.18/settings b/releases/katello/3.18/settings
@@ -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"
diff --git a/releases/katello/4.0/settings b/releases/katello/4.0/settings
@@ -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"
diff --git a/releases/katello/4.1/settings b/releases/katello/4.1/settings
@@ -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"
diff --git a/releases/katello/4.10/settings b/releases/katello/4.10/settings
@@ -1,4 +1,3 @@
 FULLVERSION='4.10.0'
 FOREMAN_VERSION='3.8'
 OSES="el8"
-KOJI_TAGS="katello-@VERSION@-@OS@ katello-candlepin-@VERSION@-el8"
diff --git a/releases/katello/4.11/settings b/releases/katello/4.11/settings
@@ -1,4 +1,3 @@
 FULLVERSION='4.11.1'
 FOREMAN_VERSION='3.9'
 OSES="el8"
-KOJI_TAGS="katello-@VERSION@-@OS@ katello-candlepin-@VERSION@-el8"
diff --git a/releases/katello/4.12/settings b/releases/katello/4.12/settings
@@ -1,4 +1,3 @@
 FULLVERSION='4.12.1'
 FOREMAN_VERSION='3.10'
 OSES="el8 el9"
-KOJI_TAGS="katello-@VERSION@-@OS@ katello-candlepin-@VERSION@-el8"
diff --git a/releases/katello/4.13/settings b/releases/katello/4.13/settings
@@ -1,4 +1,3 @@
 FULLVERSION='4.13.1'
 FOREMAN_VERSION='3.11'
 OSES="el8 el9"
-KOJI_TAGS="katello-@VERSION@-@OS@ katello-candlepin-@VERSION@-el8"
diff --git a/releases/katello/4.2/settings b/releases/katello/4.2/settings
@@ -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"
diff --git a/releases/katello/4.3/settings b/releases/katello/4.3/settings
@@ -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"
diff --git a/releases/katello/4.4/settings b/releases/katello/4.4/settings
@@ -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"
diff --git a/releases/katello/4.5/settings b/releases/katello/4.5/settings
@@ -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"
diff --git a/releases/katello/4.6/settings b/releases/katello/4.6/settings
@@ -1,4 +1,3 @@
 FULLVERSION='4.6.0'
 FOREMAN_VERSION='3.4'
 OSES="el8"
-KOJI_TAGS="katello-@VERSION@-@OS@ katello-candlepin-@VERSION@-el8"
diff --git a/releases/katello/4.7/settings b/releases/katello/4.7/settings
@@ -1,4 +1,3 @@
 FULLVERSION='4.7.6'
 FOREMAN_VERSION='3.5'
 OSES="el8"
-KOJI_TAGS="katello-@VERSION@-@OS@ katello-candlepin-@VERSION@-el8"
diff --git a/releases/katello/4.8/settings b/releases/katello/4.8/settings
@@ -1,4 +1,3 @@
 FULLVERSION='4.8.4'
 FOREMAN_VERSION='3.6'
 OSES="el8"
-KOJI_TAGS="katello-@VERSION@-@OS@ katello-candlepin-@VERSION@-el8"
diff --git a/releases/katello/4.9/settings b/releases/katello/4.9/settings
@@ -1,4 +1,3 @@
 FULLVERSION='4.9.2'
 FOREMAN_VERSION='3.7'
 OSES="el8"
-KOJI_TAGS="katello-@VERSION@-@OS@ katello-candlepin-@VERSION@-el8"
diff --git a/releases/katello/settings b/releases/katello/settings
@@ -1,5 +1,4 @@
 RPM_PACKAGES=(katello katello-repos rubygem-katello)
-KOJI_TAGS="katello-@VERSION@-@OS@ katello-@VERSION@-thirdparty-candlepin-@OS@"
 PACKAGING_SUBDIR="packages/katello"
 
 GIT_DEVELOP_BRANCH=master

diff --git a/releases/pulpcore/settings b/releases/pulpcore/settings
@@ -1,5 +1,4 @@
 OSES="el7 el8"
-KOJI_TAGS="pulpcore-@VERSION@-@OS@"
 PASS_NAME_GPG="theforeman/releases/pulpcore/$VERSION-gpg"
 PASS_NAME_KEY="theforeman/releases/pulpcore/$VERSION-key"
 SIGNER_NAME="Pulpcore Automatic Signing Key"

diff --git a/settings b/settings
@@ -65,16 +65,11 @@ PACKAGING_DIR="$GIT_DIR/foreman-packaging"
 PACKAGING_GIT_REMOTE=origin
 TAR_PROJECTS=""
 RPM_PACKAGES=()
-KOJI_CMD="${KOJI_CMD:-koji}"
-KOJI_TAGS=""
-KOJI_SSH_TARGET="[email protected]"
 PACKAGING_PR=${PACKAGING_PR:-true}
 GPG_EXPIRE="1y"
 
 load_settings
 
-# Short GPGKEY is used by koji and is the last 8 chars or the full key
-GPGKEY="$(echo ${FULLGPGKEY: -8} | tr '[A-Z]' '[a-z]')"
 HALFGPGKEY="$(echo ${FULLGPGKEY: -16} | tr '[A-Z]' '[a-z]')"
 
 show_gpg_password() {

diff --git a/upload_extras b/upload_extras
diff --git a/upload_rpm_signatures b/upload_rpm_signatures
diff --git a/upload_rpms b/upload_rpms