Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

3.12 build system updates #11144

Merged
merged 1 commit into from
Aug 21, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions mock/el8.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -75,15 +75,15 @@ gpgkey=file:///usr/share/distribution-gpg-keys/centos/RPM-GPG-KEY-CentOS-Officia

[foreman]
name=foreman
baseurl=https://yum.theforeman.org/nightly/el8/x86_64/
baseurl=https://yum.theforeman.org/releases/3.12/el8/x86_64/

[foreman-plugins]
name=foreman-plugins
baseurl=https://yum.theforeman.org/plugins/nightly/el8/x86_64/
baseurl=https://yum.theforeman.org/plugins/3.12/el8/x86_64/

[katello]
name=katello
baseurl=https://yum.theforeman.org/katello/nightly/katello/el8/x86_64/
baseurl=https://yum.theforeman.org/katello/4.14/katello/el8/x86_64/

[puppet-7]
name=puppet-7
Expand Down
32 changes: 8 additions & 24 deletions package_manifest.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -184,9 +184,7 @@ foreman_core_packages:
hammer_core_packages: {}
other_core_packages: {}
hosts:
foreman:
source_location: https://ci.theforeman.org/job/foreman-develop-source-release
source_system: jenkins
foreman: {}

other_core_packages:
hosts:
Expand All @@ -199,12 +197,8 @@ other_core_packages:

hammer_core_packages:
hosts:
rubygem-hammer_cli:
source_location: https://ci.theforeman.org/job/hammer-cli-master-source-release
source_system: jenkins
rubygem-hammer_cli_foreman:
source_location: https://ci.theforeman.org/job/hammer-cli-foreman-master-source-release
source_system: jenkins
rubygem-hammer_cli: {}
rubygem-hammer_cli_foreman: {}

ruby_core_packages:
children:
Expand Down Expand Up @@ -475,12 +469,8 @@ foreman_nodejs_packages:
foreman_installer_packages:
hosts:
foreman-fapolicyd: {}
foreman-installer:
source_location: https://ci.theforeman.org/job/foreman-installer-develop-source-release
source_system: jenkins
foreman-selinux:
source_location: https://ci.theforeman.org/job/foreman-selinux-develop-source-release
source_system: jenkins
foreman-installer: {}
foreman-selinux: {}
katello-certs-tools: {}
puppet-agent-oauth: {}
puppet-agent-puppet-strings: {}
Expand All @@ -493,9 +483,7 @@ foreman_installer_packages:

foreman_proxy_packages:
hosts:
foreman-proxy:
source_location: https://ci.theforeman.org/job/smart-proxy-develop-source-release
source_system: jenkins
foreman-proxy: {}
rubygem-concurrent-ruby: {}
rubygem-gssapi: {}
rubygem-rake-compiler: {}
Expand Down Expand Up @@ -563,18 +551,14 @@ katello_packages:
rubygem-foreman_rh_cloud: {}
rubygem-foreman_scc_manager: {}
rubygem-foreman_virt_who_configure: {}
rubygem-katello:
source_location: https://ci.theforeman.org/job/katello-master-source-release
source_system: jenkins
rubygem-katello: {}

katello_hammer_packages:
hosts:
rubygem-hammer_cli_foreman_rh_cloud: {}
rubygem-hammer_cli_foreman_scc_manager: {}
rubygem-hammer_cli_foreman_virt_who_configure: {}
rubygem-hammer_cli_katello:
source_location: https://ci.theforeman.org/job/hammer-cli-katello-master-source-release
source_system: jenkins
rubygem-hammer_cli_katello: {}

katello_ruby_packages:
hosts:
Expand Down
54 changes: 26 additions & 28 deletions packages/foreman/foreman-release/foreman.gpg
Original file line number Diff line number Diff line change
@@ -1,31 +1,29 @@
-----BEGIN PGP PUBLIC KEY BLOCK-----
Version: GnuPG v1.4.13 (GNU/Linux)

