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

Compare commits

merge into: iot:main
Branches Tags
iot:main
iot:f45
iot:f43
iot:f44
iot:f44-enable-updates
iot:master
iot:f43-bootc-only
iot:f44-stable
iot:f42
iot:f41
iot:f40
iot:f39
iot:f38
iot:f36
iot:f37
iot:f35
iot:f34
iot:f33
iot:f32
iot:f31
iot:f30
iot:f29
iot:f28
...
pull from: iot:f37
Branches Tags
iot:f45
iot:main
iot:f43
iot:f44
iot:f44-enable-updates
iot:master
iot:f43-bootc-only
iot:f44-stable
iot:f42
iot:f41
iot:f40
iot:f39
iot:f38
iot:f36
iot:f37
iot:f35
iot:f34
iot:f33
iot:f32
iot:f31
iot:f30
iot:f29
iot:f28
Sign in to create a new pull request.

4 commits
main ... f37

Author SHA1 Message Date
Peter Robinson
51ef67914d F-37 IoT: enable updates repo 
Signed-off-by: Peter Robinson <pbrobinson@fedoraproject.org>
 2022-11-21 10:26:51 +00:00
Peter Robinson
457e8b8456 Update F-37 IoT for stable 
Signed-off-by: Peter Robinson <pbrobinson@fedoraproject.org>
 2022-11-16 12:46:40 +00:00
Adam Williamson
03f82e7e45 Set createiso to use xorrisofs (should fix compose) 
This is needed since this Change:
https://fedoraproject.org/wiki/Changes/BIOSBootISOWithGrub2

Signed-off-by: Adam Williamson <awilliam@redhat.com>
 2022-08-16 08:16:26 -04:00
Peter Robinson
1bc3d0c8bc f37: update for branching 
Signed-off-by: Peter Robinson <pbrobinson@fedoraproject.org>
 2022-08-13 15:19:42 +01:00
4 changed files with 35 additions and 24 deletions
Download patch file Download diff file Expand all files Collapse all files

40
fedora-iot.conf
View file

