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

setup F-31 IoT for branched composes

Browse source 
Signed-off-by: Peter Robinson <pbrobinson@fedoraproject.org>
This commit is contained in:
Peter Robinson 2019-08-27 20:39:53 +01:00
commit 0bd4fbd2b0
2 changed files with 25 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

43
fedora-iot.conf
View file

@ -205,7 +205,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/f31'
global_release = '!RELEASE_FROM_LABEL_DATE_TYPE_RESPIN'
global_version = '31'
# live_images ignores this in favor of live_target
@ -220,7 +220,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-31/compose/Everything/$arch/os/",
'subvariant': 'IoT',
}
}
@ -233,9 +233,10 @@ ostree = [
"version": "!OSTREE_VERSION_FROM_LABEL_DATE_TYPE_RESPIN",
"treefile": "fedora-iot.json",
"config_url": "https://pagure.io/fedora-iot/ostree.git",
"config_branch": "master",
"config_branch": "f31",
"repo": [
"https://kojipkgs.fedoraproject.org/compose/rawhide/latest-Fedora-Rawhide/compose/Everything/$basearch/os/"
"IoT",
"https://kojipkgs.fedoraproject.org/compose/branched/latest-Fedora-31/compose/Everything/$basearch/os/",
]
"tag_ref": False,
"ostree_repo": "/mnt/koji/compose/iot/repo/",
@ -246,9 +247,10 @@ ostree = [
"version": "!OSTREE_VERSION_FROM_LABEL_DATE_TYPE_RESPIN",
"treefile": "fedora-iot.json",
"config_url": "https://pagure.io/fedora-iot/ostree.git",
"config_branch": "master",
"config_branch": "f31",
"repo": [
"https://kojipkgs.fedoraproject.org/compose/rawhide/latest-Fedora-Rawhide/compose/Everything/$basearch/os/"
"IoT",
"https://kojipkgs.fedoraproject.org/compose/branched/latest-Fedora-31/compose/Everything/$basearch/os/",
]
"tag_ref": False,
"ostree_repo": "/mnt/koji/compose/iot/repo/",
@ -259,9 +261,10 @@ ostree = [
"version": "!OSTREE_VERSION_FROM_LABEL_DATE_TYPE_RESPIN",
"treefile": "fedora-iot.json",
"config_url": "https://pagure.io/fedora-iot/ostree.git",
"config_branch": "master",
"config_branch": "f31",
"repo": [
"https://kojipkgs.fedoraproject.org/compose/rawhide/latest-Fedora-Rawhide/compose/Everything/$basearch/os/"
"IoT",
"https://kojipkgs.fedoraproject.org/compose/branched/latest-Fedora-31/compose/Everything/$basearch/os/",
]
"tag_ref": False,
"ostree_repo": "/mnt/koji/compose/iot/repo/",
@ -275,7 +278,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-31/compose/Everything/$arch/os/"
],
"release": None,
"rootfs_size": "4",
@ -287,15 +290,15 @@ ostree_installer = [
"ostree_osname=fedora-iot",
"ostree_oskey=fedora-31",
"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/devel/aarch64/iot",
"ostree_update_ref=fedora/devel/aarch64/iot",
],
'template_repo': 'https://pagure.io/fedora-lorax-templates.git',
'template_branch': 'master',
'template_branch': 'f31',
},
"armhfp": {
"repo": [
"https://kojipkgs.fedoraproject.org/compose/rawhide/latest-Fedora-Rawhide/compose/Everything/$arch/os/"
"https://kojipkgs.fedoraproject.org/compose/branched/latest-Fedora-31/compose/Everything/$arch/os/"
],
"release": None,
"rootfs_size": "4",
@ -307,15 +310,15 @@ ostree_installer = [
"ostree_osname=fedora-iot",
"ostree_oskey=fedora-31",
"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/devel/armhfp/iot",
"ostree_update_ref=fedora/devel/armhfp/iot",
],
'template_repo': 'https://pagure.io/fedora-lorax-templates.git',
'template_branch': 'master',
'template_branch': 'f31',
},
"x86_64": {
"repo": [
"https://kojipkgs.fedoraproject.org/compose/rawhide/latest-Fedora-Rawhide/compose/Everything/$arch/os/"
"https://kojipkgs.fedoraproject.org/compose/branched/latest-Fedora-31/compose/Everything/$arch/os/"
],
"release": None,
"rootfs_size": "4",
@ -327,11 +330,11 @@ ostree_installer = [
"ostree_osname=fedora-iot",
"ostree_oskey=fedora-31",
"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/devel/x86_64/iot",
"ostree_update_ref=fedora/devel/x86_64/iot",
],
'template_repo': 'https://pagure.io/fedora-lorax-templates.git',
'template_branch': 'master',
'template_branch': 'f31',
}
})
]

4
twoweek-nightly.sh
View file

@ -16,9 +16,9 @@ RELEASE_TITLE="31"
COMPSFILE="comps-f31.xml"
TMPDIR=`mktemp -d /tmp/$RELEASE.$DATE.XXXX`
TOMAIL="iot@lists.fedoraproject.org"
FROM="Fedora IoT Report <rawhide@fedoraproject.org>"
FROM="Fedora IoT Report <branched@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