diff --git a/README.md b/README.md index 5e1f1e1..83e7ea7 100644 --- 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 deleted file mode 100755 index 983e1f5..0000000 --- a/deploy_mash_configs +++ /dev/null @@ -1,7 +0,0 @@ -#!/bin/bash -e - -. settings - -./ensure_clean_git_checkouts tool_belt > /dev/null - -scp "${GIT_DIR}/tool_belt/mash_scripts/${PROJECT}/${VERSION}.0"/*.mash "${KOJI_SSH_TARGET}:/etc/mash/" diff --git a/download_extras b/download_extras deleted file mode 100755 index c7f0c37..0000000 --- a/download_extras +++ /dev/null @@ -1,6 +0,0 @@ -#!/bin/bash -e - -. settings - -mkdir -p $EXTRASDIR -scp -r root@koji.katello.org:/mnt/koji/releases/extras/foreman-$VERSION-rhel7-dist/x86_64/* $EXTRASDIR/ diff --git a/download_rpms b/download_rpms deleted file mode 100755 index 612fa59..0000000 --- a/download_rpms +++ /dev/null @@ -1,24 +0,0 @@ -#!/bin/bash -e - -. settings - -mkdir -p "$RPMDIR" -cd "$RPMDIR" - -tags="" - -for os in $OSES; do - versioned_tags=$(echo ${KOJI_TAGS} | sed "s/@VERSION@/$VERSION/g; s/@OS@/$os/g") - for tag in ${versioned_tags}; do - tags="$tags $tag" - done - tags=$(echo $tags | sed 's/ /\n/g'| sort -u | xargs) -done - -for tag in $tags; do - $KOJI_CMD list-tagged --latest --quiet --inherit --sigs $tag -done \ - | sed 's!^!:!' \ - | perl -ane '$F[1] =~ s!\.src$!! or next; $R{$F[1]} = 1; $S{$F[1]} = 1 if lc($F[0]) eq lc(":'$GPGKEY'"); - END { print map "$_\n", grep { not exists $S{$_} } sort keys %R }' \ - | xargs --no-run-if-empty -P 2 -n 1 $KOJI_CMD download-build --debuginfo diff --git a/procedures/foreman/release.md.erb b/procedures/foreman/release.md.erb index 453b536..2327f72 100644 --- 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 index 34a8a7a..ad7e05d 100644 --- 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 index e323a63..21e1979 100644 --- 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 deleted file mode 100755 index 5c643cf..0000000 --- a/process_rpms +++ /dev/null @@ -1,7 +0,0 @@ -#!/bin/bash -e - -. settings - -PROCESSED_DIR="$RPMDIR.processed" -mkdir -p "$PROCESSED_DIR" -mv -i "$RPMDIR"/* "$PROCESSED_DIR" diff --git a/releases/client/settings b/releases/client/settings index ce84943..991f1dc 100644 --- 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 index 07f7d15..4b4b7d5 100644 --- 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 index 0b771ba..52fc87e 100644 --- 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 index 504ac12..54af4a4 100644 --- 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 index 7176959..98db967 100644 --- 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 index d967b33..bd4896d 100644 --- 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 index a4adfef..b44885e 100644 --- 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 index 91addc7..923e5c9 100644 --- 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 index c907b98..1d81ef7 100644 --- 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 index 39c7435..840a4c3 100644 --- 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 index 732bb83..94c9b19 100644 --- 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 index 39178d2..1086f7e 100644 --- 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 index 122ced1..7c18a7c 100644 --- 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 index 19c377f..f96d6c4 100644 --- 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 index 2bef2aa..80d4fbf 100644 --- 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 index 6029b2e..58670de 100644 --- 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 index 1ade0fd..436c0a4 100644 --- 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 index d3b7c00..4b73847 100644 --- 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 index 423ab76..3cc0ecf 100644 --- 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 index 118fe1e..81b9e06 100644 --- 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 index bbf8748..2718d84 100644 --- 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 index f5acfef..1debc97 100644 --- 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 index 0ae3bdd..a59e18b 100644 --- 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 index ce566e1..bca55fc 100644 --- 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 index 3bd2faa..da2c790 100644 --- 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 index 6149f9e..7b8f847 100644 --- 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 index b20a092..ce42758 100644 --- 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 index 4d09d94..3475ee9 100644 --- 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 index 6a7ee72..9d2a335 100644 --- 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 index f923c20..dc508c0 100644 --- 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 index d66faf7..1d958cc 100644 --- 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 index 9f8a3db..36a163c 100644 --- 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 index 6ced34d..c54d723 100644 --- 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 index 7cf5fe3..4891f57 100644 --- 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="root@koji.katello.org" 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 deleted file mode 100755 index e4063b2..0000000 --- a/upload_extras +++ /dev/null @@ -1,5 +0,0 @@ -#!/bin/bash -e - -. settings - -scp -r $EXTRASDIR/* root@koji.katello.org:/mnt/koji/releases/extras/foreman-$VERSION-rhel7-dist/x86_64/ diff --git a/upload_rpm_signatures b/upload_rpm_signatures deleted file mode 100755 index a54d0d6..0000000 --- a/upload_rpm_signatures +++ /dev/null @@ -1,5 +0,0 @@ -#!/bin/bash -e - -. settings - -find "$RPMDIR" -name '*.rpm' | xargs $XARGS_JOBS $KOJI_CMD import-sig diff --git a/upload_rpms b/upload_rpms deleted file mode 100755 index 668fbdd..0000000 --- a/upload_rpms +++ /dev/null @@ -1,5 +0,0 @@ -#!/bin/bash -e - -. settings - -find "$RPMDIR" -name '*.src.rpm' | xargs -I@@ basename @@ .src.rpm | xargs -t $XARGS_JOBS $KOJI_CMD write-signed-rpm $(echo $GPGKEY | tr 'A-Z' 'a-z')