From 5f85582100430635276f9f6f2661616ce79616ec Mon Sep 17 00:00:00 2001 From: Stephen Gallagher Date: Apr 09 2018 18:01:24 +0000 Subject: Drop old modularity config These files were part of the original "Boltron" effort and are no longer needed in the modern implementation. Signed-off-by: Stephen Gallagher --- diff --git a/fedora-modular.conf b/fedora-modular.conf deleted file mode 100644 index 2f4ea43..0000000 --- a/fedora-modular.conf +++ /dev/null @@ -1,232 +0,0 @@ -# PRODUCT INFO -release_name = 'Fedora-Modular' -release_short = 'Fedora-Modular' -release_version = 'Bikeshed' -release_is_layered = False - -# GENERAL SETTINGS -bootable = True - -variants_file='variants-modular.xml' -sigkeys = ['a3cc4e62'] - -hashed_directories = True - -# RUNROOT settings -runroot = True -runroot_channel = 'compose' -runroot_tag = 'module-bootstrap-rawhide' - -# PDC settings -pdc_url = 'https://pdc.fedoraproject.org/rest_api/v1' -pdc_insecure = False -pdc_develop = True - -# PKGSET -pkgset_source = 'koji' # koji, repos - -# PKGSET - KOJI -# pkgset_koji_tag is not used by the modular compose, but Pungi needs this -# option to appear in a config, otherwise it fails. Once this is fixed, we can -# remove this option completely. -pkgset_koji_tag = 'not-used' -pkgset_koji_inherit = False - -filter_system_release_packages = False - -# GATHER -gather_source = 'module' -gather_method = 'nodeps' -gather_profiler = True -check_deps = False -greedy_method = 'build' - -# fomat: [(variant_uid_regex, {arch|*: [repos]})] -# gather_lookaside_repos = [] - -# GATHER - JSON -# format: {variant_uid: {arch: package: [arch1, arch2, None (for any arch)]}} -#gather_source_mapping = '/path/to/mapping.json' - - -# CREATEREPO -createrepo_c = True -createrepo_checksum = 'sha256' -createrepo_deltas = True - -# 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' -#jigdo -create_jigdo = False - -# OK, we have the anaconda module now. Let's try buildinstall, but still skip -# the phases which depend on it. -skip_phases= ["live_media", "ostree"] - -# BUILDINSTALL -buildinstall_method = 'lorax' - -# Enables macboot on x86_64 for all variants and disables upgrade image building -# # everywhere. -lorax_options = [ - ('^.*$', { - 'x86_64': { - 'nomacboot': False - }, - '*': { - 'noupgrade': True - } - }) -] - -# fomat: [(variant_uid_regex, {arch|*: [packages]})] -additional_packages = [ - -] - -filter_packages = [ - # TODO - autogenerate this from the modulemd someday. -] - -createiso_skip = [ - ('^base-runtime$', { - '*': True, - 'src': True - }), - ('^Server$', { - '*': False, - 'src': True - }), - ] - -# 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' -# # Use the same format for volume id -image_volid_formats = [ - '%(release_short)s-%(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 = [] -# Replace 'Cloud' with 'C' in volume id etc. -volume_id_substitutions = { - 'Atomic': 'AH', - 'Rawhide': 'rawh', - 'Images': 'img', - 'MATE_Compiz': 'MATE', - 'Security': 'Sec', - 'Electronic_Lab': 'Elec', - 'Robotics': 'Robo', - 'Scientific_KDE': 'SciK', - 'Astronomy_KDE': 'AstK', - 'Design_suite': 'Dsgn', - 'Games': 'Game', - 'Jam_KDE': 'Jam', - 'Workstation': 'WS', - 'Everything': 'E', - 'Server': 'S', - 'Cloud': 'C', - 'Alpha': 'A', - 'Beta': 'B', - 'TC': 'T', - 'Modular': 'M', - 'Bikeshed': 'BS', -} - -disc_types = { - 'boot': 'netinst', - 'live': 'Live', -} - -global_ksurl = 'git+https://pagure.io/fedora-kickstarts.git?#HEAD' -global_release = '!RELEASE_FROM_LABEL_DATE_TYPE_RESPIN' -global_version = 'Bikeshed' -# live_images ignores this in favor of live_target -global_target = 'module-bootstrap-rawhide' - -image_build = { - '^Server$': [ - { - 'image-build': { - 'format': [('docker', 'tar.xz')], - 'name': 'Fedora-Modular-Container-Base', - 'kickstart': 'fedora-modular-container-base.ks', - 'distro': 'Fedora-28', - 'disk_size': 4, - 'arches': ['aarch64', 'armhfp', 'ppc64le', 'x86_64'], - 'install_tree_from': 'Server', - 'subvariant': 'Container_Base', - }, - 'factory-parameters': { - 'dockerversion': '1.10.1', - 'docker_cmd': '[ "/bin/bash" ]', - 'docker_env': '[ "DISTTAG=f28container_modular", "FGC=f28-modular" ]', - 'docker_label': '{"name": "fedora", "license": "MIT", "vendor": "Fedora Project", "version": "28-modular"}', - }, - }, - { - 'image-build': { - 'format': [('docker', 'tar.xz')], - 'name': 'Fedora-Modular-Container-Minimal', - 'kickstart': 'fedora-modular-container-base-minimal.ks', - 'distro': 'Fedora-28', - 'disk_size': 4, - 'arches': ['aarch64', 'armhfp', 'ppc64le', 'x86_64'], - 'install_tree_from': 'Server', - 'subvariant': 'Container_Minimal', - }, - 'factory-parameters': { - 'dockerversion': '1.10.1', - 'docker_cmd': '[ "/bin/bash" ]', - 'docker_env': '[ "DISTTAG=f28container_modular", "FGC=f28-modular" ]', - 'docker_label': '{"name": "fedora", "license": "MIT", "vendor": "Fedora Project", "version": "28-modular"}', - }, - }, - { - 'image-build': { - 'format': [('qcow2','qcow2'), ('raw-xz','raw.xz')], - 'name': 'Fedora-Modular-Server', - 'kickstart': 'fedora-modular-disk-minimal.ks', - 'distro': 'Fedora-28', - 'disk_size': 8, - 'arches': ['aarch64', 'ppc64le', 'x86_64'], - 'repo': 'Server', - 'install_tree_from': 'Server', - 'subvariant': 'Server', - 'failable': ['*'], - } - }, - ], -} - -translate_paths = [ - ('/mnt/koji/compose/', 'http://kojipkgs.fedoraproject.org/compose/'), -] - -failable_deliverables = [ - ('^.*$', { - # Buildinstall can fail on any variant and any arch - '*': ['buildinstall', 'iso', 'image-build', 'live-media', 'live', 'ostree', 'ostree-installer'], - 'src': ['buildinstall'], - # Nothing on i386 blocks the compose - 'i386': ['buildinstall', 'iso', 'live'], - }) -] - - -live_images_no_rename = True -# fomat: [(variant_uid_regex, {arch|*: scm_dict})] -live_images = [ - ('^Server$', { - 'armhfp': { - 'kickstart': 'fedora-modular-arm-server.ks', - 'name': 'Fedora-Modular-Server-armhfp', - 'type': 'appliance', - 'failable': True, - } - }), -] - - -koji_profile = 'compose_koji' diff --git a/nightly-modular.sh b/nightly-modular.sh deleted file mode 100755 index a2c6f1a..0000000 --- a/nightly-modular.sh +++ /dev/null @@ -1,109 +0,0 @@ -#!/bin/sh - -#set -x - -export LC_ALL=C - -CONFIG="fedora-modular.conf" -TARGET_DIR="/mnt/koji/compose" -#OLD_COMPOSES_DIR="--old-composes=/mnt/fedora_koji/compose/f23 --old-composes=$TARGET_DIR" -NIGHTLY="--nightly" -SKIP_PHASES="--skip-phase=productimg" -DEST=$(pwd) -DATE=$(date "+%Y%m%d") -SHORT="Fedora-Modular" -RELEASE="bikeshed" -RELEASE_TITLE="Bikeshed" -TMPDIR=`mktemp -d /tmp/$RELEASE.$DATE.XXXX` -TOMAIL="devel@lists.fedoraproject.org test@lists.fedoraproject.org" -FROM="Fedora Rawhide Report " -RSYNCPREFIX="sudo -u ftpsync" -RSYNCTARGET="/pub/fedora/linux/modular/development/$RELEASE" -OLDCOMPOSE_ID=$(cat $TARGET_DIR/latest-$SHORT-$RELEASE_TITLE/COMPOSE_ID) - -# assume a releng dir is a git checkout of the releng repo -# if it does not exist clone it -if [ -d releng ]; then - pushd releng - git pull --rebase - popd -else - 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/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 - -CMD="pungi-koji --notification-script=/usr/bin/pungi-fedmsg-notification --config=$CONFIG --old-composes=$TARGET_DIR $OLD_COMPOSES_DIR $NIGHTLY $SKIP_PHASES" - -if [ -z "$COMPOSE_ID" ]; then - CMD="$CMD --target-dir=$TARGET_DIR" -else - CMD="$CMD --debug-mode --compose-dir=$TARGET_DIR/$COMPOSE_ID" -fi - -time $CMD "$@" -if [ "$?" != "0" ]; then - exit 1 -fi - -NEWCOMPOSE_ID=$(cat $TARGET_DIR/latest-$SHORT-$RELEASE_TITLE/COMPOSE_ID) -SHORTCOMPOSE_ID=$(echo $NEWCOMPOSE_ID|sed -e 's|Fedora-Modular.*-||g') - -# Set this to use later for a few items include depcheck -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") - -compose-changelog -p $DESTDIR/logs/ $TARGET_DIR/$OLDCOMPOSE_ID/ $DESTDIR/ -# Figure out a version for broken deps e-mail that goes to package maintainers. -# For Bikeshed it's just bikeshed, for branched versions we prepend F- to the number. -if [ "$RELEASE" = "bikeshed" ]; then - TREENAME="$RELEASE" -else - TREENAME="F-$RELEASE" -fi -/usr/share/mash/spam-o-matic --nomail --treename="$TREENAME" "$DESTDIR/compose/Server/" >"$DESTDIR/logs/depcheck" - -# Tell interested persons that the rsync is starting (zomg!) -send_fedmsg "${fedmsg_json_start}" ${RELEASE} rsync.start - -# Sync the content to /pub/fedora -if [ ! -d "$RSYNCTARGET" ]; then - mkdir "$RSYNCTARGET" -fi -$RSYNCPREFIX compose-partial-copy --arch=armhfp --arch=x86_64 --arch=aarch64 --arch=ppc64 --arch=ppc64le --arch=s390x --arch src \ - "$DESTDIR" "$RSYNCTARGET/" \ - --variant Server \ - --exclude=repodata -$RSYNCPREFIX compose-partial-copy --arch=armhfp --arch=x86_64 --arch=aarch64 --arch=ppc64 --arch=ppc64le --arch=s390x --arch src \ - "$DESTDIR" "$RSYNCTARGET/" \ - --variant Server \ - --delete-after -$RSYNCPREFIX rm "$RSYNCTARGET/.composeinfo" -$RSYNCPREFIX ./releng/scripts/build_composeinfo "$RSYNCTARGET/" --name "$NEWCOMPOSE_ID" - -# 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 - -# Tell everyone by email about the compose -SUBJECT='Fedora Modular '$RELEASE' compose report: '$SHORTCOMPOSE_ID' changes' -for tomail in $TOMAIL ; do - cat $DESTDIR/logs/*verbose | \ - mutt -e "set from=\"$FROM\"" -e 'set envelope_from=yes' -s "$SUBJECT" $tomail -done - -# Remove old composes older than 14 days -find $TARGET_DIR/$SHORT-$RELEASE_TITLE* -xdev -depth -maxdepth 2 -mtime +14 -exec rm -rf {} \; diff --git a/variants-modular.xml b/variants-modular.xml deleted file mode 100644 index 42c36ab..0000000 --- a/variants-modular.xml +++ /dev/null @@ -1,76 +0,0 @@ - - - - - - armhfp - aarch64 - i386 - ppc64 - ppc64le - s390x - x86_64 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -