iot/pungi-iot
0
0
Fork 1
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

IoT: setup for F-30 branched compose

Browse source 
Signed-off-by: Peter Robinson <pbrobinson@fedoraproject.org>
This commit is contained in:
Peter Robinson 2019-02-25 09:35:04 +00:00
commit 149293e717
2 changed files with 12 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

21
fedora-iot.conf
View file

@ -38,7 +38,6 @@ pkgset_source = 'koji' # koji, repos
# pkgset_repos = {}
# PKGSET - KOJI
#pkgset_koji_tag = 'f30-atomic'
pkgset_koji_tag = 'f30-iot'
pkgset_koji_inherit = False
@ -220,7 +219,7 @@ image_build = {
'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/",
'install_tree_from': "https://kojipkgs.fedoraproject.org/compose/branched/latest-Fedora-30/compose/Everything/$arch/os/",
'subvariant': 'IoT',
}
}
@ -232,10 +231,10 @@ ostree = [
"aarch64": {
"version": "!OSTREE_VERSION_FROM_LABEL_DATE_TYPE_RESPIN",
"treefile": "fedora-iot.json",
"config_url": "https://pagure.io/fedora-iot/atomic.git",
"config_url": "https://pagure.io/fedora-iot/ostree.git",
"config_branch": "master",
"repo": [
"https://kojipkgs.fedoraproject.org/compose/rawhide/latest-Fedora-Rawhide/compose/Everything/$basearch/os/"
"https://kojipkgs.fedoraproject.org/compose/branched/latest-Fedora-30/compose/Everything/$basearch/os/"
]
"tag_ref": False,
"ostree_repo": "/mnt/koji/compose/iot/repo/",
@ -245,10 +244,10 @@ ostree = [
"armhfp": {
"version": "!OSTREE_VERSION_FROM_LABEL_DATE_TYPE_RESPIN",
"treefile": "fedora-iot.json",
"config_url": "https://pagure.io/fedora-iot/atomic.git",
"config_url": "https://pagure.io/fedora-iot/ostree.git",
"config_branch": "master",
"repo": [
"https://kojipkgs.fedoraproject.org/compose/rawhide/latest-Fedora-Rawhide/compose/Everything/$basearch/os/"
"https://kojipkgs.fedoraproject.org/compose/branched/latest-Fedora-30/compose/Everything/$basearch/os/"
]
"tag_ref": False,
"ostree_repo": "/mnt/koji/compose/iot/repo/",
@ -258,10 +257,10 @@ ostree = [
"x86_64": {
"version": "!OSTREE_VERSION_FROM_LABEL_DATE_TYPE_RESPIN",
"treefile": "fedora-iot.json",
"config_url": "https://pagure.io/fedora-iot/atomic.git",
"config_url": "https://pagure.io/fedora-iot/ostree.git",
"config_branch": "master",
"repo": [
"https://kojipkgs.fedoraproject.org/compose/rawhide/latest-Fedora-Rawhide/compose/Everything/$basearch/os/"
"https://kojipkgs.fedoraproject.org/compose/branched/latest-Fedora-30/compose/Everything/$basearch/os/"
]
"tag_ref": False,
"ostree_repo": "/mnt/koji/compose/iot/repo/",
@ -275,7 +274,7 @@ ostree_installer = [
("^IoT$", {
"aarch64": {
"repo": [
"https://kojipkgs.fedoraproject.org/compose/rawhide/latest-Fedora-Rawhide/compose/Everything/$arch/os/"
"https://kojipkgs.fedoraproject.org/compose/branched/latest-Fedora-30/compose/Everything/$arch/os/"
],
"release": None,
"rootfs_size": "4",
@ -295,7 +294,7 @@ ostree_installer = [
},
"armhfp": {
"repo": [
"https://kojipkgs.fedoraproject.org/compose/rawhide/latest-Fedora-Rawhide/compose/Everything/$arch/os/"
"https://kojipkgs.fedoraproject.org/compose/branched/latest-Fedora-30/compose/Everything/$arch/os/"
],
"release": None,
"rootfs_size": "4",
@ -315,7 +314,7 @@ ostree_installer = [
},
"x86_64": {
"repo": [
"https://kojipkgs.fedoraproject.org/compose/rawhide/latest-Fedora-Rawhide/compose/Everything/$arch/os/"
"https://kojipkgs.fedoraproject.org/compose/branched/latest-Fedora-30/compose/Everything/$arch/os/"
],
"release": None,
"rootfs_size": "4",

4
twoweek-nightly.sh
View file

@ -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
@ -77,4 +77,4 @@ SUBJECT='Fedora '$RELEASE' compose report: '$SHORTCOMPOSE_ID' changes'
# 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 {} \;
#find $TARGET_DIR -xdev -depth -maxdepth 2 -mtime +14 -name Fedora-IoT-${RELEASE}\* -exec rm -rf {} \;