@ -64,6 +64,10 @@ media_checksum_base_filename = '%(release_short)s-%(version)s-%(arch)s-%(date)s%
#jigdo #jigdo
create_jigdo = False create_jigdo = False
# CREATEISO
# use xorrisofs to make isos
createiso_use_xorrisofs = True
# BUILDINSTALL # BUILDINSTALL
buildinstall_method = 'lorax' buildinstall_method = 'lorax'
buildinstall_skip = [ buildinstall_skip = [
@ -200,7 +204,7 @@ translate_paths = [
] ]
# These will be inherited by live_media, live_images and image_build # 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_release = '!RELEASE_FROM_LABEL_DATE_TYPE_RESPIN'
global_version = '37' global_version = '37'
# live_images ignores this in favor of live_target # live_images ignores this in favor of live_target
@ -216,7 +220,7 @@ image_build = {
'distro': 'Fedora-30', 'distro': 'Fedora-30',
'disk_size': 4, 'disk_size': 4,
'arches': ['aarch64', 'x86_64'], '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/37/Fedora-37-20221105.0/compose/Everything/$arch/os/",
'subvariant': 'IoT', 'subvariant': 'IoT',
} }
} }
@ -230,14 +234,15 @@ ostree = [
"force_new_commit": True, "force_new_commit": True,
"treefile": "fedora-iot.json", "treefile": "fedora-iot.json",
"config_url": "https://pagure.io/fedora-iot/ostree.git", "config_url": "https://pagure.io/fedora-iot/ostree.git",
"config_branch": "main", "config_branch": "f37",
"repo": [ "repo": [
"IoT", "IoT",
"https://kojipkgs.fedoraproject.org/compose/rawhide/latest-Fedora-Rawhide/compose/Everything/$basearch/os/" "https://kojipkgs.fedoraproject.org/compose/37/Fedora-37-20221105.0/compose/Everything/$basearch/os/",
"https://kojipkgs.fedoraproject.org/compose/updates/f37-updates/compose/Everything/$basearch/os/"
] ]
"tag_ref": False, "tag_ref": False,
"ostree_repo": "/mnt/koji/compose/iot/repo/", "ostree_repo": "/mnt/koji/compose/iot/repo/",
"ostree_ref": "fedora/rawhide/${basearch}/iot", "ostree_ref": "fedora/stable/${basearch}/iot",
"update_summary": True, "update_summary": True,
}, },
"x86_64": { "x86_64": {
@ -245,14 +250,15 @@ ostree = [
"force_new_commit": True, "force_new_commit": True,
"treefile": "fedora-iot.json", "treefile": "fedora-iot.json",
"config_url": "https://pagure.io/fedora-iot/ostree.git", "config_url": "https://pagure.io/fedora-iot/ostree.git",
"config_branch": "main", "config_branch": "f37",
"repo": [ "repo": [
"IoT", "IoT",
"https://kojipkgs.fedoraproject.org/compose/rawhide/latest-Fedora-Rawhide/compose/Everything/$basearch/os/" "https://kojipkgs.fedoraproject.org/compose/37/Fedora-37-20221105.0/compose/Everything/$basearch/os/",
"https://kojipkgs.fedoraproject.org/compose/updates/f37-updates/compose/Everything/$basearch/os/"
] ]
"tag_ref": False, "tag_ref": False,
"ostree_repo": "/mnt/koji/compose/iot/repo/", "ostree_repo": "/mnt/koji/compose/iot/repo/",
"ostree_ref": "fedora/rawhide/${basearch}/iot", "ostree_ref": "fedora/stable/${basearch}/iot",
"update_summary": True, "update_summary": True,
} }
}) })
@ -263,7 +269,8 @@ ostree_installer = [
"aarch64": { "aarch64": {
"repo": [ "repo": [
"IoT", "IoT",
"https://kojipkgs.fedoraproject.org/compose/rawhide/latest-Fedora-Rawhide/compose/Everything/$arch/os/" "https://kojipkgs.fedoraproject.org/compose/37/Fedora-37-20221105.0/compose/Everything/$arch/os/",
"https://kojipkgs.fedoraproject.org/compose/updates/f37-updates/compose/Everything/$arch/os/"
], ],
"release": None, "release": None,
"rootfs_size": "4", "rootfs_size": "4",
@ -275,16 +282,17 @@ ostree_installer = [
"ostree_osname=fedora-iot", "ostree_osname=fedora-iot",
"ostree_oskey=fedora-37-primary", "ostree_oskey=fedora-37-primary",
"ostree_contenturl=mirrorlist=https://ostree.fedoraproject.org/iot/mirrorlist", "ostree_contenturl=mirrorlist=https://ostree.fedoraproject.org/iot/mirrorlist",
"ostree_install_ref=fedora/rawhide/aarch64/iot", "ostree_install_ref=fedora/stable/aarch64/iot",
"ostree_update_ref=fedora/rawhide/aarch64/iot", "ostree_update_ref=fedora/stable/aarch64/iot",
], ],
'template_repo': 'https://pagure.io/fedora-lorax-templates.git', 'template_repo': 'https://pagure.io/fedora-lorax-templates.git',
'template_branch': 'main', 'template_branch': 'f37',
}, },
"x86_64": { "x86_64": {
"repo": [ "repo": [
"IoT", "IoT",
"https://kojipkgs.fedoraproject.org/compose/rawhide/latest-Fedora-Rawhide/compose/Everything/$arch/os/" "https://kojipkgs.fedoraproject.org/compose/37/Fedora-37-20221105.0/compose/Everything/$arch/os/",
"https://kojipkgs.fedoraproject.org/compose/updates/f37-updates/compose/Everything/$arch/os/"
], ],
"release": None, "release": None,
"rootfs_size": "4", "rootfs_size": "4",
@ -296,11 +304,11 @@ ostree_installer = [
"ostree_osname=fedora-iot", "ostree_osname=fedora-iot",
"ostree_oskey=fedora-37-primary", "ostree_oskey=fedora-37-primary",
"ostree_contenturl=mirrorlist=https://ostree.fedoraproject.org/iot/mirrorlist", "ostree_contenturl=mirrorlist=https://ostree.fedoraproject.org/iot/mirrorlist",
"ostree_install_ref=fedora/rawhide/x86_64/iot", "ostree_install_ref=fedora/stable/x86_64/iot",
"ostree_update_ref=fedora/rawhide/x86_64/iot", "ostree_update_ref=fedora/stable/x86_64/iot",
], ],
'template_repo': 'https://pagure.io/fedora-lorax-templates.git', '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) DEST=$(pwd)
DATE=$(date "+%Y%m%d") DATE=$(date "+%Y%m%d")
SHORT="Fedora-IoT" SHORT="Fedora-IoT"
RELEASE="30" RELEASE="37"
RELEASE_TITLE="30" RELEASE_TITLE="37"
COMPSFILE="comps-f30.xml" COMPSFILE="comps-f37.xml"
TMPDIR=`mktemp -d /tmp/$RELEASE.$DATE.XXXX` TMPDIR=`mktemp -d /tmp/$RELEASE.$DATE.XXXX`
TOMAIL="iot@lists.fedoraproject.org" TOMAIL="iot@lists.fedoraproject.org"
FROM="Fedora IoT Report <rawhide@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") DATE=$(date "+%Y%m%d")
# the Pungi 'shortname', which we will include in fedmsgs for disambiguation # the Pungi 'shortname', which we will include in fedmsgs for disambiguation
SHORT="Fedora-IoT" SHORT="Fedora-IoT"
RELEASE="36" RELEASE="37"
RELEASE_TITLE="36" RELEASE_TITLE="37"
COMPSFILE="comps-f36.xml" COMPSFILE="comps-f37.xml"
TMPDIR=`mktemp -d /tmp/$RELEASE.$DATE.XXXX` TMPDIR=`mktemp -d /tmp/$RELEASE.$DATE.XXXX`
TOMAIL="iot@lists.fedoraproject.org" TOMAIL="iot@lists.fedoraproject.org"
FROM="Fedora IoT Report <branched@fedoraproject.org>" FROM="Fedora IoT Report <branched@fedoraproject.org>"
RSYNCPREFIX="sudo -u ftpsync" 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) OLDCOMPOSE_ID=$(cat $TARGET_DIR/latest-$SHORT-$RELEASE_TITLE/COMPOSE_ID)
NEWCOMPOSE_ID=$(cat $TARGET_DIR/latest-$SHORT-$RELEASE_TITLE/COMPOSE_ID) NEWCOMPOSE_ID=$(cat $TARGET_DIR/latest-$SHORT-$RELEASE_TITLE/COMPOSE_ID)

