diff --git a/fedora-iot.conf b/fedora-iot.conf index a3122d7..a3a3c10 100644 --- a/fedora-iot.conf +++ b/fedora-iot.conf @@ -1,26 +1,25 @@ # PRODUCT INFO release_name = 'Fedora-IoT' release_short = 'Fedora-IoT' -release_version = '35' +release_version = '46' # Let's not build install media during this run. For the image builds -# and OSTree installer we'll use inputs from other f35 runs. +# and OSTree installer we'll use inputs from other f45 runs. skip_phases = ["buildinstall", "createrepo", "extra_files"] -ostree_installer_overwrite = True # GENERAL SETTINGS comps_file = { 'scm': 'git', - 'repo': 'https://pagure.io/fedora-comps.git', + 'repo': 'https://forge.fedoraproject.org/releng/fedora-comps.git', 'branch': 'main', - 'file': 'comps-f35.xml', - 'command': 'make comps-f35.xml' + 'file': 'comps-f46.xml', + 'command': 'make comps-f46.xml' } variants_file='variants-fedora.xml' -sigkeys = ['9867C58F'] +sigkeys = ['91211FCE'] # limit tree architectures # if undefined, all architectures from variants.xml will be included -tree_arches = ['aarch64', 'armhfp', 'x86_64'] +tree_arches = ['aarch64', 'x86_64', "ppc64le", "s390x"] # limit tree variants # if undefined, all variants from variants.xml will be included tree_variants = ['IoT'] @@ -28,7 +27,7 @@ hashed_directories = True # RUNROOT settings runroot_channel = 'compose' -runroot_tag = 'f35-build' +runroot_tag = 'f46-build' # PKGSET pkgset_source = 'koji' # koji, repos @@ -38,7 +37,7 @@ pkgset_source = 'koji' # koji, repos # pkgset_repos = {} # PKGSET - KOJI -pkgset_koji_tag = 'f35-iot' +pkgset_koji_tag = 'f46-iot' pkgset_koji_inherit = False filter_system_release_packages = False @@ -60,10 +59,14 @@ repoclosure_backend = 'dnf' # CHECKSUMS media_checksums = ['sha256'] media_checksum_one_file = True -media_checksum_base_filename = '%(release_short)s-%(variant)s-%(version)s-%(arch)s-%(date)s%(type_suffix)s.%(respin)s' +media_checksum_base_filename = '%(release_short)s-%(version)s-%(arch)s-%(date)s%(type_suffix)s.%(respin)s' #jigdo create_jigdo = False +# CREATEISO +# use xorrisofs to make isos +createiso_use_xorrisofs = True + # BUILDINSTALL buildinstall_method = 'lorax' buildinstall_skip = [ @@ -149,10 +152,10 @@ createiso_skip = [ #] # Image name respecting Fedora's image naming policy -image_name_format = '%(release_short)s-%(variant)s-%(disc_type)s-%(arch)s-%(version)s-%(date)s%(type_suffix)s.%(respin)s.iso' +image_name_format = '%(release_short)s-%(disc_type)s-%(arch)s-%(version)s-%(date)s%(type_suffix)s.%(respin)s.iso' # # Use the same format for volume id image_volid_formats = [ - '%(release_short)s-%(variant)s-%(disc_type)s-%(arch)s-%(version)s' + '%(release_short)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 = [] @@ -163,7 +166,7 @@ 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://pagure.io/pungi-fedora/pull-request/525 +# https://forge.fedoraproject.org/releng/pungi-fedora/pulls/525 volume_id_substitutions = { 'Beta': 'B', 'Rawhide': 'rawh', @@ -180,7 +183,7 @@ volume_id_substitutions = { 'IoT': 'iot', 'Jam_KDE': 'Jam', 'MATE_Compiz': 'MATE', - # Note https://pagure.io/pungi-fedora/issue/533 + # Note https://forge.fedoraproject.org/releng/pungi-fedora/issues/533 'Python-Classroom': 'Clss', 'Python_Classroom': 'Clss', 'Robotics': 'Robo', @@ -199,67 +202,67 @@ translate_paths = [ ('/mnt/koji/compose/', 'https://kojipkgs.fedoraproject.org/compose/'), ] -# These will be inherited by live_media, live_images and image_build -global_ksurl = 'git+https://pagure.io/fedora-kickstarts.git?#HEAD' +# These may be inherited by various phases for creating Koji tasks global_release = '!RELEASE_FROM_LABEL_DATE_TYPE_RESPIN' -global_version = '35' -# live_images ignores this in favor of live_target -global_target = 'f35' +global_version = '46' +global_target = 'f46' -image_build = { - '^IoT$': [ - { - 'image-build': { - 'format': [('raw-xz','raw.xz')], - 'name': 'Fedora-IoT', - 'kickstart': 'fedora-iot.ks', - 'distro': 'Fedora-22', - 'disk_size': 4, - 'arches': ['armhfp', 'aarch64', 'x86_64'], - 'install_tree_from': "https://kojipkgs.fedoraproject.org/compose/rawhide/latest-Fedora-Rawhide/compose/Everything/$arch/os/", - 'subvariant': 'IoT', - } - } - ], +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", + }, + ], } -ostree = [ - ("^IoT$", { - "aarch64": { +ostree = { + "^IoT$": { "version": "!OSTREE_VERSION_FROM_LABEL_DATE_TYPE_RESPIN", "force_new_commit": True, - "treefile": "fedora-iot.json", - "config_url": "https://pagure.io/fedora-iot/ostree.git", - "config_branch": "main", - "repo": [ - "IoT", - "https://kojipkgs.fedoraproject.org/compose/rawhide/latest-Fedora-Rawhide/compose/Everything/$basearch/os/" - ] - "tag_ref": False, - "ostree_repo": "/mnt/koji/compose/iot/repo/", - "ostree_ref": "fedora/rawhide/${basearch}/iot", - "update_summary": True, - }, - "armhfp": { - "version": "!OSTREE_VERSION_FROM_LABEL_DATE_TYPE_RESPIN", - "force_new_commit": True, - "treefile": "fedora-iot.json", - "config_url": "https://pagure.io/fedora-iot/ostree.git", - "config_branch": "main", - "repo": [ - "IoT", - "https://kojipkgs.fedoraproject.org/compose/rawhide/latest-Fedora-Rawhide/compose/Everything/$basearch/os/" - ] - "tag_ref": False, - "ostree_repo": "/mnt/koji/compose/iot/repo/", - "ostree_ref": "fedora/rawhide/${basearch}/iot", - "update_summary": True, - }, - "x86_64": { - "version": "!OSTREE_VERSION_FROM_LABEL_DATE_TYPE_RESPIN", - "force_new_commit": True, - "treefile": "fedora-iot.json", - "config_url": "https://pagure.io/fedora-iot/ostree.git", + "unified_core": True, + "treefile": "fedora-iot.yaml", + "config_url": "https://forge.fedoraproject.org/iot/ostree.git", "config_branch": "main", "repo": [ "IoT", @@ -268,77 +271,36 @@ ostree = [ "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, } - }) -] +} -ostree_installer = [ - ("^IoT$", { - "aarch64": { - "repo": [ - "IoT", - "https://kojipkgs.fedoraproject.org/compose/rawhide/latest-Fedora-Rawhide/compose/Everything/$arch/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-35-primary", - "ostree_contenturl=mirrorlist=https://ostree.fedoraproject.org/iot/mirrorlist", - "ostree_install_ref=fedora/rawhide/aarch64/iot", - "ostree_update_ref=fedora/rawhide/aarch64/iot", - ], - 'template_repo': 'https://pagure.io/fedora-lorax-templates.git', - 'template_branch': 'main', +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", }, - "armhfp": { - "repo": [ - "IoT", - "https://kojipkgs.fedoraproject.org/compose/rawhide/latest-Fedora-Rawhide/compose/Everything/$arch/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-35-primary", - "ostree_contenturl=mirrorlist=https://ostree.fedoraproject.org/iot/mirrorlist", - "ostree_install_ref=fedora/rawhide/armhfp/iot", - "ostree_update_ref=fedora/rawhide/armhfp/iot", - ], - 'template_repo': 'https://pagure.io/fedora-lorax-templates.git', - 'template_branch': 'main', + { + "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", }, - "x86_64": { - "repo": [ - "IoT", - "https://kojipkgs.fedoraproject.org/compose/rawhide/latest-Fedora-Rawhide/compose/Everything/$arch/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-35-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", - ], - 'template_repo': 'https://pagure.io/fedora-lorax-templates.git', - 'template_branch': 'main', - } - }) -] + ] +} koji_profile = 'compose_koji' diff --git a/nightly.sh b/nightly.sh index 1dee5cf..fa8dfcb 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="30" -RELEASE_TITLE="30" -COMPSFILE="comps-f30.xml" +RELEASE="46" +RELEASE_TITLE="46" +COMPSFILE="comps-f46.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://pagure.io/releng.git + git clone https://forge.fedoraproject.org/releng/tooling.git releng fi # Set up our fedmsg function, using the releng repo definition #FEDMSG_MODNAME="compose" #FEDMSG_CERTPREFIX="releng" -. ./releng/scripts/fedmsg-functions.sh +. ./releng/infrastructure/messaging/fedora_messaging.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://pagure.io/fedora-comps.git && { +#git clone https://forge.fedoraproject.org/releng/fedora-comps.git && { # pushd fedora-comps # make "${COMPSFILE}" # cp "${COMPSFILE}" $DEST/ @@ -67,7 +67,7 @@ fi NEWCOMPOSE_ID=$(cat $TARGET_DIR/latest-$SHORT-$RELEASE_TITLE/COMPOSE_ID) SHORTCOMPOSE_ID=$(echo $NEWCOMPOSE_ID|sed -e 's|Fedora-.*-||g') -./releng/scripts/build_composeinfo "$TARGET_DIR/$NEWCOMPOSE_ID/" --name "$NEWCOMPOSE_ID" +./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 @@ -89,7 +89,7 @@ chmod -R go+r $DESTDIR/compose/*/*/os/EFI/ # sync over iot -#for arch in x86_64 aarch64 armhfp; do +#for arch in x86_64 aarch64; 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 new file mode 100755 index 0000000..ebab8ee --- /dev/null +++ b/sync-bootc-base-containers.sh @@ -0,0 +1,193 @@ +#!/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 new file mode 100755 index 0000000..5badf8c --- /dev/null +++ b/sync-release.sh @@ -0,0 +1,53 @@ +#!/bin/sh +set -x +export LC_ALL=C +LABEL=$1 +# Remove the label from arguments. It gets special treatment. Other arguments +# to the script are passed to pungi-koji directly. +shift +CONFIG="fedora-iot.conf" +TARGET_DIR="/mnt/koji/compose/iot" +NIGHTLY="" +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" +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/" +OLDCOMPOSE_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') + +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" +# Update fedmsg template +#fedmsg_json_start=$(printf '{"log": "start", "branch": "%s", "arch": "%s", "short": "%s", "compose_id": "%s", "location": "%s"}' "$RELEASE" "$ARCH" "$SHORT" "$NEWCOMPOSE_ID", "$LOCATION") +#fedmsg_json_done=$(printf '{"log": "done", "branch": "%s", "arch": "%s", "short": "%s", "compose_id": "%s", "location": "%s"}' "$RELEASE" "$ARCH" "$SHORT" "$NEWCOMPOSE_ID" "$LOCATION") + +$RSYNCPREFIX mkdir -p $DESTDIR +# Tell interested persons that the rsync is starting (zomg!) +#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/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 IoT'$RELEASE' compose report: '$SHORTCOMPOSE_ID' changes' +#for tomail in $TOMAIL ; do +# cat $DESTDIR/logs/*verbose $DESTDIR/logs/depcheck | \ +# 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 {} \; diff --git a/twoweek-nightly.sh b/twoweek-nightly.sh index d1b345a..c0925c7 100755 --- a/twoweek-nightly.sh +++ b/twoweek-nightly.sh @@ -11,9 +11,9 @@ DEST=$(pwd) DATE=$(date "+%Y%m%d") # the Pungi 'shortname', which we will include in fedmsgs for disambiguation SHORT="Fedora-IoT" -RELEASE="35" -RELEASE_TITLE="35" -COMPSFILE="comps-f35.xml" +RELEASE="46" +RELEASE_TITLE="46" +COMPSFILE="comps-f46.xml" TMPDIR=`mktemp -d /tmp/$RELEASE.$DATE.XXXX` TOMAIL="iot@lists.fedoraproject.org" FROM="Fedora IoT Report " @@ -28,13 +28,13 @@ if [ -d releng ]; then git pull --rebase popd else - git clone https://pagure.io/releng.git + git clone https://forge.fedoraproject.org/releng/tooling.git releng 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/scripts/fedmsg-functions.sh +. ./releng/infrastructure/messaging/fedora_messaging.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" @@ -52,7 +52,7 @@ ostree summary --update --repo=/mnt/koji/compose/iot/repo/ NEWCOMPOSE_ID=$(cat $TARGET_DIR/latest-$SHORT-$RELEASE_TITLE/COMPOSE_ID) SHORTCOMPOSE_ID=$(echo $NEWCOMPOSE_ID|sed -e 's|Fedora-.*-||g') -./releng/scripts/build_composeinfo "$TARGET_DIR/$NEWCOMPOSE_ID/" --name "$NEWCOMPOSE_ID" +./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 @@ -67,10 +67,8 @@ 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/scripts/build_composeinfo "$RSYNCTARGET/" --name $NEWCOMPOSE_ID + $RSYNCPREFIX ./releng/builds/compose/build_composeinfo.py "$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' diff --git a/variants-fedora.xml b/variants-fedora.xml index 8586282..01f5f57 100644 --- a/variants-fedora.xml +++ b/variants-fedora.xml @@ -1,11 +1,12 @@ - + aarch64 - armhfp - x86_64 + x86_64 + ppc64le + s390x