#686 Don't build Atomic Host in F30 and onward in the favor of FCOS
Merged 5 years ago by mohanboddu. Opened 5 years ago by sinnykumari.
sinnykumari/pungi-fedora master  into  master

file removed
-276
@@ -1,276 +0,0 @@ 

- # PRODUCT INFO

- release_name = 'Fedora-Atomic'

- release_short = 'Fedora-Atomic'

- release_version = '26'

- release_is_layered = False

- # GENERAL SETTINGS

- bootable = True

- buildinstall_method = 'lorax'

- lorax_options = [

-   ('^.*$', {

-      'x86_64': {

-          'nomacboot': True

-      }

-      '*': {

-          'noupgrade': True

-      }

-   })

- ]

- comps_file = 'comps-f26.xml' #{

- #    'scm': 'git',

- #    'repo': 'git://git.fedorahosted.org/git/comps.git',

- #    'branch': None, # defaults to cvs/HEAD or git/master

- #    'file': 'comps-f23.xml',

- #}

- variants_file='variants-fedora.xml'

- sigkeys = ['64DAB85D'] # None = unsigned

- # limit tree architectures

- # if undefined, all architectures from variants.xml will be included

- tree_arches = ['x86_64']

- # limit tree variants

- # if undefined, all variants from variants.xml will be included

- tree_variants = ['Atomic', 'Cloud', 'CloudImages']

- hashed_directories = True

- # RUNROOT settings

- runroot = True

- #runroot_channel = 'fedora_compose'

- runroot_channel = 'compose'

- runroot_tag = 'f26-build'

- # PKGSET

- pkgset_source = 'koji' # koji, repos

- pkgset_koji_tag = 'f26-atomic'

- pkgset_koji_inherit = True

- filter_system_release_packages = False

- # GATHER

- gather_source = 'comps'

- gather_method = 'deps'

- 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'

- # CHECKSUMS

- media_checksums = ['sha256']

- media_checksum_one_file = True

- media_checksum_base_filename = 'Fedora-%(variant)s-%(version)s-%(date)s.%(respin)s-%(arch)s'

- #jigdo

- create_jigdo = False

- #extra_packages = [

- #    '/mnt/packages/foo*',

- #]

- # fomat: [(variant_uid_regex, {arch|*: [packages]})]

- additional_packages = [

-     ('.*', {

-         '*': [

-             'kernel.*',

-             'dracut.*',

-             'autocorr-.*',

-             'eclipse-nls-.*',

-             'hunspell-.*',

-             'hyphen-.*',

-             'calligra-l10n-.*',

-             'kde-l10n-.*',

-             'libreoffice-langpack-.*',

-             'man-pages-.*',

-             'mythes-.*',

-         ],

-     }),

-     ('^Everything$', {

-         '*': [

-             '*',

-         ],

-     }),

-     ('^Server$', {

-         '*': [

-         ],

-     }),

-     ('^Workstation$', {

-         '*': [

-         ],

-     }),

-     ('^Cloud$', {

-         '*': [

-         ],

-     }),

- ]

- multilib = [

-     ('^Everything$', {

-         'x86_64': ['devel', 'runtime'],

-          's390x': ['devel', 'runtime']

-     })

- ]

- filter_packages = [

-     ('(Workstation|Server|Cloud)$', {

-         '*': [

-         '^kernel.*debug.*',

-         '^kernel-kdump.*',

-         '^kernel-tools.*',

-         '^syslog-ng.*',

-         '^astronomy-bookmarks',

-         '^generic.*',

-         '^GConf2-dbus.*',

-         '^bluez-gnome',

-         #Periods cause problems in paterns, so replace with *s

-         '^java-1.8.0-openjdk',

-         '^community-mysql.*',

-         '^jruby.*',

-         '^gimp-help-.*',

-         ]

-     }),

- ]

- # format: {arch|*: [packages]}

- multilib_blacklist = {

-     '*': ['kernel*', 'kernel-PAE*', 'kernel*debug*',

-         'dmraid-devel', 'kdeutils-devel', 'mkinitrd-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',

-         'libflashsupport', 'valgrind', 'perl-libs', 'redhat-lsb',

-         'yaboot', 'syslinux-extlinux-nonlinux', 'syslinux-nonlinux',

-         'syslinux-tftpboot', 'nosync', '*-static'

-     ],

- }