5
twoweek-nightly.sh
View file

@ -18,7 +18,7 @@ TMPDIR=`mktemp -d /tmp/$RELEASE.$DATE.XXXX`
TOMAIL="iot@lists.fedoraproject.org" TOMAIL="iot@lists.fedoraproject.org"
FROM="Fedora IoT Report <rawhide@fedoraproject.org>" FROM="Fedora IoT Report <rawhide@fedoraproject.org>"
RSYNCPREFIX="sudo -u ftpsync" 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) OLDCOMPOSE_ID=$(cat $TARGET_DIR/latest-$SHORT-$RELEASE_TITLE/COMPOSE_ID)
# assume a releng dir is a git checkout of the releng repo # assume a releng dir is a git checkout of the releng repo
@ -49,6 +49,9 @@ if [ "$?" != "0" ]; then
fi fi
ostree summary --update --repo=/mnt/koji/compose/iot/repo/ 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) NEWCOMPOSE_ID=$(cat $TARGET_DIR/latest-$SHORT-$RELEASE_TITLE/COMPOSE_ID)
SHORTCOMPOSE_ID=$(echo $NEWCOMPOSE_ID|sed -e 's|Fedora-.*-||g') SHORTCOMPOSE_ID=$(echo $NEWCOMPOSE_ID|sed -e 's|Fedora-.*-||g')