From 5c9f7042db873f0848c039fd9ae633c74dbccdff Mon Sep 17 00:00:00 2001 From: Dusty Mabe Date: May 25 2018 13:41:15 +0000 Subject: container/cloud: sync the rest of the changes from f28 branch Signed-off-by: Dusty Mabe --- diff --git a/cloud-nightly.sh b/cloud-nightly.sh index 235b174..a6a75e5 100755 --- a/cloud-nightly.sh +++ b/cloud-nightly.sh @@ -9,14 +9,13 @@ CONFIG="fedora-cloud.conf" TARGET_DIR="/mnt/koji/compose/cloud" #OLD_COMPOSES_DIR="--old-composes=/mnt/fedora_koji/compose/f23 --old-composes=$TARGET_DIR" NIGHTLY="" -SKIP_PHASES="--skip-phase=productimg --skip-phase=pkgset --skip-phase=gather --skip-phase=extra_files --skip-phase=creatrepo" DEST=$(pwd) DATE=$(date "+%Y%m%d") # the Pungi 'shortname', which we will include in fedmsgs for disambiguation SHORT="Fedora-Cloud" -RELEASE="27" -RELEASE_TITLE="27" -COMPSFILE="comps-f27.xml" +RELEASE="29" +RELEASE_TITLE="29" +COMPSFILE="comps-f29.xml" TMPDIR=`mktemp -d /tmp/$RELEASE.$DATE.XXXX` TOMAIL="devel@lists.fedoraproject.org test@lists.fedoraproject.org" FROM="Fedora Branched Report " @@ -40,15 +39,7 @@ FEDMSG_CERTPREFIX="releng" . ./releng/scripts/fedmsg-functions.sh # Announce that we are starting, even though we don't know the compose_id yet.. 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" +CMD="pungi-koji --notification-script=/usr/bin/pungi-fedmsg-notification --config=$CONFIG --old-composes=$TARGET_DIR $OLD_COMPOSES_DIR $NIGHTLY --label=$LABEL" if [ -z "$COMPOSE_ID" ]; then CMD="$CMD --target-dir=$TARGET_DIR" else diff --git a/fedora-cloud.conf b/fedora-cloud.conf index d3bb761..36efdae 100644 --- a/fedora-cloud.conf +++ b/fedora-cloud.conf @@ -1,33 +1,35 @@ # PRODUCT INFO release_name = 'Fedora-Cloud' release_short = 'Fedora-Cloud' -release_version = '26' +release_version = '29' release_is_layered = False +skip_phases = ["buildinstall", "productimg", "pkgset", "gather", "extra_files", "createrepo"] # GENERAL SETTINGS bootable = False -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', -#} +comps_file = { + 'scm': 'git', + 'repo': 'https://pagure.io/fedora-comps.git', + 'branch': 'master', + 'file': 'comps-f29.xml', + 'command': 'make comps-f29.xml' +} variants_file='variants-fedora.xml' -sigkeys = ['FDB19C98', 'E372E838'] # None = unsigned +sigkeys = ['429476B4'] # None = unsigned # limit tree architectures # if undefined, all architectures from variants.xml will be included -tree_arches = ['x86_64'] +tree_arches = ['aarch64', 'ppc64', 'ppc64le', 's390x', 'x86_64'] # limit tree variants # if undefined, all variants from variants.xml will be included -tree_variants = ['CloudImages'] +tree_variants = ['Cloud'] hashed_directories = True # RUNROOT settings runroot = True #runroot_channel = 'fedora_compose' runroot_channel = 'compose' -runroot_tag = 'f26-build' +runroot_tag = 'f29-build' # PKGSET pkgset_source = 'koji' # koji, repos -pkgset_koji_tag = 'f26-updates' +pkgset_koji_tag = 'f29-updates' pkgset_koji_inherit = True filter_system_release_packages = False # GATHER @@ -88,34 +90,33 @@ additional_packages = [ ], }), ] + multilib = [ ('^Everything$', { 'x86_64': ['devel', 'runtime'], - 's390x': ['devel', 'runtime'] }) ] filter_packages = [ - ('(Workstation|Server|Cloud)$', { + ('(Workstation|Server)$', { '*': [ - '^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-.*', + 'kernel*debug*', + 'kernel-kdump*', + 'kernel-tools*', + 'syslog-ng*', + 'astronomy-bookmarks', + 'generic*', + 'GConf2-dbus*', + 'bluez-gnome', + 'java-1.8.0-openjdk', + 'community-mysql*', + 'jruby*', + 'gimp-help-*', ] }), ] # format: {arch|*: [packages]} multilib_blacklist = { - '*': ['kernel*', 'kernel-PAE*', 'kernel*debug*', + '*': ['kernel', 'kernel-PAE*', 'kernel*debug*', 'dmraid-devel', 'kdeutils-devel', 'mkinitrd-devel', 'php-devel', 'java-*', 'httpd-devel', 'tomcat-native', 'php*', 'httpd', @@ -124,12 +125,16 @@ multilib_blacklist = { } # format: {arch|*: [packages]} multilib_whitelist = { - '*': ['libgnat', 'wine*', 'lmms-vst', 'nspluginwrapper', + '*': ['libgnat', 'wine', 'lmms-vst', 'nspluginwrapper', 'libflashsupport', 'valgrind', 'perl-libs', 'redhat-lsb', 'yaboot', 'syslinux-extlinux-nonlinux', 'syslinux-nonlinux', - 'syslinux-tftpboot', 'nosync', '*-static' + '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' ], } + createiso_skip = [ ('^Workstation$', { '*': True, @@ -173,24 +178,28 @@ image_volid_formats = [ image_volid_layered_product_formats = [] # Replace 'Cloud' with 'C' in volume id etc. volume_id_substitutions = { - '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', + 'Beta': 'B', + 'Rawhide': 'rawh', + 'Astronomy_KDE': 'AstK', + 'AtomicHost': 'AH', + 'AtomicWorkstation': 'AW', + 'Cinnamon': 'Cinn', + 'Cloud': 'C', + 'Design_suite': 'Dsgn', + 'Electronic_Lab': 'Elec', + 'Everything': 'E', + 'Games': 'Game', + 'Images': 'img', + 'Jam_KDE': 'Jam', + 'MATE_Compiz': 'MATE', + # Note https://pagure.io/pungi-fedora/issue/533 + 'Python-Classroom': 'Clss', + 'Python_Classroom': 'Clss', + 'Robotics': 'Robo', + 'Scientific_KDE': 'SciK', + 'Security': 'Sec', + 'Server': 'S', + '-Workstation-': '-WS-', } disc_types = { 'boot': 'netinst', @@ -200,24 +209,24 @@ translate_paths = [ ('/mnt/koji/compose/', 'http://kojipkgs.fedoraproject.org/compose/'), ] image_build = { - '^CloudImages$': [ + '^Cloud$': [ { 'image-build': { 'format': [('qcow2','qcow2'), ('raw-xz','raw.xz')], 'name': 'Fedora-Cloud-Base', - 'target': 'f26', - 'version': '26', + 'target': 'f29', + 'version': '29', 'release': None, - 'ksurl': 'git+https://pagure.io/fedora-kickstarts.git?#origin/f26', + 'ksurl': 'git+https://pagure.io/fedora-kickstarts.git?#origin/f29', 'kickstart': 'fedora-cloud-base.ks', 'distro': 'Fedora-22', 'disk_size': 4, - 'arches': ['x86_64'], + 'arches': ['aarch64', 'ppc64', 'ppc64le', 's390x', 'x86_64'], 'repo': [ - 'http://kojipkgs.fedoraproject.org/pub/fedora/linux/updates/26/$arch/', - 'http://kojipkgs.fedoraproject.org/pub/alt/releases/26/Cloud/$arch/os/', + 'https://kojipkgs.fedoraproject.org/compose/updates/f29-updates/compose/Everything/$arch/os/' + 'https://kojipkgs.fedoraproject.org/compose/29/latest-Fedora-29/compose/Everything/$arch/os/' ], - 'install_tree_from': 'http://kojipkgs.fedoraproject.org/pub/alt/releases/26/Cloud/$arch/os/', + 'install_tree_from': 'https://kojipkgs.fedoraproject.org/compose/29/latest-Fedora-29/compose/Everything/$arch/os/', 'subvariant': 'Cloud_Base' } }, @@ -225,19 +234,19 @@ image_build = { 'image-build': { 'format': [('vagrant-libvirt','vagrant-libvirt.box'), ('vagrant-virtualbox','vagrant-virtualbox.box')] 'name': 'Fedora-Cloud-Base-Vagrant', - 'target': 'f26', - 'version': '26', + 'target': 'f29', + 'version': '29', 'release': None, - 'ksurl': 'git+https://pagure.io/fedora-kickstarts.git?#origin/f26', + 'ksurl': 'git+https://pagure.io/fedora-kickstarts.git?#origin/f29', 'kickstart': 'fedora-cloud-base-vagrant.ks', 'distro': 'Fedora-22', 'disk_size': 40, 'arches': ['x86_64'], 'repo': [ - 'http://kojipkgs.fedoraproject.org/pub/fedora/linux/updates/26/$arch/', - 'http://kojipkgs.fedoraproject.org/pub/alt/releases/26/Cloud/$arch/os/' + 'https://kojipkgs.fedoraproject.org/compose/updates/f29-updates/compose/Everything/$arch/os/' + 'https://kojipkgs.fedoraproject.org/compose/29/latest-Fedora-29/compose/Everything/$arch/os/' ], - 'install_tree_from': 'http://kojipkgs.fedoraproject.org/pub/alt/releases/26/Cloud/$arch/os/', + 'install_tree_from': 'https://kojipkgs.fedoraproject.org/compose/29/latest-Fedora-29/compose/Everything/$arch/os/', 'subvariant': 'Cloud_Base', } }, diff --git a/fedora-container.conf b/fedora-container.conf index 7451ff3..e0a7839 100644 --- a/fedora-container.conf +++ b/fedora-container.conf @@ -3,19 +3,21 @@ release_name = 'Fedora-Container' release_short = 'Fedora-Container' release_version = '29' release_is_layered = False +skip_phases = ["buildinstall", "productimg", "pkgset", "gather", "extra_files", "createrepo"] # GENERAL SETTINGS bootable = False -comps_file = 'comps-f29.xml' #{ -# 'scm': 'git', -# 'repo': 'git://git.fedorahosted.org/git/comps.git', -# 'branch': None, # defaults to cvs/HEAD or git/master -# 'file': 'comps-f23.xml', -#} +comps_file = { + 'scm': 'git', + 'repo': 'https://pagure.io/fedora-comps.git', + 'branch': 'master', + 'file': 'comps-f29.xml', + 'command': 'make comps-f29.xml' +} variants_file='variants-fedora.xml' -sigkeys = ['FDB19C98', 'E372E838'] # None = unsigned +sigkeys = ['429476B4'] # None = unsigned # limit tree architectures # if undefined, all architectures from variants.xml will be included -tree_arches = ['x86_64', 'armhfp'] +tree_arches = ['armhfp', 'aarch64', 'ppc64le', 's390x', 'x86_64'] # limit tree variants # if undefined, all variants from variants.xml will be included tree_variants = ['Container'] @@ -88,34 +90,33 @@ additional_packages = [ ], }), ] + multilib = [ ('^Everything$', { 'x86_64': ['devel', 'runtime'], - 's390x': ['devel', 'runtime'] }) ] filter_packages = [ - ('(Workstation|Server|Cloud)$', { + ('(Workstation|Server)$', { '*': [ - '^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-.*', + 'kernel*debug*', + 'kernel-kdump*', + 'kernel-tools*', + 'syslog-ng*', + 'astronomy-bookmarks', + 'generic*', + 'GConf2-dbus*', + 'bluez-gnome', + 'java-1.8.0-openjdk', + 'community-mysql*', + 'jruby*', + 'gimp-help-*', ] }), ] # format: {arch|*: [packages]} multilib_blacklist = { - '*': ['kernel*', 'kernel-PAE*', 'kernel*debug*', + '*': ['kernel', 'kernel-PAE*', 'kernel*debug*', 'dmraid-devel', 'kdeutils-devel', 'mkinitrd-devel', 'php-devel', 'java-*', 'httpd-devel', 'tomcat-native', 'php*', 'httpd', @@ -124,12 +125,16 @@ multilib_blacklist = { } # format: {arch|*: [packages]} multilib_whitelist = { - '*': ['libgnat', 'wine*', 'lmms-vst', 'nspluginwrapper', + '*': ['libgnat', 'wine', 'lmms-vst', 'nspluginwrapper', 'libflashsupport', 'valgrind', 'perl-libs', 'redhat-lsb', 'yaboot', 'syslinux-extlinux-nonlinux', 'syslinux-nonlinux', - 'syslinux-tftpboot', 'nosync', '*-static' + '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' ], } + createiso_skip = [ ('^Workstation$', { '*': True, @@ -173,25 +178,28 @@ image_volid_formats = [ 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', + 'Beta': 'B', + 'Rawhide': 'rawh', + 'Astronomy_KDE': 'AstK', + 'AtomicHost': 'AH', + 'AtomicWorkstation': 'AW', + 'Cinnamon': 'Cinn', + 'Cloud': 'C', + 'Design_suite': 'Dsgn', + 'Electronic_Lab': 'Elec', + 'Everything': 'E', + 'Games': 'Game', + 'Images': 'img', + 'Jam_KDE': 'Jam', + 'MATE_Compiz': 'MATE', + # Note https://pagure.io/pungi-fedora/issue/533 + 'Python-Classroom': 'Clss', + 'Python_Classroom': 'Clss', + 'Robotics': 'Robo', + 'Scientific_KDE': 'SciK', + 'Security': 'Sec', + 'Server': 'S', + '-Workstation-': '-WS-', } disc_types = { 'boot': 'netinst', @@ -216,11 +224,11 @@ image_build = { 'kickstart': 'fedora-docker-base.ks', 'distro': 'Fedora-22', 'disk_size': 5, - 'arches': ['x86_64', 'armhfp'], - 'install_tree_from': 'http://kojipkgs.fedoraproject.org/pub/fedora/linux/releases/29/Everything/$arch/os/', + 'arches': ['armhfp', 'aarch64', 'ppc64le', 's390x', 'x86_64'], + 'install_tree_from': 'https://kojipkgs.fedoraproject.org/compose/29/latest-Fedora-29/compose/Everything/$arch/os/', 'repo': [ - 'http://kojipkgs.fedoraproject.org/pub/fedora/linux/updates/29/$arch/', - 'http://kojipkgs.fedoraproject.org/pub/fedora/linux/releases/29/Everything/$arch/os/', + 'https://kojipkgs.fedoraproject.org/compose/updates/f29-updates/compose/Everything/$arch/os/' + 'https://kojipkgs.fedoraproject.org/compose/29/latest-Fedora-29/compose/Everything/$arch/os/' ], 'subvariant': 'Container_Base' }, @@ -229,7 +237,6 @@ image_build = { 'docker_cmd': '[ "/bin/bash" ]', 'docker_env': '[ "DISTTAG=f29container", "FGC=f29" ]', 'docker_label': '{ "name": "fedora", "license": "MIT", "vendor": "Fedora Project", "version": "29"}', - }, }, { @@ -239,11 +246,11 @@ image_build = { 'kickstart': 'fedora-docker-base-minimal.ks', 'distro': 'Fedora-22', 'disk_size': 5, - 'arches': ['x86_64', 'armhfp'], - 'install_tree_from': 'http://kojipkgs.fedoraproject.org/pub/fedora/linux/releases/29/Everything/$arch/os/', + 'arches': ['armhfp', 'aarch64', 'ppc64le', 's390x', 'x86_64'], + 'install_tree_from': 'https://kojipkgs.fedoraproject.org/compose/29/latest-Fedora-29/compose/Everything/$arch/os/', 'repo': [ - 'http://kojipkgs.fedoraproject.org/pub/fedora/linux/updates/29/$arch/', - 'http://kojipkgs.fedoraproject.org/pub/fedora/linux/releases/29/Everything/$arch/os/', + 'https://kojipkgs.fedoraproject.org/compose/updates/f29-updates/compose/Everything/$arch/os/' + 'https://kojipkgs.fedoraproject.org/compose/29/latest-Fedora-29/compose/Everything/$arch/os/' ], 'subvariant': 'Container_Minimal_Base', },