diff --git a/r8-beta.conf b/r8-beta.conf new file mode 100644 index 0000000..9c581ba --- /dev/null +++ b/r8-beta.conf @@ -0,0 +1,188 @@ +from common/multilib import * +from common/include-excludes import * +#from images import * + +# PRODUCT INFO +release_name = "Rocky Linux" +release_short = "Rocky" +release_version = "8.8" +version = "8.8" +release_type = "BETA" + +# GENERAL SETTINGS +comps_file = { + 'scm': 'git', + 'repo': 'https://git.rockylinux.org/rocky/comps.git', + 'branch': 'main', + 'file': 'comps-rocky-8.8.xml', +} + +#link_type = 'hardlink-or-copy' +link_type = 'copy' + +module_defaults_dir = { + 'scm': 'git', + 'repo': 'https://git.rockylinux.org/rocky/rocky-module-defaults.git', + 'branch': 'r8.8', + 'dir': '.', +} + +multilib = [ + ('^.*$', { + 'x86_64': ['devel', 'runtime'] + }), +] + +variants_file = 'variants.xml' +sigkeys = ['6D745A60'] +# Change to true for 8.8 +hashed_directories = True + +tree_arches = ['aarch64', 'i386', 'x86_64'] + +# RUNROOT SETTINGS +runroot_channel = 'image' +runroot_tag = 'dist-rocky8-prep-build' +runroot_method = 'koji' + +# PKGSET +pkgset_source = "koji" +koji_profile = "koji" + +# PKGSET - KOJI +pkgset_koji_tag = "dist-rocky8-prep-compose" +pkgset_koji_inherit = False +pkgset_koji_module_tag = "dist-rocky8-prep-module-compose" +#pkgset_allow_reuse = False +pkgset_allow_reuse = True + +filter_system_release_packages = False + +createiso_break_hardlinks = True + +# GATHER +gather_prepopulate = "prepopulate.json" + +gather_method = { + "^(?!(AppStream|PowerTools)).*$":{ + "comps": "deps" + }, + "^(AppStream|PowerTools)$": "hybrid", +} + +gather_backend = "dnf" +check_deps = False +greedy_method = "none" +repoclosure_backend = "dnf" + +# CREATEREPO +createrepo_deltas = False +createrepo_database = True +createrepo_c = True +createrepo_checksum = "sha256" +createrepo_use_xz = True +createrepo_num_threads = 8 +createrepo_num_workers = 8 +createrepo_extra_args = ['--distro=cpe:/o:rocky:rocky:8,Rocky Linux 8', '--revision=8.8'] + +# CHECKSUMS +media_checksums = ['sha256'] +media_checksum_one_file = True +create_jigdo = False + +# BUILDINSTALL +bootable = True +buildinstall_method = "lorax" + +lorax_options = [ + ("^.*$", { + "*": { + "noupgrade": False, + "bugurl": "https://bugs.rockylinux.org" + } + }) +] + +buildinstall_skip = [ + ("^(AppStream|PowerTools|HighAvailability|ResilientStorage|RT|NFV)$", { + "*": True + }), +] + +image_name_format = { + "^BaseOS$": "{release_short}-8.8-{release_type}-{arch}-{disc_type}{disc_num}{suffix}", + "^Minimal$": "{release_short}-8.8-{release_type}-{arch}-minimal{suffix}", + ".*": "{release_short}-8.8-{release_type}-{arch}-{disc_type}{disc_num}{suffix}", +} + +image_volid_formats = [ '{release_short}-8.8-{release_type}-{arch}-{disc_type}', ] + +# CREATEISO +create_optional_isos = False + +createiso_skip = [ + ('^(BaseOS|AppStream|Minimal|PowerTools|HighAvailability|ResilientStorage|RT|NFV)$', { + '*': True, + 'src':True + }), +] + +extra_isos = { + "BaseOS": [{ + "include_variants": ["AppStream"], + "filename": "{release_short}-8.8-{release_type}-{arch}-{disc_type}{disc_num}{suffix}", + "skip_src": True, + }], + "Minimal": [{ + "include_variants": ["BaseOS"], + "filename": "{release_short}-8.8-{release_type}-{arch}-minimal{suffix}", + "skip_src": True, + }] +} + + +restricted_volid = True + +# LOOKASIDE +variant_as_lookaside = [ + ('AppStream', 'BaseOS'), + ('PowerTools', 'BaseOS'), + ('PowerTools', 'AppStream'), + ('HighAvailability', 'BaseOS'), + ('HighAvailability', 'AppStream'), + ("ResilientStorage", "BaseOS"), + ("ResilientStorage", "AppStream"), + ("RT", "BaseOS"), + ("RT", "AppStream"), + ("NFV", "BaseOS"), + ("NFV", "AppStream"), + ("Minimal", "BaseOS"), + ("Minimal", "AppStream"), +] + +extra_files = [ + ("^.*$", { + "*": [ + { + "scm": "git", + "repo": "https://git.rockylinux.org/original/rpms/rocky-release.git", + "branch": "r8", + "file": [ + 'SOURCES/LICENSE', + 'SOURCES/EULA', + 'SOURCES/COMMUNITY-CHARTER', + 'SOURCES/RPM-GPG-KEY-rockyofficial', + ], + "target": "", + }, + ] + }), +] + +productimg = False + +translate_paths = [ + ("/mnt/koji", "https://koji.rockylinux.org/kojifiles") + #("/compose", "http://172.22.0.123/compose"), +] + diff --git a/r8lh.conf b/r8lh.conf new file mode 100644 index 0000000..efae949 --- /dev/null +++ b/r8lh.conf @@ -0,0 +1,188 @@ +from common/multilib import * +from common/include-excludes import * +#from images import * + +# PRODUCT INFO +release_name = "Rocky Linux" +release_short = "Rocky" +release_version = "8.8" +version = "8.8" +release_type = "LookAhead" + +# GENERAL SETTINGS +comps_file = { + 'scm': 'git', + 'repo': 'https://git.rockylinux.org/rocky/comps.git', + 'branch': 'main', + 'file': 'comps-rocky-8.8.xml', +} + +#link_type = 'hardlink-or-copy' +link_type = 'copy' + +module_defaults_dir = { + 'scm': 'git', + 'repo': 'https://git.rockylinux.org/rocky/rocky-module-defaults.git', + 'branch': 'r8.8', + 'dir': '.', +} + +multilib = [ + ('^.*$', { + 'x86_64': ['devel', 'runtime'] + }), +] + +variants_file = 'variants.xml' +sigkeys = ['6D745A60'] +# Change to true for 8.8 +hashed_directories = True + +tree_arches = ['aarch64', 'i386', 'x86_64'] + +# RUNROOT SETTINGS +runroot_channel = 'image' +runroot_tag = 'dist-rocky8-lookahead-build' +runroot_method = 'koji' + +# PKGSET +pkgset_source = "koji" +koji_profile = "koji" + +# PKGSET - KOJI +pkgset_koji_tag = "dist-rocky8-lookahead-compose" +pkgset_koji_inherit = False +pkgset_koji_module_tag = "dist-rocky8-lookahead-module-compose" +#pkgset_allow_reuse = False +pkgset_allow_reuse = True + +filter_system_release_packages = False + +createiso_break_hardlinks = True + +# GATHER +gather_prepopulate = "prepopulate.json" + +gather_method = { + "^(?!(AppStream|PowerTools)).*$":{ + "comps": "deps" + }, + "^(AppStream|PowerTools)$": "hybrid", +} + +gather_backend = "dnf" +check_deps = False +greedy_method = "none" +repoclosure_backend = "dnf" + +# CREATEREPO +createrepo_deltas = False +createrepo_database = True +createrepo_c = True +createrepo_checksum = "sha256" +createrepo_use_xz = True +createrepo_num_threads = 8 +createrepo_num_workers = 8 +createrepo_extra_args = ['--distro=cpe:/o:rocky:rocky:8,Rocky Linux 8', '--revision=8.8'] + +# CHECKSUMS +media_checksums = ['sha256'] +media_checksum_one_file = True +create_jigdo = False + +# BUILDINSTALL +bootable = True +buildinstall_method = "lorax" + +lorax_options = [ + ("^.*$", { + "*": { + "noupgrade": False, + "bugurl": "https://bugs.rockylinux.org" + } + }) +] + +buildinstall_skip = [ + ("^(AppStream|PowerTools|HighAvailability|ResilientStorage|RT|NFV)$", { + "*": True + }), +] + +image_name_format = { + "^BaseOS$": "{release_short}-8.8-{release_type}-{arch}-{disc_type}{disc_num}{suffix}", + "^Minimal$": "{release_short}-8.8-{release_type}-{arch}-minimal{suffix}", + ".*": "{release_short}-8.8-{release_type}-{arch}-{disc_type}{disc_num}{suffix}", +} + +image_volid_formats = [ '{release_short}-8.8-{release_type}-{arch}-{disc_type}', ] + +# CREATEISO +create_optional_isos = False + +createiso_skip = [ + ('^(BaseOS|AppStream|Minimal|PowerTools|HighAvailability|ResilientStorage|RT|NFV)$', { + '*': True, + 'src':True + }), +] + +extra_isos = { + "BaseOS": [{ + "include_variants": ["AppStream"], + "filename": "{release_short}-8.8-{release_type}-{arch}-{disc_type}{disc_num}{suffix}", + "skip_src": True, + }], + "Minimal": [{ + "include_variants": ["BaseOS"], + "filename": "{release_short}-8.8-{release_type}-{arch}-minimal{suffix}", + "skip_src": True, + }] +} + + +restricted_volid = True + +# LOOKASIDE +variant_as_lookaside = [ + ('AppStream', 'BaseOS'), + ('PowerTools', 'BaseOS'), + ('PowerTools', 'AppStream'), + ('HighAvailability', 'BaseOS'), + ('HighAvailability', 'AppStream'), + ("ResilientStorage", "BaseOS"), + ("ResilientStorage", "AppStream"), + ("RT", "BaseOS"), + ("RT", "AppStream"), + ("NFV", "BaseOS"), + ("NFV", "AppStream"), + ("Minimal", "BaseOS"), + ("Minimal", "AppStream"), +] + +extra_files = [ + ("^.*$", { + "*": [ + { + "scm": "git", + "repo": "https://git.rockylinux.org/original/rpms/rocky-release.git", + "branch": "r8", + "file": [ + 'SOURCES/LICENSE', + 'SOURCES/EULA', + 'SOURCES/COMMUNITY-CHARTER', + 'SOURCES/RPM-GPG-KEY-rockyofficial', + ], + "target": "", + }, + ] + }), +] + +productimg = False + +translate_paths = [ + ("/mnt/koji", "https://koji.rockylinux.org/kojifiles") + #("/compose", "http://172.22.0.123/compose"), +] + diff --git a/scripts/produce-8-beta.sh b/scripts/produce-8-beta.sh new file mode 100755 index 0000000..5e283cd --- /dev/null +++ b/scripts/produce-8-beta.sh @@ -0,0 +1,22 @@ +#!/bin/bash + +source "$(dirname "$0")/common-8" +export PATH=/usr/sbin:/usr/bin:/root/bin +TARGET_DIR="/mnt/compose/8-BETA" +SHORT=Rocky +CONFIG=/etc/pungi-beta/r8-beta.conf +# Unused for now +OLDCOMPOSE_ID=$(cat $TARGET_DIR/latest-$SHORT-8/COMPOSE_ID) +SKIP="" +LABEL="--production --label RC-${REVISION}" + +CMD="pungi-koji --config=$CONFIG $SKIP $LABEL" +#COMPOSE_ID="Rocky-8-20210625.n.0" + +if [ -z "$COMPOSE_ID" ]; then + CMD="$CMD --target-dir=$TARGET_DIR" +else + CMD="$CMD --debug-mode --compose-dir=$TARGET_DIR/$COMPOSE_ID" +fi + +time $CMD diff --git a/scripts/produce-8-lookahead.sh b/scripts/produce-8-lookahead.sh new file mode 100755 index 0000000..b37d054 --- /dev/null +++ b/scripts/produce-8-lookahead.sh @@ -0,0 +1,22 @@ +#!/bin/bash + +source "$(dirname "$0")/common-8" +export PATH=/usr/sbin:/usr/bin:/root/bin +TARGET_DIR="/mnt/compose/8-LookAhead" +SHORT=Rocky +CONFIG=/etc/pungi-lh/r8lh.conf +# Unused for now +OLDCOMPOSE_ID=$(cat $TARGET_DIR/latest-$SHORT-8/COMPOSE_ID) +SKIP="" +LABEL="--production --label RC-${REVISION}" + +CMD="pungi-koji --config=$CONFIG $SKIP $LABEL" +#COMPOSE_ID="Rocky-8-20210625.n.0" + +if [ -z "$COMPOSE_ID" ]; then + CMD="$CMD --target-dir=$TARGET_DIR" +else + CMD="$CMD --debug-mode --compose-dir=$TARGET_DIR/$COMPOSE_ID" +fi + +time $CMD