- createiso_skip = [

-         ('^Workstation$', {

-             '*': True,

-             'src': True

-         }),

-         ('^Server$', {

-             'src': True

-         }),

-         ('^Cloud$', {

-             '*': True,

-             'src': True

-         }),

-         ('^Everything$', {

-             '*': True,

-             'src': True

-         }),

-     ]

- # fomat: [(variant_uid_regex, {arch|*: [scm_dicts]})]

- #extra_files = [

- #    ('^(Server|Workstation|Cloud)$', {

- #        '*': [

- #            {

- #                'scm': 'rpm',

- #                'repo': 'fedora-release-%(variant_id_lower)s',

- #                'branch': None,

- #                'file': [

- #                    '/etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-release',

- #                ],

- #                'target': '',

- #            },

- #        ],

- #    }),

- #]

- # Image name respecting Fedora's image naming policy

- 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 = [

-      '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 = []

- # 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',

- }

- disc_types = {

-     'boot': 'netinst',

-     'live': 'Live',

- }

- translate_paths = [

-    ('/mnt/koji/compose/', 'http://kojipkgs.fedoraproject.org/compose/'),

- ]

- image_build = {

-     '^CloudImages$': [

-         {

-             'image-build': {

-                     'format': [('qcow2','qcow2'), ('raw-xz','raw.xz')]

-                     'name': 'Fedora-Atomic',

-                     'target': 'f26',

-                     'version': '26',

-                     'release': None,

-                     'ksurl': 'git+https://pagure.io/fedora-kickstarts.git?#origin/f26',

-                     'kickstart': 'fedora-atomic.ks',

-                     'distro': 'Fedora-20',

-                     'disk_size': 6,

-                     'arches': ['x86_64'],

-                     'install_tree_from': 'Cloud',

-                     'subvariant': 'Atomic'

-                      }

-         },

-         {

-             'image-build': {

-                     'format': [('vagrant-libvirt','vagrant-libvirt.box'), ('vagrant-virtualbox','vagrant-virtualbox.box')]

-                     'name': 'Fedora-Atomic-Vagrant',

-                     'target': 'f26',

-                     'version': '26',

-                     'release': None,

-                     'ksurl': 'git+https://pagure.io/fedora-kickstarts.git?#origin/f26',

-                     'kickstart': 'fedora-atomic-vagrant.ks',

-                     'distro': 'Fedora-20',

-                     'disk_size': 40,

-                     'arches': ['x86_64'],

-                     'install_tree_from': 'Cloud',

-                     'subvariant': 'Atomic'

-                      },

-             'factory-parameters': {

-                     'vagrant_sync_directory': '/home/vagrant/sync',

-             }

-         }

-         ],

- }

- ostree_installer = [

-     ("^Atomic$", {

-         "x86_64": {

-             "repo": [ "Cloud",

-                       "https://kojipkgs.fedoraproject.org/pub/fedora/linux/releases/26/Everything/$arch/os/"],

-             "release": None,

-             "installpkgs": ["fedora-productimg-atomic"],

-             "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/atomic/rawhide/",

-                 "ostree_update_repo=https://kojipkgs.fedoraproject.org/atomic/rawhide/",

-                 "ostree_osname=fedora-atomic",

-                 "ostree_oskey=fedora-30-primary",

-                 "ostree_install_ref=fedora/rawhide/x86_64/atomic-host",

-                 "ostree_update_ref=fedora/rawhide/x86_64/atomic-host",

-             ],

-             'template_repo': 'https://pagure.io/fedora-lorax-templates.git',

-             'template_branch': 'f26',

-         }

-     })

- ]

- koji_profile = 'compose_koji'

file modified
-1
@@ -181,7 +181,6 @@ 

                   'Beta': 'B',

                'Rawhide': 'rawh',

          'Astronomy_KDE': 'AstK',

-            'AtomicHost': 'AH',

             'Silverblue': 'SB',

               'Cinnamon': 'Cinn',

                  'Cloud': 'C',

file modified
-1
@@ -181,7 +181,6 @@ 

                   'Beta': 'B',

                'Rawhide': 'rawh',

          'Astronomy_KDE': 'AstK',

-            'AtomicHost': 'AH',

             'Silverblue': 'SB',

               'Cinnamon': 'Cinn',

                  'Cloud': 'C',