mQENBEzaPPkBCADZpJlUyz9PcekBFSu0MR/j+p2/M5zGBGraDHFh3C2S7xw3S/nc
CI0lMj47Gb7Xa3dkoK1nEfMbbiB6B7PurjHxY8YcIvWEn8k1/DO9j4MMXqNBeU/j
shb0KnrMyHDkHx+Yn5jJ5zsXXkuQiThrU7tW3tsEF62hfDceq9ERihQnySDkF/xn
6rpvjjA/UOaotCK35dglIPBHMwgtYvYAClcwsOk8QFKwJnFemvOz0oqQm1NM3F7B
Ps0TlU6g6yDqTzeykeFFD9FFAV2LJYMd10h7yLIBeJQN/Gz899vzQIs9uBKv1gdv
9Z39qH2nPoLf5h9FN08aJeHGFh3jiFsq1/BvABEBAAG0NUZvcmVtYW4gQXJjaGl2
ZSBTaWduaW5nIEtleSA8cGFja2FnZXNAdGhlZm9yZW1hbi5vcmc+iQE4BBMBAgAi
BQJM2jz5AhsDBgsJCAcDAgYVCAIJCgsEFgIDAQIeAQIXgAAKCRBmzwU/53X/B6jO
B/0WpPnHLaWpP8EgUnpN7RPUX6nb9u+Snz+2NVaVDBvLAHxlohClXEo/2WrXIDYk
Ijo5kTWo7X/wMtcbOeX6K7nh7cghIVo95DrOGEipyWJ1BBvnk2cS8pmGkHZzWSRA
SiTgr14nLPWnKvBeho61Kl3jCsBcLve87mvJwzC76jr/4g+H0DF0GaUIAvRZXCXV
NZIEVfT2HKj7RfOh9Qlcx+N6Yo4ovz7ChZMggot1qtJLVYah9fnByJgQ8k2YlwJI
xfQiGj1kjXmAvpqBFGp13prQs7uDHXwD/kerzF4Z/nhVhXW4f0h4yeq1INC2GzXe
pu3V4T8Tfojdbmm23/c2rrPeuQENBEzaPPkBCACq0agi4H2bPwKvx/H3PVKcLCMt
RuY/OtTgdOm/600rqgVMzpXAFtTHMEatoXqWv6V61yVHjmHbLgUDEfV2Sjxw4/d+
pU64AmKphpUvX4oArk2E3Dne4D2RVtO2XE6uPVjJ+GFjn9GTtbJoO/zqLW0dm3S6
vQFOdFbX9XWr9B+wkdseq4F69KB1Nbiex/EN9QCnVKVCrfFE5grhSKSI9XZ0M5lM
6OQddDQRMTxEs0A99r7mJFsWbL5x7ObMhXmBnOEWudyEA/biyxdP8jK9OJssqGJH
sZKrzl9Tc+hgT73TR9Rds84CnKTbWTjycttMZdXXbVFRU2toz4WrxcF82gEPABEB
AAGJAR8EGAECAAkFAkzaPPkCGwwACgkQZs8FP+d1/wdqYgf+IoiXzxlFVA+wQSZB
nvvtwY8EuxjDHZ7Ab9gZeNiqW+Hz97mKCxNLbWJk49nC84DlfCkHl2Gm4z+r+phJ
idONIZR4+fQV/cXrveAHjvHjmgiN+0tpdh4ZGhiyIZO17jGjwGGt+YfIIY43RKIb
KLsP8E+yDO39HKeY1u3QCSqZ+r1dOvT+XgDE4ncfn55/YqKkY6ZeJAtj6iQxvJRG
rlSod2yoZ9kySd3CxFU4ycpiFEKmq4HfVUMWcUVPqx8StvrfkZxGGds9qFmIgtwf
K2hLSHJLKUex8Jh3TJuTgdMKFYVQ5bO7sY5ZnsXKxUvtgLmh2MZTU23IlNS/1aJg
NL93tw==
=LN8V
mQINBGa/YjgBEAC9aBThE8cvYP5D4LlI2Eiud85rd786jBpCTYp0r3sSuwa9Ply5
J2gSIrh2dGL8m/sXcWMclaaanZQeBqKzjBwLUDcJjhZ0VzmQ1WDatMFnrqZ2XfcD
Ak7b9XEtsj5BX96kOvgsw5yCoaVq2PS+hUF9Ua3xLQCAhQucWGqwvhWFCiiQXrWJ
hNbZPRqjoIeA8N7//LjZQrW2PvaNeaxvOaqkSbLji0s7b2g5LvO5bxbh0ZJdWI5z
zbopV9xl+NWBi+V/RosT+St0UzsAS/XE1WJCXCOVddgCb1Qy4vGjIhXZspqDSL+j
GtgamBgxExjJum1fUvBxTKXoQZXjuUcudcMLcVbxxg6ZyKXJ1A8WQmhI/AzwXFs6
mB2NoTghdC6AJyM9uPeeiRfcx5dRww5zo+pC+s0Mw0REQlHyYu+NGr3rrsXcXzNq
MRU5RnKk1PccX/GzEApQqZmRG4UnOuYRaHYMyEFOmR8UwWKhUXUiLgJyECJf3GOf
n9iehxayGLOq2JrOezWKTbNlq8nN8pDI1v0USaid/pU/SYh2AN1Zm/hcFrIkBN5y
dEI1ojMrcX37fJ0OlnHy4GA8okCwUOXtpGaQoucjTTnpTJfRQAHRS5SEgpDCXKng
ZQI64WkHKhHWgNIMkgAT8Wxo3TjGByGUwbyx0Y8aLi7G66M61IUup9eCIQARAQAB
tD5Gb3JlbWFuIEF1dG9tYXRpYyBTaWduaW5nIEtleSAoMy4xMikgPHBhY2thZ2Vz
QHRoZWZvcmVtYW4ub3JnPokCWAQTAQgAQhYhBK64xt2i0zableaqQUxtOyTxgC9k
BQJmv2I4AxsvBAUJAeEzgAULCQgHAgIiAgYVCgkICwIEFgIDAQIeBwIXgAAKCRBM
bTsk8YAvZBJDD/0VR2Yz6u1YiiaSbngohwFZ62Luy1+O3lEgSGD7BhbZrre9H0X8
v9l2AytxBYd/0Sg9ghXKrKUfkYUkqs/IwraL5OHbGBqG79aYj3RGQt95A/CfMod6
66Jngp9zK28r5YA2gZiRopJq0EfOL/pFMbVAdvW1W/tYnJYhOeAR3Yqmih08xO2I
nw4YkConQ1eug/9Z6z+R4oA4pA+FjpDNk9vA0Fp33kdLGheIawtjprwjNJsgMbf1
9WiViVkcAbXebZJ6Pe2T83xz8agezBmd/ZFXzKwwi1Irsa2Ch3ksu47him7Tq+RG
dWjOWrZnH4QP7Y3TMlM9m0wRvlE0raYKRbSG2nt+dz249dd2/ZRknTvdKNrMx5kf
cJq7MtMJG0DWHhcVG8nqycHaWN9YgJR+rUI2i9W1lZkhK1vZvdiFUTMK696as8YG
kdPM26ukvFTBzhpYYKSQw2oITl+sXa5mXTO/qwg7dYfAVjOsfn3zBySszKpg/kca
+CjW+WSSXQO0nf4JOZlUqTV/sQvbETkiq3VrNfLU428l/p02yk6xNI5gDjjVBj0J
fNN2UOvVVsSc168VO84Md9LSDUKMG2QzXWohKrHM0ucJHN1cczMzyYRBbqK+dJda
Ml9jpK4KStUA7JVyhcjmH7Tte/utSeqbdTKVwBsPZkuCMgJHq/x4K1Xf5w==
=W+Er
-----END PGP PUBLIC KEY BLOCK-----
46 changes: 23 additions & 23 deletions repoclosure/yum.conf
Original file line number Diff line number Diff line change
Expand Up @@ -32,9 +32,9 @@ enabled=1
name=el9-puppet-7
baseurl=https://yum.puppetlabs.com/puppet7/el/9/x86_64/

