Compare commits
No commits in common. "main" and "master" have entirely different histories.
5 changed files with 35 additions and 35 deletions
|
|
@ -1,7 +1,7 @@
|
|||
# PRODUCT INFO
|
||||
release_name = 'Fedora-IoT'
|
||||
release_short = 'Fedora-IoT'
|
||||
release_version = '46'
|
||||
release_version = '45'
|
||||
# Let's not build install media during this run. For the image builds
|
||||
# and OSTree installer we'll use inputs from other f45 runs.
|
||||
skip_phases = ["buildinstall", "createrepo", "extra_files"]
|
||||
|
|
@ -9,13 +9,13 @@ skip_phases = ["buildinstall", "createrepo", "extra_files"]
|
|||
# GENERAL SETTINGS
|
||||
comps_file = {
|
||||
'scm': 'git',
|
||||
'repo': 'https://forge.fedoraproject.org/releng/fedora-comps.git',
|
||||
'repo': 'https://pagure.io/fedora-comps.git',
|
||||
'branch': 'main',
|
||||
'file': 'comps-f46.xml',
|
||||
'command': 'make comps-f46.xml'
|
||||
'file': 'comps-f45.xml',
|
||||
'command': 'make comps-f45.xml'
|
||||
}
|
||||
variants_file='variants-fedora.xml'
|
||||
sigkeys = ['91211FCE']
|
||||
sigkeys = ['F577861E']
|
||||
|
||||
# limit tree architectures
|
||||
# if undefined, all architectures from variants.xml will be included
|
||||
|
|
@ -27,7 +27,7 @@ hashed_directories = True
|
|||
|
||||
# RUNROOT settings
|
||||
runroot_channel = 'compose'
|
||||
runroot_tag = 'f46-build'
|
||||
runroot_tag = 'f45-build'
|
||||
|
||||
# PKGSET
|
||||
pkgset_source = 'koji' # koji, repos
|
||||
|
|
@ -37,7 +37,7 @@ pkgset_source = 'koji' # koji, repos
|
|||
# pkgset_repos = {}
|
||||
|
||||
# PKGSET - KOJI
|
||||
pkgset_koji_tag = 'f46-iot'
|
||||
pkgset_koji_tag = 'f45-iot'
|
||||
pkgset_koji_inherit = False
|
||||
|
||||
filter_system_release_packages = False
|
||||
|
|
@ -166,7 +166,7 @@ image_volid_layered_product_formats = []
|
|||
# allow Pungi to tell it what volume ID to use. Note:
|
||||
# https://fedoraproject.org/wiki/User:Adamwill/Draft_fedora_image_naming_policy
|
||||
# '-Workstation-' is a temporary workaround. See
|
||||
# https://forge.fedoraproject.org/releng/pungi-fedora/pulls/525
|
||||
# https://pagure.io/pungi-fedora/pull-request/525
|
||||
volume_id_substitutions = {
|
||||
'Beta': 'B',
|
||||
'Rawhide': 'rawh',
|
||||
|
|
@ -183,7 +183,7 @@ volume_id_substitutions = {
|
|||
'IoT': 'iot',
|
||||
'Jam_KDE': 'Jam',
|
||||
'MATE_Compiz': 'MATE',
|
||||
# Note https://forge.fedoraproject.org/releng/pungi-fedora/issues/533
|
||||
# Note https://pagure.io/pungi-fedora/issue/533
|
||||
'Python-Classroom': 'Clss',
|
||||
'Python_Classroom': 'Clss',
|
||||
'Robotics': 'Robo',
|
||||
|
|
@ -204,10 +204,10 @@ translate_paths = [
|
|||
|
||||
# These may be inherited by various phases for creating Koji tasks
|
||||
global_release = '!RELEASE_FROM_LABEL_DATE_TYPE_RESPIN'
|
||||
global_version = '46'
|
||||
global_target = 'f46'
|
||||
global_version = '45'
|
||||
global_target = 'f45'
|
||||
|
||||
imagebuilder_target = 'f46-image-builder'
|
||||
imagebuilder_target = 'f45-image-builder'
|
||||
imagebuilder = {
|
||||
"^IoT$": [
|
||||
{
|
||||
|
|
@ -262,7 +262,7 @@ ostree = {
|
|||
"force_new_commit": True,
|
||||
"unified_core": True,
|
||||
"treefile": "fedora-iot.yaml",
|
||||
"config_url": "https://forge.fedoraproject.org/iot/ostree.git",
|
||||
"config_url": "https://pagure.io/fedora-iot/ostree.git",
|
||||
"config_branch": "main",
|
||||
"repo": [
|
||||
"IoT",
|
||||
|
|
@ -281,7 +281,7 @@ ostree_container = {
|
|||
"^IoT$": [
|
||||
{
|
||||
"version": "!OSTREE_VERSION_FROM_LABEL_DATE_TYPE_RESPIN",
|
||||
"config_url": "https://forge.fedoraproject.org/iot/base-images.git",
|
||||
"config_url": "https://pagure.io/fedora-iot/base-images",
|
||||
"config_branch": "main",
|
||||
"treefile": "fedora-rawhide.yaml",
|
||||
"repo": ["https://kojipkgs.fedoraproject.org/compose/rawhide/latest-Fedora-Rawhide/compose/Everything/$basearch/os/"],
|
||||
|
|
@ -292,7 +292,7 @@ ostree_container = {
|
|||
},
|
||||
{
|
||||
"version": "!OSTREE_VERSION_FROM_LABEL_DATE_TYPE_RESPIN",
|
||||
"config_url": "https://forge.fedoraproject.org/iot/fedora-iot-bootc.git",
|
||||
"config_url": "https://pagure.io/fedora-iot/fedora-iot-bootc.git",
|
||||
"config_branch": "main",
|
||||
"treefile": "fedora-iot-rawhide.yaml",
|
||||
"repo": ["https://kojipkgs.fedoraproject.org/compose/rawhide/latest-Fedora-Rawhide/compose/Everything/$basearch/os/"],
|
||||
|
|
|
|||
14
nightly.sh
14
nightly.sh
|
|
@ -9,9 +9,9 @@ SKIP_PHASES="--skip-phase=productimg"
|
|||
DEST=$(pwd)
|
||||
DATE=$(date "+%Y%m%d")
|
||||
SHORT="Fedora-IoT"
|
||||
RELEASE="46"
|
||||
RELEASE_TITLE="46"
|
||||
COMPSFILE="comps-f46.xml"
|
||||
RELEASE="45"
|
||||
RELEASE_TITLE="45"
|
||||
COMPSFILE="comps-f45.xml"
|
||||
TMPDIR=`mktemp -d /tmp/$RELEASE.$DATE.XXXX`
|
||||
TOMAIL="iot@lists.fedoraproject.org"
|
||||
FROM="Fedora IoT Report <rawhide@fedoraproject.org>"
|
||||
|
|
@ -30,20 +30,20 @@ if [ -d releng ]; then
|
|||
git pull --rebase
|
||||
popd
|
||||
else
|
||||
git clone https://forge.fedoraproject.org/releng/tooling.git releng
|
||||
git clone https://pagure.io/releng.git
|
||||
fi
|
||||
|
||||
# Set up our fedmsg function, using the releng repo definition
|
||||
#FEDMSG_MODNAME="compose"
|
||||
#FEDMSG_CERTPREFIX="releng"
|
||||
. ./releng/infrastructure/messaging/fedora_messaging.sh
|
||||
. ./releng/scripts_new/infrastructure/messaging/fedora_messaging.sh
|
||||
|
||||
# Announce that we are starting, even though we don't know the compose_id yet..
|
||||
#fedmsg_json_start=$(printf '{"log": "start", "branch": "%s", "arch": "%s", "short": "%s"}' "$RELEASE" "$ARCH" "$SHORT")
|
||||
#send_fedmsg "${fedmsg_json_start}" ${RELEASE} start
|
||||
|
||||
#pushd $TMPDIR
|
||||
#git clone https://forge.fedoraproject.org/releng/fedora-comps.git && {
|
||||
#git clone https://pagure.io/fedora-comps.git && {
|
||||
# pushd fedora-comps
|
||||
# make "${COMPSFILE}"
|
||||
# cp "${COMPSFILE}" $DEST/
|
||||
|
|
@ -67,7 +67,7 @@ fi
|
|||
NEWCOMPOSE_ID=$(cat $TARGET_DIR/latest-$SHORT-$RELEASE_TITLE/COMPOSE_ID)
|
||||
SHORTCOMPOSE_ID=$(echo $NEWCOMPOSE_ID|sed -e 's|Fedora-.*-||g')
|
||||
|
||||
./releng/builds/compose/build_composeinfo.py "$TARGET_DIR/$NEWCOMPOSE_ID/" --name "$NEWCOMPOSE_ID"
|
||||
./releng/scripts/build_composeinfo "$TARGET_DIR/$NEWCOMPOSE_ID/" --name "$NEWCOMPOSE_ID"
|
||||
|
||||
# Set this to use later for a few items include depcheck
|
||||
DESTDIR=$TARGET_DIR/$NEWCOMPOSE_ID
|
||||
|
|
|
|||
|
|
@ -47,9 +47,9 @@ arch_to_goarch() {
|
|||
|
||||
# This is the release of Fedora that is currently stable, it will define if we
|
||||
# need to move the fedora:latest tag
|
||||
current_stable="44"
|
||||
current_stable="43"
|
||||
# Define what is rawhide so we know to push that tag
|
||||
current_rawhide="46"
|
||||
current_rawhide="45"
|
||||
# Sanity checking
|
||||
if ! [[ "${1}" =~ ^-?[0-9]+$ ]];
|
||||
then
|
||||
|
|
|
|||
|
|
@ -12,14 +12,14 @@ DEST=$(pwd)
|
|||
DATE=$(date "+%Y%m%d")
|
||||
# the Pungi 'shortname', which we will include in fedmsgs for disambiguation
|
||||
SHORT="Fedora-IoT"
|
||||
RELEASE="46"
|
||||
RELEASE_TITLE="46"
|
||||
COMPSFILE="comps-f46.xml"
|
||||
RELEASE="45"
|
||||
RELEASE_TITLE="45"
|
||||
COMPSFILE="comps-f45.xml"
|
||||
TMPDIR=`mktemp -d /tmp/$RELEASE.$DATE.XXXX`
|
||||
TOMAIL="iot@lists.fedoraproject.org"
|
||||
FROM="Fedora IoT Report <branched@fedoraproject.org>"
|
||||
RSYNCPREFIX="sudo -u ftpsync"
|
||||
RSYNCTARGET="/pub/alt/iot/46/"
|
||||
RSYNCTARGET="/pub/alt/iot/45/"
|
||||
OLDCOMPOSE_ID=$(cat $TARGET_DIR/latest-$SHORT-$RELEASE_TITLE/COMPOSE_ID)
|
||||
|
||||
NEWCOMPOSE_ID=$(cat $TARGET_DIR/latest-$SHORT-$RELEASE_TITLE/COMPOSE_ID)
|
||||
|
|
|
|||
|
|
@ -11,9 +11,9 @@ DEST=$(pwd)
|
|||
DATE=$(date "+%Y%m%d")
|
||||
# the Pungi 'shortname', which we will include in fedmsgs for disambiguation
|
||||
SHORT="Fedora-IoT"
|
||||
RELEASE="46"
|
||||
RELEASE_TITLE="46"
|
||||
COMPSFILE="comps-f46.xml"
|
||||
RELEASE="45"
|
||||
RELEASE_TITLE="45"
|
||||
COMPSFILE="comps-f45.xml"
|
||||
TMPDIR=`mktemp -d /tmp/$RELEASE.$DATE.XXXX`
|
||||
TOMAIL="iot@lists.fedoraproject.org"
|
||||
FROM="Fedora IoT Report <rawhide@fedoraproject.org>"
|
||||
|
|
@ -28,13 +28,13 @@ if [ -d releng ]; then
|
|||
git pull --rebase
|
||||
popd
|
||||
else
|
||||
git clone https://forge.fedoraproject.org/releng/tooling.git releng
|
||||
git clone https://pagure.io/releng.git
|
||||
fi
|
||||
# Set up our fedmsg function, using the releng repo definition
|
||||
fedmsg_json_start=$(printf '{"log": "start", "branch": "%s", "arch": "%s", "short": "%s"}' "$RELEASE" "$ARCH" "$SHORT")
|
||||
FEDMSG_MODNAME="compose"
|
||||
FEDMSG_CERTPREFIX="releng"
|
||||
. ./releng/infrastructure/messaging/fedora_messaging.sh
|
||||
. ./releng/scripts_new/infrastructure/messaging/fedora_messaging.sh
|
||||
# Announce that we are starting...
|
||||
send_fedmsg "${fedmsg_json_start}" ${RELEASE} start
|
||||
CMD="pungi-koji --notification-script=/usr/bin/pungi-fedmsg-notification --notification-script=pungi-wait-for-signed-ostree-handler --config=$CONFIG --old-composes=$TARGET_DIR $OLD_COMPOSES_DIR $NIGHTLY --label=$LABEL"
|
||||
|
|
@ -52,7 +52,7 @@ ostree summary --update --repo=/mnt/koji/compose/iot/repo/
|
|||
NEWCOMPOSE_ID=$(cat $TARGET_DIR/latest-$SHORT-$RELEASE_TITLE/COMPOSE_ID)
|
||||
SHORTCOMPOSE_ID=$(echo $NEWCOMPOSE_ID|sed -e 's|Fedora-.*-||g')
|
||||
|
||||
./releng/builds/compose/build_composeinfo.py "$TARGET_DIR/$NEWCOMPOSE_ID/" --name "$NEWCOMPOSE_ID"
|
||||
./releng/scripts/build_composeinfo "$TARGET_DIR/$NEWCOMPOSE_ID/" --name "$NEWCOMPOSE_ID"
|
||||
|
||||
DESTDIR=$TARGET_DIR/$NEWCOMPOSE_ID
|
||||
# Public URL the synced compose will wind up at, we put it in fedmsgs
|
||||
|
|
@ -67,7 +67,7 @@ send_fedmsg "${fedmsg_json_start}" ${RELEASE} rsync.start
|
|||
for dir in IoT metadata ;
|
||||
do
|
||||
$RSYNCPREFIX rsync -avhH --delete-after $DESTDIR/compose/$dir/ "$RSYNCTARGET/$dir/" ;
|
||||
$RSYNCPREFIX ./releng/builds/compose/build_composeinfo.py "$RSYNCTARGET/" --name $NEWCOMPOSE_ID
|
||||
$RSYNCPREFIX ./releng/scripts/build_composeinfo "$RSYNCTARGET/" --name $NEWCOMPOSE_ID
|
||||
done
|
||||
# Tell everyone by fedmsg about the compose
|
||||
send_fedmsg "${fedmsg_json_done}" ${RELEASE} complete
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue