From 8028c26a0f52ce057c16accc917b7bb421ea77ca Mon Sep 17 00:00:00 2001 From: Louis Abel Date: Tue, 15 Oct 2024 00:52:47 -0700 Subject: [PATCH] add obvious lookahead vars --- rocky-lookahead.conf | 8 +++++ rocky-lookahead/override.conf | 15 ++++++++++ rocky-lookahead/variables.conf | 55 ++++++++++++++++++++++++++++++++++ rocky/variables.conf | 2 +- 4 files changed, 79 insertions(+), 1 deletion(-) create mode 100644 rocky-lookahead.conf create mode 100644 rocky-lookahead/override.conf create mode 100644 rocky-lookahead/variables.conf diff --git a/rocky-lookahead.conf b/rocky-lookahead.conf new file mode 100644 index 0000000..03f5c52 --- /dev/null +++ b/rocky-lookahead.conf @@ -0,0 +1,8 @@ +from shared/variables import * +from rocky-lookahead/variables import * +from shared/all import * +from rocky-lookahead/override import * + +global_release = '!RELEASE_FROM_DATE_RESPIN' + +sigkeys = [None] diff --git a/rocky-lookahead/override.conf b/rocky-lookahead/override.conf new file mode 100644 index 0000000..5174cc8 --- /dev/null +++ b/rocky-lookahead/override.conf @@ -0,0 +1,15 @@ +# This files overrides default variables defined in the configs in +# the ../shared directory. + +#from images import * + +# Unsigned builds for now +sigkeys = [None] + +tree_arches = ['aarch64', 'ppc64le', 's390x', 'x86_64'] + +lorax_use_koji_plugin = False + +translate_paths = [ # required by image-build + ("/mnt/koji", "https://koji.rockylinux.org/kojifiles") +] diff --git a/rocky-lookahead/variables.conf b/rocky-lookahead/variables.conf new file mode 100644 index 0000000..3c7f968 --- /dev/null +++ b/rocky-lookahead/variables.conf @@ -0,0 +1,55 @@ +# This file sets the values of variables defined in +# the `../shared/variables.conf`. + +RELEASE_NAME = 'Rocky Linux' +RELEASE_SHORT = 'Rocky' +RELEASE_VERSION_X = '9' +RELEASE_VERSION_Y = '6' +RELEASE_VERSION_XY = "%s.%s" % (RELEASE_VERSION_X, RELEASE_VERSION_Y) +RELEASE_VERSION = RELEASE_VERSION_XY + +PKGSET_KOJI_TAG = 'r9-compose' +PKGSET_KOJI_MODULE_TAG = 'el9-modules-pending-signed' + +RUNROOT_CHANNEL = 'runroot' +RUNROOT_TAG = 'r9-build' + +COMPS_REPO = 'https://git.rockylinux.org/rocky/comps.git' +COMPS_BRANCH = 'main' +COMPS_FILE = 'comps-rocky-%s-lh.xml' % RELEASE_VERSION_X +COMPS_COMMAND = '' + +MODULE_DEFAULTS_REPO = 'https://git.rockylinux.org/rocky/rocky-module-defaults.git' +MODULE_DEFAULTS_BRANCH = 'r%s' % RELEASE_VERSION + +VARIANTS_SCM = 'git' +VARIANTS_REPO = 'https://git.rockylinux.org/rocky/pungi-rocky.git' +VARIANTS_BRANCH = 'r%ss' % RELEASE_VERSION_X +VARIANTS_FILE = 'variants.xml' + +GATHER_PREPOPULATE_REPO = 'https://git.rockylinux.org/rocky/pungi-rocky.git' +GATHER_PREPOPULATE_BRANCH = 'r%ss' % RELEASE_VERSION_X +GATHER_PREPOPULATE_FILE = 'prepopulate.json' +GATHER_PREPOPULATE_COMMAND = '' + +EXTRA_FILES = [ + { + "scm": "git", + "repo": "https://git.rockylinux.org/staging/src/rocky-release.git", + "branch": "r9", + "file": [ + "SOURCES/LICENSE", + "SOURCES/EULA", + "SOURCES/COMMUNITY-CHARTER", + "SOURCES/RPM-GPG-KEY-Rocky-9", + "SOURCES/RPM-GPG-KEY-Rocky-9-Testing", + ], + "target": "", + } +] + +EXTRA_BUILDINSTALL_SKIP = ('^BaseOS$', { + 'i386': True, +}) + +EXTRA_ISO_ARCHES = ['aarch64', 'ppc64le', 's390x', 'x86_64'] diff --git a/rocky/variables.conf b/rocky/variables.conf index 9132bac..944c707 100644 --- a/rocky/variables.conf +++ b/rocky/variables.conf @@ -4,7 +4,7 @@ RELEASE_NAME = 'Rocky Linux' RELEASE_SHORT = 'Rocky' RELEASE_VERSION_X = '9' -RELEASE_VERSION_Y = '5' +RELEASE_VERSION_Y = '6' RELEASE_VERSION_XY = "%s.%s" % (RELEASE_VERSION_X, RELEASE_VERSION_Y) RELEASE_VERSION = RELEASE_VERSION_XY