diff --git a/fedora-iot.conf b/fedora-iot.conf index a3a3c10..0862e81 100644 --- a/fedora-iot.conf +++ b/fedora-iot.conf @@ -1,34 +1,35 @@ # PRODUCT INFO release_name = 'Fedora-IoT' release_short = 'Fedora-IoT' -release_version = '46' +release_version = '30' +release_is_layered = False # Let's not build install media during this run. For the image builds -# and OSTree installer we'll use inputs from other f45 runs. -skip_phases = ["buildinstall", "createrepo", "extra_files"] +# and OSTree installer we'll use inputs from other f30 runs. +skip_phases = ["buildinstall", "productimg", "extra_files"] +ostree_installer_overwrite = True # GENERAL SETTINGS +bootable = True comps_file = { 'scm': 'git', - 'repo': 'https://forge.fedoraproject.org/releng/fedora-comps.git', - 'branch': 'main', - 'file': 'comps-f46.xml', - 'command': 'make comps-f46.xml' + 'repo': 'https://pagure.io/fedora-comps.git', + 'branch': 'master', + 'file': 'comps-f30.xml', + 'command': 'make comps-f30.xml' } variants_file='variants-fedora.xml' -sigkeys = ['91211FCE'] - +sigkeys = ['CFC659B9'] # limit tree architectures # if undefined, all architectures from variants.xml will be included -tree_arches = ['aarch64', 'x86_64', "ppc64le", "s390x"] +# tree_arches = ['aarch64', 'armhfp', 'x86_64'] # limit tree variants # if undefined, all variants from variants.xml will be included tree_variants = ['IoT'] hashed_directories = True - # RUNROOT settings +runroot = True runroot_channel = 'compose' -runroot_tag = 'f46-build' - +runroot_tag = 'f30-build' # PKGSET pkgset_source = 'koji' # koji, repos @@ -37,36 +38,26 @@ pkgset_source = 'koji' # koji, repos # pkgset_repos = {} # PKGSET - KOJI -pkgset_koji_tag = 'f46-iot' +pkgset_koji_tag = 'f30-iot' pkgset_koji_inherit = False filter_system_release_packages = False # GATHER -gather_method = { - '^.*': { # For all variants - 'comps': 'deps', # resolve dependencies for packages from comps file - 'module': 'nodeps', # but not for packages from modules - } -} -gather_backend = 'dnf' +gather_method = 'deps' gather_profiler = True check_deps = False greedy_method = 'build' - -repoclosure_backend = 'dnf' - +# CREATEREPO +createrepo_c = True +createrepo_checksum = 'sha256' # CHECKSUMS media_checksums = ['sha256'] media_checksum_one_file = True -media_checksum_base_filename = '%(release_short)s-%(version)s-%(arch)s-%(date)s%(type_suffix)s.%(respin)s' +media_checksum_base_filename = 'Fedora-%(variant)s-%(version)s-%(date)s.%(respin)s-%(arch)s' #jigdo create_jigdo = False -# CREATEISO -# use xorrisofs to make isos -createiso_use_xorrisofs = True - # BUILDINSTALL buildinstall_method = 'lorax' buildinstall_skip = [ @@ -75,11 +66,12 @@ buildinstall_skip = [ }), ] -# disables macboot and upgrade image building +# Enables macboot on x86_64 for all variants and disables upgrade image building +# # everywhere. lorax_options = [ ('^.*$', { 'x86_64': { - 'nomacboot': True + 'nomacboot': False }, '*': { 'noupgrade': True @@ -87,6 +79,8 @@ lorax_options = [ }) ] +# We just grab everything, since everything that's gather'ed is meant as an +# override. additional_packages = [ ('^IoT$$', { '*': [ @@ -105,12 +99,11 @@ filter_packages = [] multilib_blacklist = { '*': ['kernel', 'kernel-PAE*', 'kernel*debug*', 'dmraid-devel', 'kdeutils-devel', 'mkinitrd-devel', - 'php-devel', 'java-*', 'bash-devel', + 'php-devel', 'java-*', 'httpd-devel', 'tomcat-native', 'php*', 'httpd', 'krb5-server', 'krb5-server-ldap', 'mod_*', 'ghc-*' ], } - # format: {arch|*: [packages]} multilib_whitelist = { '*': ['libgnat', 'wine', 'lmms-vst', 'nspluginwrapper', @@ -119,24 +112,33 @@ multilib_whitelist = { 'syslinux-tftpboot', 'nosync', '*-static', 'apitrace-libs', 'fakeroot-libs', 'postgresql-odbc', 'mysql-connector-odbc', 'fakechroot-libs','mesa-vdpau-drivers', 'p11-kit-trust', - 'mariadb-connector-odbc', 'compiler-rt', - 'nvidia-query-resource-opengl-lib', - 'ibus-libs', 'ibus-gtk2', 'ibus-gtk3', - 'glib-networking' + 'mariadb-connector-odbc', 'compiler-rt' ], } - createiso_skip = [ + ('^Workstation$', { + '*': True, + 'src': True + }), + + ('^Server$', { + 'src': True + }), + ('^Everything$', { '*': True, 'src': True }), + ('^Modular$', { + '*': True, + 'src': True + }), ] # fomat: [(variant_uid_regex, {arch|*: [scm_dicts]})] #extra_files = [ -# ('^(Server)$', { +# ('^(Server|Workstation)$', { # '*': [ # { # 'scm': 'rpm', @@ -150,12 +152,11 @@ createiso_skip = [ # ], # }), #] - # Image name respecting Fedora's image naming policy -image_name_format = '%(release_short)s-%(disc_type)s-%(arch)s-%(version)s-%(date)s%(type_suffix)s.%(respin)s.iso' +image_name_format = 'Fedora-%(variant)s-%(disc_type)s-%(arch)s-%(version)s-%(date)s.%(respin)s.iso' # # Use the same format for volume id image_volid_formats = [ - '%(release_short)s-%(disc_type)s-%(arch)s-%(version)s' + 'Fedora-%(variant)s-%(disc_type)s-%(arch)s-%(version)s' ] # No special handling for layered products, use same format as for regular images image_volid_layered_product_formats = [] @@ -166,15 +167,15 @@ image_volid_layered_product_formats = [] # allow Pungi to tell it what volume ID to use. Note: # https://fedoraproject.org/wiki/User:Adamwill/Draft_fedora_image_naming_policy # '-Workstation-' is a temporary workaround. See -# https://forge.fedoraproject.org/releng/pungi-fedora/pulls/525 +# https://pagure.io/pungi-fedora/pull-request/525 volume_id_substitutions = { 'Beta': 'B', 'Rawhide': 'rawh', 'Astronomy_KDE': 'AstK', - 'Silverblue': 'SB', + 'AtomicHost': 'AH', + 'AtomicWorkstation': 'AW', 'Cinnamon': 'Cinn', 'Cloud': 'C', - 'Comp_Neuro': 'CNr', 'Design_suite': 'Dsgn', 'Electronic_Lab': 'Elec', 'Everything': 'E', @@ -183,7 +184,7 @@ volume_id_substitutions = { 'IoT': 'iot', 'Jam_KDE': 'Jam', 'MATE_Compiz': 'MATE', - # Note https://forge.fedoraproject.org/releng/pungi-fedora/issues/533 + # Note https://pagure.io/pungi-fedora/issue/533 'Python-Classroom': 'Clss', 'Python_Classroom': 'Clss', 'Robotics': 'Robo', @@ -199,108 +200,148 @@ disc_types = { } translate_paths = [ - ('/mnt/koji/compose/', 'https://kojipkgs.fedoraproject.org/compose/'), + ('/mnt/koji/compose/', 'http://kojipkgs.fedoraproject.org/compose/'), ] -# These may be inherited by various phases for creating Koji tasks +# These will be inherited by live_media, live_images and image_build +global_ksurl = 'git+https://pagure.io/fedora-kickstarts.git?#origin/f30' global_release = '!RELEASE_FROM_LABEL_DATE_TYPE_RESPIN' -global_version = '46' -global_target = 'f46' - -imagebuilder_target = 'f46-image-builder' -imagebuilder = { - "^IoT$": [ - { - "name": "%s-raw" % release_name, - "types": ["iot-raw-xz"], - "arches": ["x86_64", "aarch64"], - "repos": ["https://kojipkgs.fedoraproject.org/compose/rawhide/latest-Fedora-Rawhide/compose/Everything/$arch/os/"], - "ostree": { - "url": "https://kojipkgs.fedoraproject.org/compose/iot/repo/", - "ref": "fedora/rawhide/$arch/iot", - }, - "subvariant": "IoT", - "failable": ["*"], - }, - { - "name": "%s-ostree" % release_name, - "types": ["iot-installer"], - "arches": ["x86_64", "aarch64"], - "repos": ["https://kojipkgs.fedoraproject.org/compose/rawhide/latest-Fedora-Rawhide/compose/Everything/$arch/os/"], - "ostree": { - "url": "https://kojipkgs.fedoraproject.org/compose/iot/repo/", - "ref": "fedora/rawhide/$arch/iot", - }, - "subvariant": "IoT", - "manifest_type": "dvd-ostree", - "failable": ["*"], - }, - { - "name": "%s-provisioner" % release_name, - "types": ["iot-simplified-installer"], - "arches": ["x86_64", "aarch64"], - "repos": ["https://kojipkgs.fedoraproject.org/compose/rawhide/latest-Fedora-Rawhide/compose/Everything/$arch/os/"], - "ostree": { - "url": "https://kojipkgs.fedoraproject.org/compose/iot/repo/", - "ref": "fedora/rawhide/$arch/iot", - }, - "blueprint": { - "customizations": { - "installation_device": "/dev/vda1", - }, - }, - "subvariant": "IoT_Simplified_Provisioner", - "failable": ["*"], - "manifest_type": "dvd-ostree", - }, - ], +global_version = '30' +# live_images ignores this in favor of live_target +global_target = 'f30' +image_build = { + '^IoT$': [ + { + 'image-build': { + 'format': [('raw-xz','raw.xz')], + 'name': 'Fedora-IoT', + 'kickstart': 'fedora-iot.ks', + 'distro': 'Fedora-22', + 'disk_size': 4, + 'arches': ['aarch64', 'armhfp', 'x86_64'], + 'install_tree_from': "https://kojipkgs.fedoraproject.org/compose/30/latest-Fedora-30/compose/Everything/$arch/os/", + 'subvariant': 'IoT', + 'failable': ['armhfp'], + } + } + ], } -ostree = { - "^IoT$": { +ostree = [ + ("^IoT$", { + "aarch64": { "version": "!OSTREE_VERSION_FROM_LABEL_DATE_TYPE_RESPIN", - "force_new_commit": True, - "unified_core": True, - "treefile": "fedora-iot.yaml", - "config_url": "https://forge.fedoraproject.org/iot/ostree.git", - "config_branch": "main", + "treefile": "fedora-iot.json", + "config_url": "https://pagure.io/fedora-iot/ostree.git", + "config_branch": "f30", "repo": [ "IoT", - "https://kojipkgs.fedoraproject.org/compose/rawhide/latest-Fedora-Rawhide/compose/Everything/$basearch/os/" + "https://kojipkgs.fedoraproject.org/compose/30/latest-Fedora-30/compose/Everything/$basearch/os/", + "https://kojipkgs.fedoraproject.org/compose/updates/f30-updates/compose/Everything/$basearch/os/", ] "tag_ref": False, "ostree_repo": "/mnt/koji/compose/iot/repo/", - "ostree_ref": "fedora/rawhide/${basearch}/iot", - "runroot_packages": ["selinux-policy-targeted"], - "arches": ["x86_64", "aarch64"], - "update_summary": True, + 'failable': ['*'], + 'update_summary': True, + }, + "armhfp": { + "version": "!OSTREE_VERSION_FROM_LABEL_DATE_TYPE_RESPIN", + "treefile": "fedora-iot.json", + "config_url": "https://pagure.io/fedora-iot/ostree.git", + "config_branch": "f30", + "repo": [ + "IoT", + "https://kojipkgs.fedoraproject.org/compose/30/latest-Fedora-30/compose/Everything/$basearch/os/", + "https://kojipkgs.fedoraproject.org/compose/updates/f30-updates/compose/Everything/$basearch/os/", + ] + "tag_ref": False, + "ostree_repo": "/mnt/koji/compose/iot/repo/", + 'failable': ['*'], + 'update_summary': True, + }, + "x86_64": { + "version": "!OSTREE_VERSION_FROM_LABEL_DATE_TYPE_RESPIN", + "treefile": "fedora-iot.json", + "config_url": "https://pagure.io/fedora-iot/ostree.git", + "config_branch": "f30", + "repo": [ + "IoT", + "https://kojipkgs.fedoraproject.org/compose/30/latest-Fedora-30/compose/Everything/$basearch/os/", + "https://kojipkgs.fedoraproject.org/compose/updates/f30-updates/compose/Everything/$basearch/os/", + ] + "tag_ref": False, + "ostree_repo": "/mnt/koji/compose/iot/repo/", + 'failable': ['*'], + 'update_summary': True, } -} + }) +] -ostree_container = { - "^IoT$": [ - { - "version": "!OSTREE_VERSION_FROM_LABEL_DATE_TYPE_RESPIN", - "config_url": "https://forge.fedoraproject.org/iot/base-images.git", - "config_branch": "main", - "treefile": "fedora-rawhide.yaml", - "repo": ["https://kojipkgs.fedoraproject.org/compose/rawhide/latest-Fedora-Rawhide/compose/Everything/$basearch/os/"], - "arches": ["x86_64", "aarch64", "ppc64le", "s390x"], - "failable": ['*'], - "subvariant": "base", - "name": "Fedora-base-bootc", +ostree_installer = [ + ("^IoT$", { + "aarch64": { + "repo": [ + "IoT", + "https://kojipkgs.fedoraproject.org/compose/30/latest-Fedora-30/compose/Everything/$basearch/os/", + ], + "release": None, + "rootfs_size": "4", + "add_template": ["ostree-based-installer/lorax-configure-repo.tmpl", + "ostree-based-installer/lorax-embed-repo.tmpl"], + "add_template_var": [ + "ostree_install_repo=https://kojipkgs.fedoraproject.org/compose/iot/repo/", + "ostree_update_repo=https://ostree.fedoraproject.org/iot/", + "ostree_osname=fedora-iot", + "ostree_oskey=fedora-iot-2019", + "ostree_contenturl=mirrorlist=https://ostree.fedoraproject.org/iot/mirrorlist", + "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': 'f30', }, - { - "version": "!OSTREE_VERSION_FROM_LABEL_DATE_TYPE_RESPIN", - "config_url": "https://forge.fedoraproject.org/iot/fedora-iot-bootc.git", - "config_branch": "main", - "treefile": "fedora-iot-rawhide.yaml", - "repo": ["https://kojipkgs.fedoraproject.org/compose/rawhide/latest-Fedora-Rawhide/compose/Everything/$basearch/os/"], - "arches": ["x86_64", "aarch64"], - "failable": ['*'], - "name": "Fedora-IoT-bootc", + "armhfp": { + "repo": [ + "IoT", + "https://kojipkgs.fedoraproject.org/compose/30/latest-Fedora-30/compose/Everything/$basearch/os/", + ], + "release": None, + "rootfs_size": "4", + "add_template": ["ostree-based-installer/lorax-configure-repo.tmpl", + "ostree-based-installer/lorax-embed-repo.tmpl"], + "add_template_var": [ + "ostree_install_repo=https://kojipkgs.fedoraproject.org/compose/iot/repo/", + "ostree_update_repo=https://ostree.fedoraproject.org/iot/", + "ostree_osname=fedora-iot", + "ostree_oskey=fedora-iot-2019", + "ostree_contenturl=mirrorlist=https://ostree.fedoraproject.org/iot/mirrorlist", + "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': 'f30', }, - ] -} - + "x86_64": { + "repo": [ + "IoT", + "https://kojipkgs.fedoraproject.org/compose/30/latest-Fedora-30/compose/Everything/$basearch/os/", + ], + "release": None, + "rootfs_size": "4", + "add_template": ["ostree-based-installer/lorax-configure-repo.tmpl", + "ostree-based-installer/lorax-embed-repo.tmpl"], + "add_template_var": [ + "ostree_install_repo=https://kojipkgs.fedoraproject.org/compose/iot/repo/", + "ostree_update_repo=https://ostree.fedoraproject.org/iot/", + "ostree_osname=fedora-iot", + "ostree_oskey=fedora-iot-2019", + "ostree_contenturl=mirrorlist=https://ostree.fedoraproject.org/iot/mirrorlist", + "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': 'f30', + } + }) +] koji_profile = 'compose_koji' diff --git a/nightly.sh b/nightly.sh index fa8dfcb..afcf79b 100755 --- a/nightly.sh +++ b/nightly.sh @@ -9,9 +9,9 @@ SKIP_PHASES="--skip-phase=productimg" DEST=$(pwd) DATE=$(date "+%Y%m%d") SHORT="Fedora-IoT" -RELEASE="46" -RELEASE_TITLE="46" -COMPSFILE="comps-f46.xml" +RELEASE="30" +RELEASE_TITLE="30" +COMPSFILE="comps-f30.xml" TMPDIR=`mktemp -d /tmp/$RELEASE.$DATE.XXXX` TOMAIL="iot@lists.fedoraproject.org" FROM="Fedora IoT Report " @@ -30,20 +30,20 @@ if [ -d releng ]; then git pull --rebase popd else - git clone https://forge.fedoraproject.org/releng/tooling.git releng + git clone https://pagure.io/releng.git fi # Set up our fedmsg function, using the releng repo definition #FEDMSG_MODNAME="compose" #FEDMSG_CERTPREFIX="releng" -. ./releng/infrastructure/messaging/fedora_messaging.sh +. ./releng/scripts/fedmsg-functions.sh # Announce that we are starting, even though we don't know the compose_id yet.. #fedmsg_json_start=$(printf '{"log": "start", "branch": "%s", "arch": "%s", "short": "%s"}' "$RELEASE" "$ARCH" "$SHORT") #send_fedmsg "${fedmsg_json_start}" ${RELEASE} start #pushd $TMPDIR -#git clone https://forge.fedoraproject.org/releng/fedora-comps.git && { +#git clone https://pagure.io/fedora-comps.git && { # pushd fedora-comps # make "${COMPSFILE}" # cp "${COMPSFILE}" $DEST/ @@ -67,8 +67,6 @@ fi NEWCOMPOSE_ID=$(cat $TARGET_DIR/latest-$SHORT-$RELEASE_TITLE/COMPOSE_ID) SHORTCOMPOSE_ID=$(echo $NEWCOMPOSE_ID|sed -e 's|Fedora-.*-||g') -./releng/builds/compose/build_composeinfo.py "$TARGET_DIR/$NEWCOMPOSE_ID/" --name "$NEWCOMPOSE_ID" - # Set this to use later for a few items include depcheck DESTDIR=$TARGET_DIR/$NEWCOMPOSE_ID # Public URLs the synced compose will wind up at, we put them in fedmsgs @@ -89,7 +87,7 @@ chmod -R go+r $DESTDIR/compose/*/*/os/EFI/ # sync over iot -#for arch in x86_64 aarch64; do +#for arch in x86_64 aarch64 armhfp; do # ostree pull-local --repo=$OSTREEDESTREPO $OSTREESRCREPO --depth=-1 "fedora/devel/${arch}/iot" #done #ostree summary -u --repo=$OSTREEDESTREPO # update summary file diff --git a/sync-bootc-base-containers.sh b/sync-bootc-base-containers.sh deleted file mode 100755 index ebab8ee..0000000 --- a/sync-bootc-base-containers.sh +++ /dev/null @@ -1,193 +0,0 @@ -#!/bin/bash - -set -x - -# -# Sync latest docker image -# -# Docs in the f_help function -f_ctrl_c() { - printf "\n*** Exiting ***\n" - exit $? -} -# trap int (ctrl-c) -trap f_ctrl_c SIGINT -f_help() { - cat < /dev/null - # Import the image - for arch in "${ARCHES[@]}"; do - local filename - filename="/mnt/koji/compose/iot/Fedora-IoT-${release}-${compdate}/compose/${compose_type}/${arch}/images/${basename}-${release}.${compdate}.ociarchive" - copy_image ${format}:${filename} ${registry_name}:${release}-${arch} - done - - popd &> /dev/null - - generate_manifest_list ${registry_name} ${release} - printf "Removing temporary directory\n" - rm -rf $work_dir -} - -# -# Version should not be higher than rawhide -# Either there is a mistake or script is out of date -# -if [[ ${1} -gt "$current_rawhide" ]]; then - printf "ERROR: VERSION HIGHER THAN RAWHIDE" - exit 1 -fi - -printf "Syncing compose contailers: ${vers} : ${compose}\n" - -# For fedora-bootc and fedora-iot -for basename in "${BASENAMES[@]}"; do - if [[ ${basename} = "Fedora-IoT-bootc" ]]; then - registry_name="fedora-bootc" - compose_type="bootc" - ARCHES=("aarch64" "x86_64" "ppc64le" "s390x") - elif [[ ${basename} = "Fedora-IoT-bootc-base" ]]; then - registry_name="fedora-iot" - compose_type="bootc-base" - ARCHES=("aarch64" "x86_64") - fi - base_build_nvr=${basename}-${vers}-${compdate} - if [[ -n ${base_build_nvr} ]]; then - find_and_copy_images ${base_build_nvr} ${registry_name} ${vers} ${compose} - fi -done diff --git a/sync-release.sh b/sync-release.sh index 5badf8c..65977d1 100755 --- a/sync-release.sh +++ b/sync-release.sh @@ -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="46" -RELEASE_TITLE="46" -COMPSFILE="comps-f46.xml" +RELEASE="30" +RELEASE_TITLE="30" +COMPSFILE="comps-f30.xml" TMPDIR=`mktemp -d /tmp/$RELEASE.$DATE.XXXX` TOMAIL="iot@lists.fedoraproject.org" FROM="Fedora IoT Report " RSYNCPREFIX="sudo -u ftpsync" -RSYNCTARGET="/pub/alt/iot/46/" +RSYNCTARGET="/pub/alt/iot/30/" OLDCOMPOSE_ID=$(cat $TARGET_DIR/latest-$SHORT-$RELEASE_TITLE/COMPOSE_ID) NEWCOMPOSE_ID=$(cat $TARGET_DIR/latest-$SHORT-$RELEASE_TITLE/COMPOSE_ID) diff --git a/twoweek-nightly.sh b/twoweek-nightly.sh index c0925c7..fb6aa3c 100755 --- a/twoweek-nightly.sh +++ b/twoweek-nightly.sh @@ -11,14 +11,14 @@ DEST=$(pwd) DATE=$(date "+%Y%m%d") # the Pungi 'shortname', which we will include in fedmsgs for disambiguation SHORT="Fedora-IoT" -RELEASE="46" -RELEASE_TITLE="46" -COMPSFILE="comps-f46.xml" +RELEASE="30" +RELEASE_TITLE="30" +COMPSFILE="comps-f30.xml" TMPDIR=`mktemp -d /tmp/$RELEASE.$DATE.XXXX` TOMAIL="iot@lists.fedoraproject.org" FROM="Fedora IoT Report " 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 @@ -28,13 +28,13 @@ if [ -d releng ]; then git pull --rebase popd else - git clone https://forge.fedoraproject.org/releng/tooling.git releng + git clone https://pagure.io/releng.git fi # Set up our fedmsg function, using the releng repo definition fedmsg_json_start=$(printf '{"log": "start", "branch": "%s", "arch": "%s", "short": "%s"}' "$RELEASE" "$ARCH" "$SHORT") FEDMSG_MODNAME="compose" FEDMSG_CERTPREFIX="releng" -. ./releng/infrastructure/messaging/fedora_messaging.sh +. ./releng/scripts/fedmsg-functions.sh # Announce that we are starting... send_fedmsg "${fedmsg_json_start}" ${RELEASE} start CMD="pungi-koji --notification-script=/usr/bin/pungi-fedmsg-notification --notification-script=pungi-wait-for-signed-ostree-handler --config=$CONFIG --old-composes=$TARGET_DIR $OLD_COMPOSES_DIR $NIGHTLY --label=$LABEL" @@ -49,11 +49,12 @@ 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') -./releng/builds/compose/build_composeinfo.py "$TARGET_DIR/$NEWCOMPOSE_ID/" --name "$NEWCOMPOSE_ID" - 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" @@ -67,8 +68,10 @@ 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/builds/compose/build_composeinfo.py "$RSYNCTARGET/" --name $NEWCOMPOSE_ID + $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 '$RELEASE' compose report: '$SHORTCOMPOSE_ID' changes' @@ -77,4 +80,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 {} \; diff --git a/variants-fedora.xml b/variants-fedora.xml index 01f5f57..8586282 100644 --- a/variants-fedora.xml +++ b/variants-fedora.xml @@ -1,12 +1,11 @@ - + aarch64 - x86_64 - ppc64le - s390x + armhfp + x86_64