sync from upstream

This commit is contained in:
Louis Abel 2023-09-22 13:10:08 -07:00
parent 12ba1fb082
commit e04a5e32cf
Signed by: label
GPG Key ID: B37E62D143879B36
11 changed files with 36 additions and 29 deletions

View File

@ -3,6 +3,10 @@ from rocky/variables import *
from shared/all import * from shared/all import *
from rocky/override import * from rocky/override import *
image_build = {}
sigkeys = [None]
signed_packages_wait = 0
signed_packages_retries = 0
global_release = '!RELEASE_FROM_DATE_RESPIN' global_release = '!RELEASE_FROM_DATE_RESPIN'
sigkeys = [None]

View File

@ -6,8 +6,7 @@ RELEASE_SHORT = 'Rocky'
RELEASE_VERSION = '10' RELEASE_VERSION = '10'
VERSION = '10-lh' VERSION = '10-lh'
PKGSET_KOJI_TAG = 'r10-compose' PKGSET_KOJI_TAG = 'r10-bootstrap'
PKGSET_KOJI_MODULE_TAG = 'el9-modules-pending-signed'
RUNROOT_CHANNEL = 'runroot' RUNROOT_CHANNEL = 'runroot'
RUNROOT_TAG = 'r10-build' RUNROOT_TAG = 'r10-build'

View File

@ -38,6 +38,26 @@ filter_packages = [
] ]
filter_modules = [
("^AppStream$", {
"*":
[
"*",
],
}),
("^BaseOS$", {
"*":
[
"*",
],
}),
("^CRB$", {
"*":
[
"*",
],
}),
]
additional_packages = [ additional_packages = [
# Everything contains everything. # Everything contains everything.

View File

@ -12,6 +12,7 @@ lorax_options = [
buildinstall_skip = [ buildinstall_skip = [
EXTRA_BUILDINSTALL_SKIP, EXTRA_BUILDINSTALL_SKIP,
('^Modular$', {'*': True}),
('^Everything$', { ('^Everything$', {
'i386': True, 'i386': True,
}), }),

View File

@ -2,6 +2,7 @@ create_optional_isos = False
createiso_use_xorrisofs = True createiso_use_xorrisofs = True
createiso_skip = [ createiso_skip = [
('^Modular$', {'*': True, 'src': True}),
("^(BaseOS|AppStream|CRB|NFV)$", { ("^(BaseOS|AppStream|CRB|NFV)$", {
# No binary ISOs for BaseOS (but still generate src ISOs) - RCM-41330 # No binary ISOs for BaseOS (but still generate src ISOs) - RCM-41330
# No binary ISOs for AppStream (but still generate src ISOs) - RCM-40356 # No binary ISOs for AppStream (but still generate src ISOs) - RCM-40356

View File

@ -6,8 +6,13 @@ gather_method = {
"^(?!(AppStream|CRB|Buildroot)).*$": { "^(?!(AppStream|CRB|Buildroot)).*$": {
"comps": "deps", "comps": "deps",
"json": "deps", "json": "deps",
"modules": "nodeps",
},
"^(AppStream|CRB|Buildroot)$": {
"comps": "deps",
"json": "deps",
"modules": "nodeps",
}, },
"^(AppStream|CRB|Buildroot)$": "hybrid",
} }
hashed_directories = False hashed_directories = False

View File

@ -20,13 +20,6 @@ comps_file = {
'command': COMPS_COMMAND 'command': COMPS_COMMAND
} }
module_defaults_dir = {
'scm': 'git',
'repo': MODULE_DEFAULTS_REPO,
'branch': MODULE_DEFAULTS_BRANCH,
'dir': '.'
}
variants_file = { variants_file = {
"scm": "git", "scm": "git",
"repo": VARIANTS_REPO, "repo": VARIANTS_REPO,

View File

@ -1,5 +1,5 @@
pkgset_source = "koji" pkgset_source = "koji"
pkgset_koji_tag = PKGSET_KOJI_TAG pkgset_koji_tag = PKGSET_KOJI_TAG
pkgset_koji_module_tag = PKGSET_KOJI_MODULE_TAG pkgset_koji_module_tag = ""
pkgset_inherit_exclusive_arch_to_noarch = False pkgset_inherit_exclusive_arch_to_noarch = False

View File

@ -2,7 +2,6 @@ global RELEASE_NAME
global RELEASE_SHORT global RELEASE_SHORT
global RELEASE_VERSION global RELEASE_VERSION
global PKGSET_KOJI_TAG global PKGSET_KOJI_TAG
global PKGSET_KOJI_MODULE_TAG
global RUNROOT_CHANNEL global RUNROOT_CHANNEL
global RUNROOT_TAG global RUNROOT_TAG
global RELEASE_VERSION global RELEASE_VERSION
@ -15,8 +14,6 @@ global COMPS_REPO
global COMPS_BRANCH global COMPS_BRANCH
global COMPS_FILE global COMPS_FILE
global COMPS_COMMAND global COMPS_COMMAND
global MODULE_DEFAULTS_REPO
global MODULE_DEFAULTS_BRANCH
global VARIANTS_REPO global VARIANTS_REPO
global VARIANTS_BRANCH global VARIANTS_BRANCH
global VARIANTS_FILE global VARIANTS_FILE

View File

@ -11,7 +11,7 @@ if [[ ! "${BRANCH}" =~ "r10s" ]]; then
fi fi
echo "Fetching from upstream" echo "Fetching from upstream"
git fetch https://gitlab.com/redhat/centos-stream/release-engineering/pungi-centos.git centos-9-stream git fetch https://gitlab.com/redhat/centos-stream/release-engineering/pungi-centos.git centos-10-stream
echo "Formatting patch and applying..." echo "Formatting patch and applying..."
git format-patch --stdout ${HOWMANY} FETCH_HEAD | sed -e 's|centos/|rocky/|' | git apply git format-patch --stdout ${HOWMANY} FETCH_HEAD | sed -e 's|centos/|rocky/|' | git apply
echo "!! DIFF OF CHANGES !!" echo "!! DIFF OF CHANGES !!"

View File

@ -151,16 +151,6 @@
<environment display_order="1">graphical-server-environment</environment> <environment display_order="1">graphical-server-environment</environment>
<environment display_order="4">workstation-product-environment</environment> <environment display_order="4">workstation-product-environment</environment>
</environments> </environments>
<modules>
<module>maven:3.8</module>
<module>nginx:1.22</module>
<module>nodejs:18</module>
<module>nodejs:20</module>
<module>php:8.1</module>
<module>postgresql:15</module>
<module>redis:7</module>
<module>ruby:3.1</module>
</modules>
</variant> </variant>
<variant id="CRB" name="CodeReady Builder" type="variant"> <variant id="CRB" name="CodeReady Builder" type="variant">
<arches> <arches>
@ -173,9 +163,6 @@
<groups> <groups>
<group default="true">crb</group> <group default="true">crb</group>
</groups> </groups>
<modules>
<module>swig:4.1</module>
</modules>
</variant> </variant>