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

f37: update for branching

Browse source 
Signed-off-by: Peter Robinson <pbrobinson@fedoraproject.org>
This commit is contained in:
Peter Robinson 2022-08-13 15:19:42 +01:00
commit 1bc3d0c8bc
4 changed files with 24 additions and 24 deletions
Download patch file Download diff file Expand all files Collapse all files

32
fedora-iot.conf
View file

@ -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/f37'
global_release = '!RELEASE_FROM_LABEL_DATE_TYPE_RESPIN'
global_version = '37'
# live_images ignores this in favor of live_target
@ -216,7 +216,7 @@ image_build = {
'distro': 'Fedora-30',
'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-37/compose/Everything/$arch/os/",
'subvariant': 'IoT',
}
}
@ -230,14 +230,14 @@ ostree = [
"force_new_commit": True,
"treefile": "fedora-iot.json",
"config_url": "https://pagure.io/fedora-iot/ostree.git",
"config_branch": "main",
"config_branch": "f37",
"repo": [
"IoT",
"https://kojipkgs.fedoraproject.org/compose/rawhide/latest-Fedora-Rawhide/compose/Everything/$basearch/os/"
"https://kojipkgs.fedoraproject.org/compose/branched/latest-Fedora-37/compose/Everything/$basearch/os/"
]
"tag_ref": False,
"ostree_repo": "/mnt/koji/compose/iot/repo/",
"ostree_ref": "fedora/rawhide/${basearch}/iot",
"ostree_ref": "fedora/devel/${basearch}/iot",
"update_summary": True,
},
"x86_64": {
@ -245,14 +245,14 @@ ostree = [
"force_new_commit": True,
"treefile": "fedora-iot.json",
"config_url": "https://pagure.io/fedora-iot/ostree.git",
"config_branch": "main",
"config_branch": "f37",
"repo": [
"IoT",
"https://kojipkgs.fedoraproject.org/compose/rawhide/latest-Fedora-Rawhide/compose/Everything/$basearch/os/"
"https://kojipkgs.fedoraproject.org/compose/branched/latest-Fedora-37/compose/Everything/$basearch/os/"
]
"tag_ref": False,
"ostree_repo": "/mnt/koji/compose/iot/repo/",
"ostree_ref": "fedora/rawhide/${basearch}/iot",
"ostree_ref": "fedora/devel/${basearch}/iot",
"update_summary": True,
}
})
@ -263,7 +263,7 @@ ostree_installer = [
"aarch64": {
"repo": [
"IoT",
"https://kojipkgs.fedoraproject.org/compose/rawhide/latest-Fedora-Rawhide/compose/Everything/$arch/os/"
"https://kojipkgs.fedoraproject.org/compose/branched/latest-Fedora-37/compose/Everything/$arch/os/"
],
"release": None,
"rootfs_size": "4",
@ -275,16 +275,16 @@ ostree_installer = [
"ostree_osname=fedora-iot",
"ostree_oskey=fedora-37-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/devel/aarch64/iot",
"ostree_update_ref=fedora/devel/aarch64/iot",
],
'template_repo': 'https://pagure.io/fedora-lorax-templates.git',
'template_branch': 'main',
'template_branch': 'f37',
},
"x86_64": {
"repo": [
"IoT",
"https://kojipkgs.fedoraproject.org/compose/rawhide/latest-Fedora-Rawhide/compose/Everything/$arch/os/"
"https://kojipkgs.fedoraproject.org/compose/branched/latest-Fedora-37/compose/Everything/$arch/os/"
],
"release": None,
"rootfs_size": "4",
@ -296,11 +296,11 @@ ostree_installer = [
"ostree_osname=fedora-iot",
"ostree_oskey=fedora-37-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/devel/x86_64/iot",
"ostree_update_ref=fedora/devel/x86_64/iot",
],
'template_repo': 'https://pagure.io/fedora-lorax-templates.git',
'template_branch': 'main',
'template_branch': 'f37',
}
})
]

6
nightly.sh
View file

@ -9,9 +9,9 @@ SKIP_PHASES="--skip-phase=productimg"
DEST=$(pwd)
DATE=$(date "+%Y%m%d")
SHORT="Fedora-IoT"
RELEASE="30"
RELEASE_TITLE="30"
COMPSFILE="comps-f30.xml"
RELEASE="37"
RELEASE_TITLE="37"
COMPSFILE="comps-f37.xml"
TMPDIR=`mktemp -d /tmp/$RELEASE.$DATE.XXXX`
TOMAIL="iot@lists.fedoraproject.org"
FROM="Fedora IoT Report <rawhide@fedoraproject.org>"

8
sync-release.sh
View file

@ -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="36"
RELEASE_TITLE="36"
COMPSFILE="comps-f36.xml"
RELEASE="37"
RELEASE_TITLE="37"
COMPSFILE="comps-f37.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/36/"
RSYNCTARGET="/pub/alt/iot/37/"
OLDCOMPOSE_ID=$(cat $TARGET_DIR/latest-$SHORT-$RELEASE_TITLE/COMPOSE_ID)
NEWCOMPOSE_ID=$(cat $TARGET_DIR/latest-$SHORT-$RELEASE_TITLE/COMPOSE_ID)

2
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