[el9-foreman-client-nightly-staging]
name=Foreman Client nightly EL9
baseurl=https://stagingyum.theforeman.org/client/nightly/el9/x86_64/
[el9-foreman-client-3.12-staging]
name=Foreman Client 3.12 EL9
baseurl=https://stagingyum.theforeman.org/client/3.12/el9/x86_64/

[el8-baseos]
name=AlmaLinux 8 - BaseOS
Expand Down Expand Up @@ -97,38 +97,38 @@ baseurl=https://archives.fedoraproject.org/pub/archive/epel/7/x86_64/
name=el7-puppet-7
baseurl=https://yum.puppetlabs.com/puppet7/el/7/x86_64/

[el9-foreman-nightly-staging]
name=Foreman nightly staging EL9
baseurl=https://stagingyum.theforeman.org/foreman/nightly/el9/x86_64/
[el9-foreman-3.12-staging]
name=Foreman 3.12 staging EL9
baseurl=https://stagingyum.theforeman.org/foreman/3.12/el9/x86_64/
module_hotfixes=1

[el8-foreman-nightly-staging]
[el8-foreman-3.12-staging]
name=Foreman nightly staging EL8
baseurl=https://stagingyum.theforeman.org/foreman/nightly/el8/x86_64/
baseurl=https://stagingyum.theforeman.org/foreman/3.12/el8/x86_64/
module_hotfixes=1