file modified
-104
@@ -271,7 +271,6 @@ 

                   'Beta': 'B',

                'Rawhide': 'rawh',

          'Astronomy_KDE': 'AstK',

-            'AtomicHost': 'AH',

             'Silverblue': 'SB',

               'Cinnamon': 'Cinn',

                  'Cloud': 'C',
@@ -381,37 +380,6 @@ 

              },

          },

          ],

-     '^AtomicHost$': [

-         {

-             'image-build': {

-                     'format': [('qcow2','qcow2'), ('raw-xz','raw.xz')],

-                     'name': 'Fedora-AtomicHost',

-                     'kickstart': 'fedora-atomic.ks',

-                     'distro': 'Fedora-22',

-                     'disk_size': 6,

-                     'arches': ['aarch64', 'ppc64le', 'x86_64'],

-                     'install_tree_from': 'Everything',

-                     'subvariant': 'AtomicHost',

-                     'failable': ['*'],

-                      }

-         },

-         {

-             'image-build': {

-                     'format': [('vagrant-libvirt','vagrant-libvirt.box'), ('vagrant-virtualbox','vagrant-virtualbox.box')],

-                     'name': 'Fedora-AtomicHost-Vagrant',

-                     'kickstart': 'fedora-atomic-vagrant.ks',

-                     'distro': 'Fedora-22',

-                     'disk_size': 40,

-                     'arches': ['x86_64'],

-                     'install_tree_from': 'Everything',

-                     'subvariant': 'AtomicHost',

-                     'failable': ['*'],

-                      },

-             'factory-parameters': {

-                     'vagrant_sync_directory': '/home/vagrant/sync',

-             }

-         },

-         ],

      '^Labs$': [

          {

              'image-build': {
@@ -757,19 +725,6 @@ 

  ]

  

  ostree = {

-     "^AtomicHost$": {

-         "version": '!OSTREE_VERSION_FROM_LABEL_DATE_TYPE_RESPIN',

-         "force_new_commit": True,

-         "treefile": "fedora-atomic-host.json",

-         "config_url": "https://pagure.io/fedora-atomic.git",

-         "config_branch": "master",

-         "repo": "Everything",

-         "tag_ref": False,

-         "ostree_repo": "/mnt/koji/compose/ostree/repo/",

-         "ostree_ref": "fedora/rawhide/${basearch}/atomic-host",

-         "arches": ["aarch64", "ppc64le", "x86_64"],

-         "failable": ['*'],

-     },

      "^Silverblue$": {

          "version": "!OSTREE_VERSION_FROM_LABEL_DATE_TYPE_RESPIN",

          "force_new_commit": True,
@@ -786,65 +741,6 @@ 

  }

  

  ostree_installer = [

-     ("^AtomicHost$", {

-         "x86_64": {

-             "repo": "Everything",

-             "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/ostree/repo/",

-                 "ostree_update_repo=https://ostree.fedoraproject.org",

-                 "ostree_osname=fedora-atomic",

-                 "ostree_oskey=fedora-30-primary",

-                 "ostree_contenturl=mirrorlist=https://ostree.fedoraproject.org/mirrorlist",

-                 "ostree_install_ref=fedora/rawhide/x86_64/atomic-host",

-                 "ostree_update_ref=fedora/rawhide/x86_64/atomic-host",

-             ],

-             'template_repo': 'https://pagure.io/fedora-lorax-templates.git',

-             'template_branch': 'master',

-             'failable': ['*'],

-         },

-         "aarch64": {

-             "repo": "Everything",

-             "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/ostree/repo/",

-                 "ostree_update_repo=https://ostree.fedoraproject.org",

-                 "ostree_osname=fedora-atomic",

-                 "ostree_oskey=fedora-30-primary",

-                 "ostree_contenturl=mirrorlist=https://ostree.fedoraproject.org/mirrorlist",

-                 "ostree_install_ref=fedora/rawhide/aarch64/atomic-host",

-                 "ostree_update_ref=fedora/rawhide/aarch64/atomic-host",

-             ],

-             'template_repo': 'https://pagure.io/fedora-lorax-templates.git',

-             'template_branch': 'master',

-             'failable': ['*'],

-         },

-         "ppc64le": {

-             "repo": "Everything",

-             "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/ostree/repo/",

-                 "ostree_update_repo=https://ostree.fedoraproject.org",

-                 "ostree_osname=fedora-atomic",

-                 "ostree_oskey=fedora-30-primary",

-                 "ostree_contenturl=mirrorlist=https://ostree.fedoraproject.org/mirrorlist",

-                 "ostree_install_ref=fedora/rawhide/ppc64le/atomic-host",

-                 "ostree_update_ref=fedora/rawhide/ppc64le/atomic-host",

-             ],

-             'template_repo': 'https://pagure.io/fedora-lorax-templates.git',

-             'template_branch': 'master',

-             'failable': ['*'],

-         }

-     }),

      ("^Silverblue$", {

          "x86_64": {

              "repo": "Everything",

file modified
+8 -12
@@ -123,12 +123,12 @@ 

  fi

  $RSYNCPREFIX compose-partial-copy --arch=armhfp --arch=x86_64 --arch src \

      "$DESTDIR" "$RSYNCTARGET/" \

-     --variant Everything --variant AtomicHost --variant Cloud --variant Container \

+     --variant Everything --variant Cloud --variant Container \

      --variant Server --variant Spins --variant Workstation --variant Silverblue --variant Modular \

      --link-dest="$RSYNCTARGET/Everything" --exclude=repodata

  $RSYNCPREFIX compose-partial-copy --arch=armhfp --arch=x86_64 --arch src \

      "$DESTDIR" "$RSYNCTARGET/" \

-     --variant Everything --variant AtomicHost --variant Cloud --variant Container \

+     --variant Everything --variant Cloud --variant Container \

      --variant Server --variant Spins --variant Workstation --variant Silverblue --variant Modular \

      --link-dest="$RSYNCTARGET/Everything" --delete-after

  # aarch64 for Everything Server Cloud Container is primary
@@ -166,32 +166,28 @@ 

  fi

  $RSYNCPREFIX compose-partial-copy --arch=i386 --arch=ppc64le --arch=s390x \

      "$DESTDIR" "$RSYNCSECTARGET/" \

-     --variant Everything --variant AtomicHost --variant Cloud --variant Container \

+     --variant Everything --variant Cloud --variant Container \

      --variant Labs --variant Server --variant Spins --variant Workstation --variant Modular \

      --link-dest="$RSYNCTARGET/Everything/" --link-dest="$RSYNCSECTARGET/Everything/" --exclude=repodata

  $RSYNCPREFIX compose-partial-copy --arch=i386 --arch=ppc64le --arch=s390x \

      "$DESTDIR" "$RSYNCSECTARGET/" \

-     --variant Everything --variant AtomicHost --variant Cloud --variant Container \

+     --variant Everything --variant Cloud --variant Container \

      --variant Labs --variant Server --variant Spins --variant Workstation --variant Modular \

      --link-dest="$RSYNCTARGET/Everything/" --link-dest="$RSYNCSECTARGET/Everything/" --delete-after

- # aarch64 is alternative for AtomicHost Labs Spins Workstation

+ # aarch64 is alternative for Labs Spins Workstation

  $RSYNCPREFIX compose-partial-copy --arch=aarch64 \

      "$DESTDIR" "$RSYNCSECTARGET/" \

-     --variant AtomicHost --variant Labs --variant Spins --variant Workstation \

+     --variant Labs --variant Spins --variant Workstation \

      --link-dest="$RSYNCTARGET/Everything/" --exclude=repodata

  $RSYNCPREFIX compose-partial-copy --arch=aarch64 \

      "$DESTDIR" "$RSYNCSECTARGET/" \

-     --variant AtomicHost --variant Labs --variant Spins --variant Workstation \

+     --variant Labs --variant Spins --variant Workstation \

      --link-dest="$RSYNCTARGET/Everything/" --delete-after

  $RSYNCPREFIX rm "$RSYNCSECTARGET/.composeinfo"

  $RSYNCPREFIX ./releng/scripts/build_composeinfo "$RSYNCSECTARGET/" --name "$NEWCOMPOSE_ID"

  

  

- # sync over Atomic Host and Silverblue to the unified ostree repo

- for arch in x86_64 aarch64 ppc64le; do

-     ostree pull-local --repo=$OSTREEDESTREPO $OSTREESRCREPO --depth=-1 "fedora/rawhide/${arch}/atomic-host"

-     ostree summary -u --repo=$OSTREEDESTREPO # update summary file

- done

+ # sync Silverblue to the unified ostree repo

  for arch in x86_64; do

      ostree pull-local --repo=$OSTREEDESTREPO $OSTREESRCREPO --depth=-1 "fedora/rawhide/${arch}/silverblue"

      ostree summary -u --repo=$OSTREEDESTREPO # update summary file

file removed
-88
@@ -1,88 +0,0 @@ 

- #!/bin/sh

- 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-atomic.conf"

- TARGET_DIR="/mnt/koji/compose/twoweek"

- #OLD_COMPOSES_DIR="--old-composes=/mnt/fedora_koji/compose/f23 --old-composes=$TARGET_DIR"

- NIGHTLY=""

- SKIP_PHASES="--skip-phase=productimg --skip-phase=extra_files"

- DEST=$(pwd)

- DATE=$(date "+%Y%m%d")

- # the Pungi 'shortname', which we will include in fedmsgs for disambiguation

- SHORT="Fedora-Atomic"

- RELEASE="27"

- RELEASE_TITLE="27"

- COMPSFILE="comps-f27.xml"

- TMPDIR=`mktemp -d /tmp/$RELEASE.$DATE.XXXX`

- TOMAIL="devel@lists.fedoraproject.org test@lists.fedoraproject.org"

- FROM="Fedora Branched Report <rawhide@fedoraproject.org>"

- RSYNCPREFIX="sudo -u ftpsync"

- RSYNCTARGET="/pub/alt/atomic/testing/$SHORTCOMPOSE_ID"

- OLDCOMPOSE_ID=$(cat $TARGET_DIR/latest-$SHORT-$RELEASE_TITLE/COMPOSE_ID)

- # uncomment and edit for resuming a failed compose

- #COMPOSE_ID="Fedora-23-20150530.n.0"

- # assume a releng dir is a git checkout of teh 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_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

- # Announce that we are starting...

- send_fedmsg "${fedmsg_json_start}" ${RELEASE} start

- pushd $TMPDIR

- git clone https://pagure.io/fedora-comps.git && {

-     pushd fedora-comps

-     make "${COMPSFILE}"

-     cp "${COMPSFILE}" $DEST/

-     popd

- }

- popd

- CMD="pungi-koji --notification-script=/usr/bin/pungi-fedmsg-notification --config=$CONFIG --old-composes=$TARGET_DIR $OLD_COMPOSES_DIR $NIGHTLY $SKIP_PHASES --label=$LABEL"

- 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-.*-||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 Atomic CloudImages Docker metadata ;

-   do

-     $RSYNCPREFIX rsync -avhH $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 '$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

file modified
-7
@@ -1,13 +1,6 @@ 

  <?xml version="1.0" encoding="UTF-8"?>

  <!DOCTYPE variants PUBLIC "-//Red Hat, Inc.//DTD Variants info//EN" "variants2012.dtd">

  <variants>

-     <variant id="AtomicHost" name="AtomicHost" type="variant" is_empty="true">

-         <arches>

-             <arch>aarch64</arch>

-             <arch>x86_64</arch>

-             <arch>ppc64le</arch>

-         </arches>

-     </variant>

      <variant id="Cloud" name="Cloud" type="variant" is_empty="true">

          <arches>

              <arch>aarch64</arch>

Also clean-up of Atomic related files
Related: https://github.com/coreos/fedora-coreos-tracker/issues/145

Signed-off-by: Sinny Kumari sinny@redhat.com

one typo that I see. otherwise LGTM

rebased onto c7132bc

5 years ago

Thanks for catching the typo, fixed it.

Is this really appropriate to do right now given that we don't apparently have FCOS as part of the official compose process at all right now, and the line at Devconf was that it's very early? Are we sure it's going to be ready to ship as part of F30, or that we're fine with F30 having neither if it isn't?

@adamwill - we're trying to do this now before branching so that we don't have to do it twice. We do know we won't have an F30 Atomic. We will have a Fedora CoreOS but it won't be exactly on Fedora 30 release day. Our plan there is to keep doing two week releases of Fedora 29 Atomic Host until the EOL of Fedora 29. This will allow us to keep Atomic Host going without investing cycles into it for Fedora 30. The investment in the 30 timeframe will be for Fedora CoreOS.

More context here: https://github.com/coreos/fedora-coreos-tracker/issues/145

Pull-Request has been merged by mohanboddu

5 years ago