consolidation and scripts

common/vars.conf

@@ -0,0 +1,33 @@
+global RELEASE_NAME
+global RELEASE_SHORT
+global RELEASE_VERSION
+global PKGSET_KOJI_TAG
+global PKGSET_KOJI_MODULE_TAG
+global RUNROOT_CHANNEL
+global RUNROOT_TAG
+global COMPS_REPO
+global COMPS_BRANCH
+global COMPS_FILE
+global COMPS_COMMAND
+global MODULE_DEFAULTS_REPO
+global MODULE_DEFAULTS_BRANCH
+global VARIANTS_REPO
+global VARIANTS_BRANCH
+global VARIANTS_FILE
+global GATHER_PREPOPULATE_REPO
+global GATHER_PREPOPULATE_BRANCH
+global GATHER_PREPOPULATE_FILE
+global GATHER_PREPOPULATE_SKIP
+
+global GATHER_PREPOPULATE_REPO
+global GATHER_PREPOPULATE_BRANCH
+global GATHER_PREPOPULATE_FILE
+global GATHER_PREPOPULATE_COMMAND
+global EXTRA_FILES
+global EXTRA_ISOS_ARCHES
+global IMAGE_BUILD_SCRATCH
+
+EXTRA_BUILDINSTALL_SKIP = ("^$", {"*": False})
+EXTRA_FILES = []
+EXTRA_ISOS_ARCHES = []
+IMAGE_BUILD_SCRATCH = False

container.conf

@@ -1,5 +1,5 @@
-from multilib import * 
-from include-excludes import *
+from common/multilib import * 
+from common/include-excludes import *
 
 release_name = 'Rocky-Container'
 release_short = 'Rocky-Container'

r8-armhfp.conf

@@ -1,5 +1,5 @@
-from multilib import *
-from include-excludes import *
+from common/multilib import *
+from common/include-excludes import *
 #from images-armhfp import *
 
 # PRODUCT INFO 

r8-cloud.conf

@@ -1,5 +1,5 @@
-from multilib import * 
-from include-excludes import *
+from common/multilib import * 
+from common/include-excludes import *
 from images-cloud import *
 
 release_name = 'Rocky-Cloud'

r8-devel.conf

@@ -1,5 +1,5 @@
-from multilib import *
-from include-excludes import *
+from common/multilib import *
+from common/include-excludes import *
 
 # PRODUCT INFO 
 release_name = "Rocky Development" 

r8.conf

@@ -1,5 +1,5 @@
-from multilib import *
-from include-excludes import *
+from common/multilib import *
+from common/include-excludes import *
 #from images import *
 
 # PRODUCT INFO 

scripts/README.md

@@ -0,0 +1,13 @@
+Process
+=======
+
+When runnig composes, these scripts help us take care of that. These are what they do:
+
+```
+.
+├── produce-8.sh        -> Does a full compose, usually ran only for point releases
+├── updates-8-devel.sh  -> Does a compose for the devel repo, ran after full or updates compose
+├── updates-8-extras.sh -> Does a compose for the extras repo (only ran when there's changes)
+├── updates-8-plus.sh   -> Does a compose for the plus repo (only ran when there's changes)
+└── updates-8.sh        -> Does an updates compose (no ISOs or images are made)
+```

scripts/produce-8.sh

@@ -0,0 +1,21 @@
+#!/bin/bash
+
+export PATH=/usr/sbin:/usr/bin:/root/bin
+TARGET_DIR="/mnt/compose/8"
+SHORT=Rocky
+CONFIG=/etc/pungi-prod/r8.conf
+# Unused for now
+OLDCOMPOSE_ID=$(cat $TARGET_DIR/latest-$SHORT-8/COMPOSE_ID)
+SKIP=""
+LABEL="--production --label RC-8.4"
+
+CMD="pungi-koji --config=$CONFIG --old-composes=$TARGET_DIR $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

scripts/updates-8-devel.sh

@@ -0,0 +1,21 @@
+#!/bin/bash
+
+export PATH=/usr/sbin:/usr/bin:/root/bin
+TARGET_DIR="/mnt/compose/8"
+SHORT=Devel
+CONFIG=/etc/pungi-prod/r8-devel.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 --no-label"
+
+CMD="pungi-koji --config=$CONFIG --old-composes=$TARGET_DIR $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

scripts/updates-8-extras.sh

@@ -0,0 +1,18 @@
+#!/bin/bash
+
+TARGET_DIR="/mnt/compose/8"
+SHORT=Extras
+CONFIG=/etc/pungi-prod/extras.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.4"
+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

scripts/updates-8-plus.sh

@@ -0,0 +1,19 @@
+#!/bin/bash
+
+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.4"
+
+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

scripts/updates-8.sh

@@ -0,0 +1,21 @@
+#!/bin/bash
+
+export PATH=/usr/sbin:/usr/bin:/root/bin
+TARGET_DIR="/mnt/compose/8"
+SHORT=Rocky
+CONFIG=/etc/pungi-prod/r8-updates.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.4"
+
+CMD="pungi-koji --config=$CONFIG --old-composes=$TARGET_DIR $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