[el8-foreman-plugins-nightly-staging]
name=Foreman Plugins nightly staging EL8
baseurl=https://stagingyum.theforeman.org/plugins/nightly/el8/x86_64/
[el8-foreman-plugins-3.12-staging]
name=Foreman Plugins 3.12 staging EL8
baseurl=https://stagingyum.theforeman.org/plugins/3.12/el8/x86_64/
module_hotfixes=1

[el9-foreman-plugins-nightly-staging]
name=Foreman Plugins nightly staging EL9
baseurl=https://stagingyum.theforeman.org/plugins/nightly/el9/x86_64/
[el9-foreman-plugins-3.12-staging]
name=Foreman Plugins 3.12 staging EL9
baseurl=https://stagingyum.theforeman.org/plugins/3.12/el9/x86_64/
module_hotfixes=1

[el7-foreman-client-nightly-staging]
name=Foreman Client nightly EL7
baseurl=https://stagingyum.theforeman.org/client/nightly/el7/x86_64/
[el7-foreman-client-3.12-staging]
name=Foreman Client 3.12 EL7
baseurl=https://stagingyum.theforeman.org/client/3.12/el7/x86_64/

[el8-katello-nightly-staging]
name=Katello nightly staging EL8
baseurl=https://stagingyum.theforeman.org/katello/nightly/el8/x86_64/
[el8-katello-4.14-staging]
name=Katello 4.14 staging EL8
baseurl=https://stagingyum.theforeman.org/katello/4.14/el8/x86_64/
module_hotfixes=1

[el9-katello-nightly-staging]
name=Katello nightly staging EL9
baseurl=https://stagingyum.theforeman.org/katello/nightly/el9/x86_64/
[el9-katello-4.14-staging]
name=Katello 4.14 staging EL9
baseurl=https://stagingyum.theforeman.org/katello/4.14/el9/x86_64/
module_hotfixes=1

[el8-candlepin-4.4-staging]
Expand Down