sig_core/toolkit
sig_core/toolkit
7
2
Fork 3
Code Issues 6 Pull Requests 2 Actions Projects Releases Wiki Activity

Merge branch 'devel' into 'main'

Browse Source 
fix up some things

See merge request release-engineering/public/toolkit!40
This commit is contained in:
Louis Abel 2021-11-14 05:43:30 +00:00
commit 350ef6c84d
2 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
sync/common_8
View File

@ -63,6 +63,13 @@ MODS=(
# functions # functions
# Note, EL8 and EL9 may not be the same, do not put in 'common' # Note, EL8 and EL9 may not be the same, do not put in 'common'
function treeinfoSaver() {
BaseOSArch="${1}"
TREEINFO_VAR="${STAGING_ROOT}/${RELEASE_DIR}/BaseOS/${BaseOSArch}/os/.treeinfo"
PRISTINE_TREE="${STAGING_ROOT}/${RELEASE_DIR}/BaseOS/${BaseOSArch}/os/.treeinfo-pristine"
/bin/cp "${TREEINFO_VAR}" "${PRISTINE_TREE}"
}
function treeinfoFixer() { function treeinfoFixer() {
BaseOSArch="${1}" BaseOSArch="${1}"
TREEINFO_VAR="${STAGING_ROOT}/${RELEASE_DIR}/BaseOS/${BaseOSArch}/os/.treeinfo" TREEINFO_VAR="${STAGING_ROOT}/${RELEASE_DIR}/BaseOS/${BaseOSArch}/os/.treeinfo"
@ -134,7 +141,6 @@ from configparser import ConfigParser
config = ConfigParser() config = ConfigParser()
config.read('${TREEINFO_VAR}') config.read('${TREEINFO_VAR}')
config.set('tree', 'variants', 'BaseOS,AppStream') config.set('tree', 'variants', 'BaseOS,AppStream')
config.add_section('variant-AppStream')
config.set('variant-AppStream', 'id', 'AppStream') config.set('variant-AppStream', 'id', 'AppStream')
config.set('variant-AppStream', 'name', 'AppStream') config.set('variant-AppStream', 'name', 'AppStream')
config.set('variant-AppStream', 'type', 'variant') config.set('variant-AppStream', 'type', 'variant')

1
sync/minor-release-sync-to-staging.sh
View File

@ -87,6 +87,7 @@ for ARCH in "${ARCHES[@]}"; do
echo "Ensuring treeinfo is correct" echo "Ensuring treeinfo is correct"
treeinfoModder "${ARCH}" treeinfoModder "${ARCH}"
treeinfoModderKickstart "${ARCH}" treeinfoModderKickstart "${ARCH}"
treeinfoSaver "${ARCH}"
done done
# sign all repos # sign all repos