Compare commits
6 commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
4cc14b56b2 | ||
|
|
109d84f9d4 | ||
|
|
a36fb3ec4b | ||
|
|
33a2ba411c | ||
|
|
f98ceb1cd8 | ||
|
|
eb3db40bad |
3 changed files with 88 additions and 26 deletions
|
|
@ -11,7 +11,7 @@ ostree_installer_overwrite = True
|
|||
comps_file = {
|
||||
'scm': 'git',
|
||||
'repo': 'https://pagure.io/fedora-comps.git',
|
||||
'branch': 'master',
|
||||
'branch': 'main',
|
||||
'file': 'comps-f33.xml',
|
||||
'command': 'make comps-f33.xml'
|
||||
}
|
||||
|
|
@ -200,7 +200,7 @@ translate_paths = [
|
|||
]
|
||||
|
||||
# These will be inherited by live_media, live_images and image_build
|
||||
global_ksurl = 'git+https://pagure.io/fedora-kickstarts.git?#HEAD'
|
||||
global_ksurl = 'git+https://pagure.io/fedora-kickstarts.git?#origin/f33'
|
||||
global_release = '!RELEASE_FROM_LABEL_DATE_TYPE_RESPIN'
|
||||
global_version = '33'
|
||||
# live_images ignores this in favor of live_target
|
||||
|
|
@ -215,8 +215,8 @@ image_build = {
|
|||
'kickstart': 'fedora-iot.ks',
|
||||
'distro': 'Fedora-22',
|
||||
'disk_size': 4,
|
||||
'arches': ['aarch64', 'x86_64'],
|
||||
'install_tree_from': "https://kojipkgs.fedoraproject.org/compose/rawhide/latest-Fedora-Rawhide/compose/Everything/$arch/os/",
|
||||
'arches': ['armhfp', 'aarch64', 'x86_64'],
|
||||
'install_tree_from': "https://kojipkgs.fedoraproject.org/compose/33/Fedora-33-20201019.0/compose/Everything/$arch/os/",
|
||||
'subvariant': 'IoT',
|
||||
}
|
||||
}
|
||||
|
|
@ -230,14 +230,15 @@ ostree = [
|
|||
"force_new_commit": True,
|
||||
"treefile": "fedora-iot.json",
|
||||
"config_url": "https://pagure.io/fedora-iot/ostree.git",
|
||||
"config_branch": "master",
|
||||
"config_branch": "f33",
|
||||
"repo": [
|
||||
"IoT",
|
||||
"https://kojipkgs.fedoraproject.org/compose/rawhide/latest-Fedora-Rawhide/compose/Everything/$basearch/os/"
|
||||
"https://kojipkgs.fedoraproject.org/compose/33/Fedora-33-20201019.0/compose/Everything/$basearch/os/",
|
||||
"https://kojipkgs.fedoraproject.org/compose/updates/f33-updates/compose/Everything/$basearch/os/"
|
||||
]
|
||||
"tag_ref": False,
|
||||
"ostree_repo": "/mnt/koji/compose/iot/repo/",
|
||||
"ostree_ref": "fedora/rawhide/${basearch}/iot",
|
||||
"ostree_ref": "fedora/stable/${basearch}/iot",
|
||||
"update_summary": True,
|
||||
},
|
||||
"armhfp": {
|
||||
|
|
@ -245,14 +246,15 @@ ostree = [
|
|||
"force_new_commit": True,
|
||||
"treefile": "fedora-iot.json",
|
||||
"config_url": "https://pagure.io/fedora-iot/ostree.git",
|
||||
"config_branch": "master",
|
||||
"config_branch": "f33",
|
||||
"repo": [
|
||||
"IoT",
|
||||
"https://kojipkgs.fedoraproject.org/compose/rawhide/latest-Fedora-Rawhide/compose/Everything/$basearch/os/"
|
||||
"https://kojipkgs.fedoraproject.org/compose/33/Fedora-33-20201019.0/compose/Everything/$basearch/os/",
|
||||
"https://kojipkgs.fedoraproject.org/compose/updates/f33-updates/compose/Everything/$basearch/os/"
|
||||
]
|
||||
"tag_ref": False,
|
||||
"ostree_repo": "/mnt/koji/compose/iot/repo/",
|
||||
"ostree_ref": "fedora/rawhide/${basearch}/iot",
|
||||
"ostree_ref": "fedora/stable/${basearch}/iot",
|
||||
"update_summary": True,
|
||||
},
|
||||
"x86_64": {
|
||||
|
|
@ -260,14 +262,15 @@ ostree = [
|
|||
"force_new_commit": True,
|
||||
"treefile": "fedora-iot.json",
|
||||
"config_url": "https://pagure.io/fedora-iot/ostree.git",
|
||||
"config_branch": "master",
|
||||
"config_branch": "f33",
|
||||
"repo": [
|
||||
"IoT",
|
||||
"https://kojipkgs.fedoraproject.org/compose/rawhide/latest-Fedora-Rawhide/compose/Everything/$basearch/os/"
|
||||
"https://kojipkgs.fedoraproject.org/compose/33/Fedora-33-20201019.0/compose/Everything/$basearch/os/",
|
||||
"https://kojipkgs.fedoraproject.org/compose/updates/f33-updates/compose/Everything/$basearch/os/"
|
||||
]
|
||||
"tag_ref": False,
|
||||
"ostree_repo": "/mnt/koji/compose/iot/repo/",
|
||||
"ostree_ref": "fedora/rawhide/${basearch}/iot",
|
||||
"ostree_ref": "fedora/stable/${basearch}/iot",
|
||||
"update_summary": True,
|
||||
}
|
||||
})
|
||||
|
|
@ -278,7 +281,8 @@ ostree_installer = [
|
|||
"aarch64": {
|
||||
"repo": [
|
||||
"IoT",
|
||||
"https://kojipkgs.fedoraproject.org/compose/rawhide/latest-Fedora-Rawhide/compose/Everything/$arch/os/"
|
||||
"https://kojipkgs.fedoraproject.org/compose/33/Fedora-33-20201019.0/compose/Everything/$arch/os/",
|
||||
"https://kojipkgs.fedoraproject.org/compose/updates/f33-updates/compose/Everything/$arch/os/"
|
||||
],
|
||||
"release": None,
|
||||
"rootfs_size": "4",
|
||||
|
|
@ -290,16 +294,17 @@ ostree_installer = [
|
|||
"ostree_osname=fedora-iot",
|
||||
"ostree_oskey=fedora-33-primary",
|
||||
"ostree_contenturl=mirrorlist=https://ostree.fedoraproject.org/iot/mirrorlist",
|
||||
"ostree_install_ref=fedora/rawhide/aarch64/iot",
|
||||
"ostree_update_ref=fedora/rawhide/aarch64/iot",
|
||||
"ostree_install_ref=fedora/stable/aarch64/iot",
|
||||
"ostree_update_ref=fedora/stable/aarch64/iot",
|
||||
],
|
||||
'template_repo': 'https://pagure.io/fedora-lorax-templates.git',
|
||||
'template_branch': 'master',
|
||||
'template_branch': 'f33',
|
||||
},
|
||||
"armhfp": {
|
||||
"repo": [
|
||||
"IoT",
|
||||
"https://kojipkgs.fedoraproject.org/compose/rawhide/latest-Fedora-Rawhide/compose/Everything/$arch/os/"
|
||||
"https://kojipkgs.fedoraproject.org/compose/33/Fedora-33-20201019.0/compose/Everything/$arch/os/",
|
||||
"https://kojipkgs.fedoraproject.org/compose/updates/f33-updates/compose/Everything/$arch/os/"
|
||||
],
|
||||
"release": None,
|
||||
"rootfs_size": "4",
|
||||
|
|
@ -311,16 +316,17 @@ ostree_installer = [
|
|||
"ostree_osname=fedora-iot",
|
||||
"ostree_oskey=fedora-33-primary",
|
||||
"ostree_contenturl=mirrorlist=https://ostree.fedoraproject.org/iot/mirrorlist",
|
||||
"ostree_install_ref=fedora/rawhide/armhfp/iot",
|
||||
"ostree_update_ref=fedora/rawhide/armhfp/iot",
|
||||
"ostree_install_ref=fedora/stable/armhfp/iot",
|
||||
"ostree_update_ref=fedora/stable/armhfp/iot",
|
||||
],
|
||||
'template_repo': 'https://pagure.io/fedora-lorax-templates.git',
|
||||
'template_branch': 'master',
|
||||
'template_branch': 'f33',
|
||||
},
|
||||
"x86_64": {
|
||||
"repo": [
|
||||
"IoT",
|
||||
"https://kojipkgs.fedoraproject.org/compose/rawhide/latest-Fedora-Rawhide/compose/Everything/$arch/os/"
|
||||
"https://kojipkgs.fedoraproject.org/compose/33/Fedora-33-20201019.0/compose/Everything/$arch/os/",
|
||||
"https://kojipkgs.fedoraproject.org/compose/updates/f33-updates/compose/Everything/$arch/os/"
|
||||
],
|
||||
"release": None,
|
||||
"rootfs_size": "4",
|
||||
|
|
@ -332,11 +338,11 @@ ostree_installer = [
|
|||
"ostree_osname=fedora-iot",
|
||||
"ostree_oskey=fedora-33-primary",
|
||||
"ostree_contenturl=mirrorlist=https://ostree.fedoraproject.org/iot/mirrorlist",
|
||||
"ostree_install_ref=fedora/rawhide/x86_64/iot",
|
||||
"ostree_update_ref=fedora/rawhide/x86_64/iot",
|
||||
"ostree_install_ref=fedora/stable/x86_64/iot",
|
||||
"ostree_update_ref=fedora/stable/x86_64/iot",
|
||||
],
|
||||
'template_repo': 'https://pagure.io/fedora-lorax-templates.git',
|
||||
'template_branch': 'master',
|
||||
'template_branch': 'f33',
|
||||
}
|
||||
})
|
||||
]
|
||||
|
|
|
|||
53
sync-release.sh
Executable file
53
sync-release.sh
Executable file
|
|
@ -0,0 +1,53 @@
|
|||
#!/bin/sh
|
||||
set -x
|
||||
export LC_ALL=C
|
||||
LABEL=$1
|
||||
# Remove the label from arguments. It gets special treatment. Other arguments
|
||||
# to the script are passed to pungi-koji directly.
|
||||
shift
|
||||
CONFIG="fedora-iot.conf"
|
||||
TARGET_DIR="/mnt/koji/compose/iot"
|
||||
NIGHTLY=""
|
||||
DEST=$(pwd)
|
||||
DATE=$(date "+%Y%m%d")
|
||||
# the Pungi 'shortname', which we will include in fedmsgs for disambiguation
|
||||
SHORT="Fedora-IoT"
|
||||
RELEASE="33"
|
||||
RELEASE_TITLE="33"
|
||||
COMPSFILE="comps-f33.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/33/"
|
||||
OLDCOMPOSE_ID=$(cat $TARGET_DIR/latest-$SHORT-$RELEASE_TITLE/COMPOSE_ID)
|
||||
|
||||
NEWCOMPOSE_ID=$(cat $TARGET_DIR/latest-$SHORT-$RELEASE_TITLE/COMPOSE_ID)
|
||||
SHORTCOMPOSE_ID=$(echo $NEWCOMPOSE_ID|sed -e 's|Fedora-.*-||g')
|
||||
|
||||
DESTDIR=$TARGET_DIR/$NEWCOMPOSE_ID
|
||||
# Public URL the synced compose will wind up at, we put it in fedmsgs
|
||||
LOCATION="https://dl.fedoraproject.org$RSYNCTARGET"
|
||||
# Update fedmsg template
|
||||
#fedmsg_json_start=$(printf '{"log": "start", "branch": "%s", "arch": "%s", "short": "%s", "compose_id": "%s", "location": "%s"}' "$RELEASE" "$ARCH" "$SHORT" "$NEWCOMPOSE_ID", "$LOCATION")
|
||||
#fedmsg_json_done=$(printf '{"log": "done", "branch": "%s", "arch": "%s", "short": "%s", "compose_id": "%s", "location": "%s"}' "$RELEASE" "$ARCH" "$SHORT" "$NEWCOMPOSE_ID" "$LOCATION")
|
||||
|
||||
$RSYNCPREFIX mkdir -p $DESTDIR
|
||||
# Tell interested persons that the rsync is starting (zomg!)
|
||||
#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/scripts/build_composeinfo "$RSYNCTARGET/" --name $NEWCOMPOSE_ID
|
||||
done
|
||||
# Tell interested persons that the rsync is done.
|
||||
#send_fedmsg "${fedmsg_json_done}" ${RELEASE} rsync.complete
|
||||
# Tell everyone by fedmsg about the compose
|
||||
#send_fedmsg "${fedmsg_json_done}" ${RELEASE} complete
|
||||
#SUBJECT='Fedora IoT'$RELEASE' compose report: '$SHORTCOMPOSE_ID' changes'
|
||||
#for tomail in $TOMAIL ; do
|
||||
# cat $DESTDIR/logs/*verbose $DESTDIR/logs/depcheck | \
|
||||
# mutt -e "set from=\"$FROM\"" -e 'set envelope_from=yes' -s "$SUBJECT" $tomail
|
||||
#done
|
||||
|
||||
#find $TARGET_DIR -xdev -depth -maxdepth 2 -mtime +14 -name Fedora-IoT-${RELEASE}\* -exec rm -rf {} \;
|
||||
|
|
@ -18,7 +18,7 @@ TMPDIR=`mktemp -d /tmp/$RELEASE.$DATE.XXXX`
|
|||
TOMAIL="iot@lists.fedoraproject.org"
|
||||
FROM="Fedora IoT Report <rawhide@fedoraproject.org>"
|
||||
RSYNCPREFIX="sudo -u ftpsync"
|
||||
RSYNCTARGET="/pub/alt/iot/rawhide/"
|
||||
RSYNCTARGET="/pub/alt/iot/branched/"
|
||||
OLDCOMPOSE_ID=$(cat $TARGET_DIR/latest-$SHORT-$RELEASE_TITLE/COMPOSE_ID)
|
||||
|
||||
# assume a releng dir is a git checkout of the releng repo
|
||||
|
|
@ -49,6 +49,9 @@ if [ "$?" != "0" ]; then
|
|||
fi
|
||||
ostree summary --update --repo=/mnt/koji/compose/iot/repo/
|
||||
|
||||
# Exit now we're post release
|
||||
exit 1
|
||||
|
||||
NEWCOMPOSE_ID=$(cat $TARGET_DIR/latest-$SHORT-$RELEASE_TITLE/COMPOSE_ID)
|
||||
SHORTCOMPOSE_ID=$(echo $NEWCOMPOSE_ID|sed -e 's|Fedora-.*-||g')
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue