From 7bf7d771f93d430a49719c2e2525a1cbc50b9577 Mon Sep 17 00:00:00 2001 From: Louis Abel Date: Mon, 4 Sep 2023 01:11:26 -0700 Subject: [PATCH] consolidate extras further --- extras-lh.conf | 3 +- extras.conf | 3 +- plus-lh.conf | 81 ----------------------------- plus.conf | 80 ---------------------------- scripts/produce-8-beta-full.sh | 8 --- scripts/produce-8-lookahead-full.sh | 8 --- scripts/updates-8-plus-lookahead.sh | 31 ----------- scripts/updates-8-plus.sh | 20 ------- variants-extras.xml | 6 +++ variants-plus.xml | 10 ---- 10 files changed, 8 insertions(+), 242 deletions(-) delete mode 100644 plus-lh.conf delete mode 100644 plus.conf delete mode 100755 scripts/updates-8-plus-lookahead.sh delete mode 100755 scripts/updates-8-plus.sh delete mode 100644 variants-plus.xml diff --git a/extras-lh.conf b/extras-lh.conf index 01c336c..36b8748 100644 --- a/extras-lh.conf +++ b/extras-lh.conf @@ -54,8 +54,7 @@ check_deps = False #] createiso_skip = [ - - ('^extras$', { + ('^.*$', { '*': True, 'src': True }), diff --git a/extras.conf b/extras.conf index 0ab1248..cb55485 100644 --- a/extras.conf +++ b/extras.conf @@ -53,8 +53,7 @@ check_deps = False #] createiso_skip = [ - - ('^extras$', { + ('^.*$', { '*': True, 'src': True }), diff --git a/plus-lh.conf b/plus-lh.conf deleted file mode 100644 index 666d6dc..0000000 --- a/plus-lh.conf +++ /dev/null @@ -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 - }), -] diff --git a/plus.conf b/plus.conf deleted file mode 100644 index 10fa8bc..0000000 --- a/plus.conf +++ /dev/null @@ -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 - }), -] diff --git a/scripts/produce-8-beta-full.sh b/scripts/produce-8-beta-full.sh index c46cde7..0745c61 100755 --- a/scripts/produce-8-beta-full.sh +++ b/scripts/produce-8-beta-full.sh @@ -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 diff --git a/scripts/produce-8-lookahead-full.sh b/scripts/produce-8-lookahead-full.sh index deb008f..80187b6 100755 --- a/scripts/produce-8-lookahead-full.sh +++ b/scripts/produce-8-lookahead-full.sh @@ -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 diff --git a/scripts/updates-8-plus-lookahead.sh b/scripts/updates-8-plus-lookahead.sh deleted file mode 100755 index 6ccc43f..0000000 --- a/scripts/updates-8-plus-lookahead.sh +++ /dev/null @@ -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 diff --git a/scripts/updates-8-plus.sh b/scripts/updates-8-plus.sh deleted file mode 100755 index 359c8fb..0000000 --- a/scripts/updates-8-plus.sh +++ /dev/null @@ -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 diff --git a/variants-extras.xml b/variants-extras.xml index 4aca411..9bed79a 100644 --- a/variants-extras.xml +++ b/variants-extras.xml @@ -7,4 +7,10 @@ x86_64 + + + aarch64 + x86_64 + + diff --git a/variants-plus.xml b/variants-plus.xml deleted file mode 100644 index 0a2cb7b..0000000 --- a/variants-plus.xml +++ /dev/null @@ -1,10 +0,0 @@ - - - - - - aarch64 - x86_64 - - -