consolidate extras further
This commit is contained in:
parent
ba36e61106
commit
7bf7d771f9
GPG Key ID:
B37E62D143879B36
|
|
@ -54,8 +54,7 @@ check_deps = False
|
|||
#]
|
||||
|
||||
createiso_skip = [
|
||||
|
||||
('^extras$', {
|
||||
('^.*$', {
|
||||
'*': True,
|
||||
'src': True
|
||||
}),
|
||||
|
|
|
|||
|
|
@ -53,8 +53,7 @@ check_deps = False
|
|||
#]
|
||||
|
||||
createiso_skip = [
|
||||
|
||||
('^extras$', {
|
||||
('^.*$', {
|
||||
'*': True,
|
||||
'src': True
|
||||
}),
|
||||
|
|
|
|||
81
plus-lh.conf
81
plus-lh.conf
|
|
@ -1,81 +0,0 @@
|
|||
from shared/extras import *
|
||||
|
||||
release_name = "Rocky-Plus"
|
||||
release_short = "Plus"
|
||||
release_version = "8"
|
||||
release_is_layered = False
|
||||
|
||||
variants_file='variants-plus.xml'
|
||||
sigkeys = ['6D745A60']
|
||||
create_jigdo = False
|
||||
|
||||
pkgset_source='koji'
|
||||
|
||||
#comps_file = {
|
||||
# 'scm': 'git',
|
||||
# 'repo': 'https://git.rockylinux.org/rocky/comps.git',
|
||||
# 'branch': 'main',
|
||||
# 'file': 'comps-rocky-8-plus.xml',
|
||||
#}
|
||||
|
||||
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.9']
|
||||
hashed_directories = True
|
||||
|
||||
pkgset_koji_tag='dist-rocky8-lookahead-compose'
|
||||
pkgset_koji_inherit = True
|
||||
|
||||
################################################################################
|
||||
# WARNING
|
||||
#
|
||||
# Below says "nodeps" for a reason. There are packages that are here that have
|
||||
# deps in the main repos. If there are deps that aren't coming in that need to
|
||||
# be here, you will need to list them in the additional_packages section.
|
||||
################################################################################
|
||||
|
||||
|
||||
gather_method = {
|
||||
'^.*': { # For all variants
|
||||
'comps': 'nodeps', # resolve dependencies for packages from comps file
|
||||
'module': 'nodeps', # but not for packages from modules
|
||||
}
|
||||
}
|
||||
|
||||
gather_backend = 'dnf'
|
||||
greedy_method = 'build'
|
||||
koji_profile = "koji"
|
||||
|
||||
check_deps = False
|
||||
|
||||
#filter_packages = [
|
||||
# ('^plus$', {
|
||||
# '*': [
|
||||
# '*',
|
||||
# ],
|
||||
# }),
|
||||
#]
|
||||
|
||||
#additional_packages = [
|
||||
# ('^plus$', {
|
||||
# 'aarch64': [
|
||||
# 'open-vm-tools',
|
||||
# 'open-vm-tools-desktop',
|
||||
# 'open-vm-tools-sdmp',
|
||||
# 'open-vm-tools-sdmp-salt-minion',
|
||||
# ],
|
||||
# }),
|
||||
#]
|
||||
|
||||
createiso_skip = [
|
||||
|
||||
('^plus$', {
|
||||
'*': True,
|
||||
'src': True
|
||||
}),
|
||||
]
|
||||
80
plus.conf
80
plus.conf
|
|
@ -1,80 +0,0 @@
|
|||
from shared/extras import *
|
||||
|
||||
release_name = "Rocky-Plus"
|
||||
release_short = "Plus"
|
||||
release_version = "8"
|
||||
release_is_layered = False
|
||||
|
||||
variants_file='variants-plus.xml'
|
||||
sigkeys = ['6D745A60']
|
||||
create_jigdo = False
|
||||
|
||||
pkgset_source='koji'
|
||||
|
||||
#comps_file = {
|
||||
# 'scm': 'git',
|
||||
# 'repo': 'https://git.rockylinux.org/rocky/comps.git',
|
||||
# 'branch': 'main',
|
||||
# 'file': 'comps-rocky-8-plus.xml',
|
||||
#}
|
||||
|
||||
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.9']
|
||||
hashed_directories = True
|
||||
|
||||
pkgset_koji_tag='dist-rocky8-compose'
|
||||
|
||||
################################################################################
|
||||
# WARNING
|
||||
#
|
||||
# Below says "nodeps" for a reason. There are packages that are here that have
|
||||
# deps in the main repos. If there are deps that aren't coming in that need to
|
||||
# be here, you will need to list them in the additional_packages section.
|
||||
################################################################################
|
||||
|
||||
|
||||
gather_method = {
|
||||
'^.*': { # For all variants
|
||||
'comps': 'nodeps', # resolve dependencies for packages from comps file
|
||||
'module': 'nodeps', # but not for packages from modules
|
||||
}
|
||||
}
|
||||
|
||||
gather_backend = 'dnf'
|
||||
greedy_method = 'build'
|
||||
koji_profile = "koji"
|
||||
|
||||
check_deps = False
|
||||
|
||||
#filter_packages = [
|
||||
# ('^extras$', {
|
||||
# '*': [
|
||||
# '*',
|
||||
# ],
|
||||
# }),
|
||||
#]
|
||||
|
||||
#additional_packages = [
|
||||
# ('^plus$', {
|
||||
# 'aarch64': [
|
||||
# 'open-vm-tools',
|
||||
# 'open-vm-tools-desktop',
|
||||
# 'open-vm-tools-sdmp',
|
||||
# 'open-vm-tools-sdmp-salt-minion',
|
||||
# ],
|
||||
# }),
|
||||
#]
|
||||
|
||||
createiso_skip = [
|
||||
|
||||
('^plus$', {
|
||||
'*': True,
|
||||
'src': True
|
||||
}),
|
||||
]
|
||||
|
|
@ -17,11 +17,3 @@ if [ "$ret_val" -ne 0 ]; then
|
|||
exit 1
|
||||
fi
|
||||
unset ret_val
|
||||
|
||||
bash updates-8-plus-beta.sh
|
||||
|
||||
ret_val=$?
|
||||
if [ "$ret_val" -ne 0 ]; then
|
||||
exit 1
|
||||
fi
|
||||
unset ret_val
|
||||
|
|
|
|||
|
|
@ -25,11 +25,3 @@ if [ "$ret_val" -ne 0 ]; then
|
|||
exit 1
|
||||
fi
|
||||
unset ret_val
|
||||
|
||||
bash updates-8-plus-lookahead.sh
|
||||
|
||||
ret_val=$?
|
||||
if [ "$ret_val" -ne 0 ]; then
|
||||
exit 1
|
||||
fi
|
||||
unset ret_val
|
||||
|
|
|
|||
|
|
@ -1,31 +0,0 @@
|
|||
#!/bin/bash
|
||||
|
||||
source "$(dirname "$0")/common-8"
|
||||
TARGET_DIR="/mnt/compose/8-LookAhead"
|
||||
SHORT=Plus
|
||||
CONFIG=/etc/pungi-lh/plus-lh.conf
|
||||
# Unused for now
|
||||
OLDCOMPOSE_ID=$(cat $TARGET_DIR/latest-$SHORT-8/COMPOSE_ID)
|
||||
SKIP="--skip-phase buildinstall --skip-phase createiso --skip-phase extra_isos --skip-phase productimg"
|
||||
LABEL="--test"
|
||||
|
||||
CMD="pungi-koji --config=$CONFIG --old-composes=$TARGET_DIR $OLD_COMPOSES_DIR $SKIP $LABEL"
|
||||
|
||||
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
|
||||
ret_val=$?
|
||||
|
||||
if [[ "$ret_val" != "0" ]]; then
|
||||
if [[ "$MAILNOTIF" == "yes" ]]; then
|
||||
echo "This is a notification that a recent lookahead $SHORT compose failed on $(hostname)" | mutt -e "set from=\"$FROM\"" \
|
||||
-e 'set envelope_from=yes' \
|
||||
-s "Compose $NEWCOMPOSE_ID failed (for Rocky Linux $REVISION)" \
|
||||
releng@rockylinux.org
|
||||
fi
|
||||
exit 1
|
||||
fi
|
||||
|
|
@ -1,20 +0,0 @@
|
|||
#!/bin/bash
|
||||
|
||||
source "$(dirname "$0")/common-8"
|
||||
TARGET_DIR="/mnt/compose/8"
|
||||
SHORT=Plus
|
||||
CONFIG=/etc/pungi-prod/plus.conf
|
||||
# Unused for now
|
||||
OLDCOMPOSE_ID=$(cat $TARGET_DIR/latest-$SHORT-8/COMPOSE_ID)
|
||||
SKIP="--skip-phase buildinstall --skip-phase createiso --skip-phase extra_isos --skip-phase productimg"
|
||||
LABEL="--production --label RC-8.9"
|
||||
|
||||
CMD="pungi-koji --config=$CONFIG --old-composes=$TARGET_DIR $OLD_COMPOSES_DIR $SKIP $LABEL"
|
||||
|
||||
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
|
||||
|
|
@ -7,4 +7,10 @@
|
|||
<arch>x86_64</arch>
|
||||
</arches>
|
||||
</variant>
|
||||
<variant id="plus" name="plus" type="variant">
|
||||
<arches>
|
||||
<arch>aarch64</arch>
|
||||
<arch>x86_64</arch>
|
||||
</arches>
|
||||
</variant>
|
||||
</variants>
|
||||
|
|
|
|||
|
|
@ -1,10 +0,0 @@
|
|||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<!DOCTYPE variants PUBLIC "-//Rocky, Inc.//DTD Variants info//EN" "variants2012.dtd">
|
||||
<variants>
|
||||
<variant id="plus" name="plus" type="variant">
|
||||
<arches>
|
||||
<arch>aarch64</arch>
|
||||
<arch>x86_64</arch>
|
||||
</arches>
|
||||
</variant>
|
||||
</variants>
|
||||
Loading…
Reference in New Issue