davidlt/pungi-fedora
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

container/cloud: sync the rest of the changes from f28 branch

Browse Source 
Signed-off-by: Dusty Mabe <dusty@dustymabe.com>
This commit is contained in:
Dusty Mabe 2018-05-25 09:40:32 -04:00
parent 377c3d7aa6
commit 5c9f7042db
No known key found for this signature in database
GPG Key ID: 3302DBD73952E671
3 changed files with 136 additions and 129 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
cloud-nightly.sh
View File

@ -9,14 +9,13 @@ CONFIG="fedora-cloud.conf"
TARGET_DIR="/mnt/koji/compose/cloud" TARGET_DIR="/mnt/koji/compose/cloud"
#OLD_COMPOSES_DIR="--old-composes=/mnt/fedora_koji/compose/f23 --old-composes=$TARGET_DIR" #OLD_COMPOSES_DIR="--old-composes=/mnt/fedora_koji/compose/f23 --old-composes=$TARGET_DIR"
NIGHTLY="" NIGHTLY=""
SKIP_PHASES="--skip-phase=productimg --skip-phase=pkgset --skip-phase=gather --skip-phase=extra_files --skip-phase=creatrepo"
DEST=$(pwd) DEST=$(pwd)
DATE=$(date "+%Y%m%d") DATE=$(date "+%Y%m%d")
# the Pungi 'shortname', which we will include in fedmsgs for disambiguation # the Pungi 'shortname', which we will include in fedmsgs for disambiguation
SHORT="Fedora-Cloud" SHORT="Fedora-Cloud"
RELEASE="27" RELEASE="29"
RELEASE_TITLE="27" RELEASE_TITLE="29"
COMPSFILE="comps-f27.xml" COMPSFILE="comps-f29.xml"
TMPDIR=`mktemp -d /tmp/$RELEASE.$DATE.XXXX` TMPDIR=`mktemp -d /tmp/$RELEASE.$DATE.XXXX`
TOMAIL="devel@lists.fedoraproject.org test@lists.fedoraproject.org" TOMAIL="devel@lists.fedoraproject.org test@lists.fedoraproject.org"
FROM="Fedora Branched Report <rawhide@fedoraproject.org>" FROM="Fedora Branched Report <rawhide@fedoraproject.org>"
@ -40,15 +39,7 @@ FEDMSG_CERTPREFIX="releng"
. ./releng/scripts/fedmsg-functions.sh . ./releng/scripts/fedmsg-functions.sh
# Announce that we are starting, even though we don't know the compose_id yet.. # Announce that we are starting, even though we don't know the compose_id yet..
send_fedmsg "${fedmsg_json_start}" ${RELEASE} start send_fedmsg "${fedmsg_json_start}" ${RELEASE} start
pushd $TMPDIR CMD="pungi-koji --notification-script=/usr/bin/pungi-fedmsg-notification --config=$CONFIG --old-composes=$TARGET_DIR $OLD_COMPOSES_DIR $NIGHTLY --label=$LABEL"
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 if [ -z "$COMPOSE_ID" ]; then
CMD="$CMD --target-dir=$TARGET_DIR" CMD="$CMD --target-dir=$TARGET_DIR"
else else

133
fedora-cloud.conf
View File

@ -1,33 +1,35 @@
# PRODUCT INFO # PRODUCT INFO
release_name = 'Fedora-Cloud' release_name = 'Fedora-Cloud'
release_short = 'Fedora-Cloud' release_short = 'Fedora-Cloud'
release_version = '26' release_version = '29'
release_is_layered = False release_is_layered = False
skip_phases = ["buildinstall", "productimg", "pkgset", "gather", "extra_files", "createrepo"]
# GENERAL SETTINGS # GENERAL SETTINGS
bootable = False bootable = False
comps_file = 'comps-f26.xml' #{ comps_file = {
# 'scm': 'git', 'scm': 'git',
# 'repo': 'git://git.fedorahosted.org/git/comps.git', 'repo': 'https://pagure.io/fedora-comps.git',
# 'branch': None, # defaults to cvs/HEAD or git/master 'branch': 'master',
# 'file': 'comps-f23.xml', 'file': 'comps-f29.xml',
#} 'command': 'make comps-f29.xml'
}
variants_file='variants-fedora.xml' variants_file='variants-fedora.xml'
sigkeys = ['FDB19C98', 'E372E838'] # None = unsigned sigkeys = ['429476B4'] # None = unsigned
# limit tree architectures # limit tree architectures
# if undefined, all architectures from variants.xml will be included # 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 # limit tree variants
# if undefined, all variants from variants.xml will be included # if undefined, all variants from variants.xml will be included
tree_variants = ['CloudImages'] tree_variants = ['Cloud']
hashed_directories = True hashed_directories = True
# RUNROOT settings # RUNROOT settings
runroot = True runroot = True
#runroot_channel = 'fedora_compose' #runroot_channel = 'fedora_compose'
runroot_channel = 'compose' runroot_channel = 'compose'
runroot_tag = 'f26-build' runroot_tag = 'f29-build'
# PKGSET # PKGSET
pkgset_source = 'koji' # koji, repos pkgset_source = 'koji' # koji, repos
pkgset_koji_tag = 'f26-updates' pkgset_koji_tag = 'f29-updates'
pkgset_koji_inherit = True pkgset_koji_inherit = True
filter_system_release_packages = False filter_system_release_packages = False
# GATHER # GATHER
@ -88,34 +90,33 @@ additional_packages = [
], ],
}), }),
] ]
multilib = [ multilib = [
('^Everything$', { ('^Everything$', {
'x86_64': ['devel', 'runtime'], 'x86_64': ['devel', 'runtime'],
's390x': ['devel', 'runtime']
}) })
] ]
filter_packages = [ filter_packages = [
('(Workstation|Server|Cloud)$', { ('(Workstation|Server)$', {
'*': [ '*': [
'^kernel.*debug.*', 'kernel*debug*',
'^kernel-kdump.*', 'kernel-kdump*',
'^kernel-tools.*', 'kernel-tools*',
'^syslog-ng.*', 'syslog-ng*',
'^astronomy-bookmarks', 'astronomy-bookmarks',
'^generic.*', 'generic*',
'^GConf2-dbus.*', 'GConf2-dbus*',
'^bluez-gnome', 'bluez-gnome',
#Periods cause problems in paterns, so replace with *s 'java-1.8.0-openjdk',
'^java-1.8.0-openjdk', 'community-mysql*',
'^community-mysql.*', 'jruby*',
'^jruby.*', 'gimp-help-*',
'^gimp-help-.*',
] ]
}), }),
] ]
# format: {arch|*: [packages]} # format: {arch|*: [packages]}
multilib_blacklist = { multilib_blacklist = {
'*': ['kernel*', 'kernel-PAE*', 'kernel*debug*', '*': ['kernel', 'kernel-PAE*', 'kernel*debug*',
'dmraid-devel', 'kdeutils-devel', 'mkinitrd-devel', 'dmraid-devel', 'kdeutils-devel', 'mkinitrd-devel',
'php-devel', 'java-*', 'php-devel', 'java-*',
'httpd-devel', 'tomcat-native', 'php*', 'httpd', 'httpd-devel', 'tomcat-native', 'php*', 'httpd',
@ -124,12 +125,16 @@ multilib_blacklist = {
} }
# format: {arch|*: [packages]} # format: {arch|*: [packages]}
multilib_whitelist = { multilib_whitelist = {
'*': ['libgnat', 'wine*', 'lmms-vst', 'nspluginwrapper', '*': ['libgnat', 'wine', 'lmms-vst', 'nspluginwrapper',
'libflashsupport', 'valgrind', 'perl-libs', 'redhat-lsb', 'libflashsupport', 'valgrind', 'perl-libs', 'redhat-lsb',
'yaboot', 'syslinux-extlinux-nonlinux', 'syslinux-nonlinux', '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 = [ createiso_skip = [
('^Workstation$', { ('^Workstation$', {
'*': True, '*': True,
@ -173,24 +178,28 @@ image_volid_formats = [
image_volid_layered_product_formats = [] image_volid_layered_product_formats = []
# Replace 'Cloud' with 'C' in volume id etc. # Replace 'Cloud' with 'C' in volume id etc.
volume_id_substitutions = { volume_id_substitutions = {
'Rawhide': 'rawh', 'Beta': 'B',
'Images': 'img', 'Rawhide': 'rawh',
'MATE_Compiz': 'MATE', 'Astronomy_KDE': 'AstK',
'Security': 'Sec', 'AtomicHost': 'AH',
'Electronic_Lab': 'Elec', 'AtomicWorkstation': 'AW',
'Robotics': 'Robo', 'Cinnamon': 'Cinn',
'Scientific_KDE': 'SciK', 'Cloud': 'C',
'Astronomy_KDE': 'AstK', 'Design_suite': 'Dsgn',
'Design_suite': 'Dsgn', 'Electronic_Lab': 'Elec',
'Games': 'Game', 'Everything': 'E',
'Jam_KDE': 'Jam', 'Games': 'Game',
'Workstation': 'WS', 'Images': 'img',
'Everything': 'E', 'Jam_KDE': 'Jam',
'Server': 'S', 'MATE_Compiz': 'MATE',
'Cloud': 'C', # Note https://pagure.io/pungi-fedora/issue/533
'Alpha': 'A', 'Python-Classroom': 'Clss',
'Beta': 'B', 'Python_Classroom': 'Clss',
'TC': 'T', 'Robotics': 'Robo',
'Scientific_KDE': 'SciK',
'Security': 'Sec',
'Server': 'S',
'-Workstation-': '-WS-',
} }
disc_types = { disc_types = {
'boot': 'netinst', 'boot': 'netinst',
@ -200,24 +209,24 @@ translate_paths = [
('/mnt/koji/compose/', 'http://kojipkgs.fedoraproject.org/compose/'), ('/mnt/koji/compose/', 'http://kojipkgs.fedoraproject.org/compose/'),
] ]
image_build = { image_build = {
'^CloudImages$': [ '^Cloud$': [
{ {
'image-build': { 'image-build': {
'format': [('qcow2','qcow2'), ('raw-xz','raw.xz')], 'format': [('qcow2','qcow2'), ('raw-xz','raw.xz')],
'name': 'Fedora-Cloud-Base', 'name': 'Fedora-Cloud-Base',
'target': 'f26', 'target': 'f29',
'version': '26', 'version': '29',
'release': None, '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', 'kickstart': 'fedora-cloud-base.ks',
'distro': 'Fedora-22', 'distro': 'Fedora-22',
'disk_size': 4, 'disk_size': 4,
'arches': ['x86_64'], 'arches': ['aarch64', 'ppc64', 'ppc64le', 's390x', 'x86_64'],
'repo': [ 'repo': [
'http://kojipkgs.fedoraproject.org/pub/fedora/linux/updates/26/$arch/', 'https://kojipkgs.fedoraproject.org/compose/updates/f29-updates/compose/Everything/$arch/os/'
'http://kojipkgs.fedoraproject.org/pub/alt/releases/26/Cloud/$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' 'subvariant': 'Cloud_Base'
} }
}, },
@ -225,19 +234,19 @@ image_build = {
'image-build': { 'image-build': {
'format': [('vagrant-libvirt','vagrant-libvirt.box'), ('vagrant-virtualbox','vagrant-virtualbox.box')] 'format': [('vagrant-libvirt','vagrant-libvirt.box'), ('vagrant-virtualbox','vagrant-virtualbox.box')]
'name': 'Fedora-Cloud-Base-Vagrant', 'name': 'Fedora-Cloud-Base-Vagrant',
'target': 'f26', 'target': 'f29',
'version': '26', 'version': '29',
'release': None, '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', 'kickstart': 'fedora-cloud-base-vagrant.ks',
'distro': 'Fedora-22', 'distro': 'Fedora-22',
'disk_size': 40, 'disk_size': 40,
'arches': ['x86_64'], 'arches': ['x86_64'],
'repo': [ 'repo': [
'http://kojipkgs.fedoraproject.org/pub/fedora/linux/updates/26/$arch/', 'https://kojipkgs.fedoraproject.org/compose/updates/f29-updates/compose/Everything/$arch/os/'
'http://kojipkgs.fedoraproject.org/pub/alt/releases/26/Cloud/$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', 'subvariant': 'Cloud_Base',
} }
}, },

115
fedora-container.conf
View File

@ -3,19 +3,21 @@ release_name = 'Fedora-Container'
release_short = 'Fedora-Container' release_short = 'Fedora-Container'
release_version = '29' release_version = '29'
release_is_layered = False release_is_layered = False
skip_phases = ["buildinstall", "productimg", "pkgset", "gather", "extra_files", "createrepo"]
# GENERAL SETTINGS # GENERAL SETTINGS
bootable = False bootable = False
comps_file = 'comps-f29.xml' #{ comps_file = {
# 'scm': 'git', 'scm': 'git',
# 'repo': 'git://git.fedorahosted.org/git/comps.git', 'repo': 'https://pagure.io/fedora-comps.git',
# 'branch': None, # defaults to cvs/HEAD or git/master 'branch': 'master',
# 'file': 'comps-f23.xml', 'file': 'comps-f29.xml',
#} 'command': 'make comps-f29.xml'
}
variants_file='variants-fedora.xml' variants_file='variants-fedora.xml'
sigkeys = ['FDB19C98', 'E372E838'] # None = unsigned sigkeys = ['429476B4'] # None = unsigned
# limit tree architectures # limit tree architectures
# if undefined, all architectures from variants.xml will be included # 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 # limit tree variants
# if undefined, all variants from variants.xml will be included # if undefined, all variants from variants.xml will be included
tree_variants = ['Container'] tree_variants = ['Container']
@ -88,34 +90,33 @@ additional_packages = [
], ],
}), }),
] ]
multilib = [ multilib = [
('^Everything$', { ('^Everything$', {
'x86_64': ['devel', 'runtime'], 'x86_64': ['devel', 'runtime'],
's390x': ['devel', 'runtime']
}) })
] ]
filter_packages = [ filter_packages = [
('(Workstation|Server|Cloud)$', { ('(Workstation|Server)$', {
'*': [ '*': [
'^kernel.*debug.*', 'kernel*debug*',
'^kernel-kdump.*', 'kernel-kdump*',
'^kernel-tools.*', 'kernel-tools*',
'^syslog-ng.*', 'syslog-ng*',
'^astronomy-bookmarks', 'astronomy-bookmarks',
'^generic.*', 'generic*',
'^GConf2-dbus.*', 'GConf2-dbus*',
'^bluez-gnome', 'bluez-gnome',
#Periods cause problems in paterns, so replace with *s 'java-1.8.0-openjdk',
'^java-1.8.0-openjdk', 'community-mysql*',
'^community-mysql.*', 'jruby*',
'^jruby.*', 'gimp-help-*',
'^gimp-help-.*',
] ]
}), }),
] ]
# format: {arch|*: [packages]} # format: {arch|*: [packages]}
multilib_blacklist = { multilib_blacklist = {
'*': ['kernel*', 'kernel-PAE*', 'kernel*debug*', '*': ['kernel', 'kernel-PAE*', 'kernel*debug*',
'dmraid-devel', 'kdeutils-devel', 'mkinitrd-devel', 'dmraid-devel', 'kdeutils-devel', 'mkinitrd-devel',
'php-devel', 'java-*', 'php-devel', 'java-*',
'httpd-devel', 'tomcat-native', 'php*', 'httpd', 'httpd-devel', 'tomcat-native', 'php*', 'httpd',
@ -124,12 +125,16 @@ multilib_blacklist = {
} }
# format: {arch|*: [packages]} # format: {arch|*: [packages]}
multilib_whitelist = { multilib_whitelist = {
'*': ['libgnat', 'wine*', 'lmms-vst', 'nspluginwrapper', '*': ['libgnat', 'wine', 'lmms-vst', 'nspluginwrapper',
'libflashsupport', 'valgrind', 'perl-libs', 'redhat-lsb', 'libflashsupport', 'valgrind', 'perl-libs', 'redhat-lsb',
'yaboot', 'syslinux-extlinux-nonlinux', 'syslinux-nonlinux', '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 = [ createiso_skip = [
('^Workstation$', { ('^Workstation$', {
'*': True, '*': True,
@ -173,25 +178,28 @@ image_volid_formats = [
image_volid_layered_product_formats = [] image_volid_layered_product_formats = []
# Replace 'Cloud' with 'C' in volume id etc. # Replace 'Cloud' with 'C' in volume id etc.
volume_id_substitutions = { volume_id_substitutions = {
'Atomic': 'AH', 'Beta': 'B',
'Rawhide': 'rawh', 'Rawhide': 'rawh',
'Images': 'img', 'Astronomy_KDE': 'AstK',
'MATE_Compiz': 'MATE', 'AtomicHost': 'AH',
'Security': 'Sec', 'AtomicWorkstation': 'AW',
'Electronic_Lab': 'Elec', 'Cinnamon': 'Cinn',
'Robotics': 'Robo', 'Cloud': 'C',
'Scientific_KDE': 'SciK', 'Design_suite': 'Dsgn',
'Astronomy_KDE': 'AstK', 'Electronic_Lab': 'Elec',
'Design_suite': 'Dsgn', 'Everything': 'E',
'Games': 'Game', 'Games': 'Game',
'Jam_KDE': 'Jam', 'Images': 'img',
'Workstation': 'WS', 'Jam_KDE': 'Jam',
'Everything': 'E', 'MATE_Compiz': 'MATE',
'Server': 'S', # Note https://pagure.io/pungi-fedora/issue/533
'Cloud': 'C', 'Python-Classroom': 'Clss',
'Alpha': 'A', 'Python_Classroom': 'Clss',
'Beta': 'B', 'Robotics': 'Robo',
'TC': 'T', 'Scientific_KDE': 'SciK',
'Security': 'Sec',
'Server': 'S',
'-Workstation-': '-WS-',
} }
disc_types = { disc_types = {
'boot': 'netinst', 'boot': 'netinst',
@ -216,11 +224,11 @@ image_build = {
'kickstart': 'fedora-docker-base.ks', 'kickstart': 'fedora-docker-base.ks',
'distro': 'Fedora-22', 'distro': 'Fedora-22',
'disk_size': 5, 'disk_size': 5,
'arches': ['x86_64', 'armhfp'], 'arches': ['armhfp', 'aarch64', 'ppc64le', 's390x', 'x86_64'],
'install_tree_from': 'http://kojipkgs.fedoraproject.org/pub/fedora/linux/releases/29/Everything/$arch/os/', 'install_tree_from': 'https://kojipkgs.fedoraproject.org/compose/29/latest-Fedora-29/compose/Everything/$arch/os/',
'repo': [ 'repo': [
'http://kojipkgs.fedoraproject.org/pub/fedora/linux/updates/29/$arch/', 'https://kojipkgs.fedoraproject.org/compose/updates/f29-updates/compose/Everything/$arch/os/'
'http://kojipkgs.fedoraproject.org/pub/fedora/linux/releases/29/Everything/$arch/os/', 'https://kojipkgs.fedoraproject.org/compose/29/latest-Fedora-29/compose/Everything/$arch/os/'
], ],
'subvariant': 'Container_Base' 'subvariant': 'Container_Base'
}, },
@ -229,7 +237,6 @@ image_build = {
'docker_cmd': '[ "/bin/bash" ]', 'docker_cmd': '[ "/bin/bash" ]',
'docker_env': '[ "DISTTAG=f29container", "FGC=f29" ]', 'docker_env': '[ "DISTTAG=f29container", "FGC=f29" ]',
'docker_label': '{ "name": "fedora", "license": "MIT", "vendor": "Fedora Project", "version": "29"}', 'docker_label': '{ "name": "fedora", "license": "MIT", "vendor": "Fedora Project", "version": "29"}',
}, },
}, },
{ {
@ -239,11 +246,11 @@ image_build = {
'kickstart': 'fedora-docker-base-minimal.ks', 'kickstart': 'fedora-docker-base-minimal.ks',
'distro': 'Fedora-22', 'distro': 'Fedora-22',
'disk_size': 5, 'disk_size': 5,
'arches': ['x86_64', 'armhfp'], 'arches': ['armhfp', 'aarch64', 'ppc64le', 's390x', 'x86_64'],
'install_tree_from': 'http://kojipkgs.fedoraproject.org/pub/fedora/linux/releases/29/Everything/$arch/os/', 'install_tree_from': 'https://kojipkgs.fedoraproject.org/compose/29/latest-Fedora-29/compose/Everything/$arch/os/',
'repo': [ 'repo': [
'http://kojipkgs.fedoraproject.org/pub/fedora/linux/updates/29/$arch/', 'https://kojipkgs.fedoraproject.org/compose/updates/f29-updates/compose/Everything/$arch/os/'
'http://kojipkgs.fedoraproject.org/pub/fedora/linux/releases/29/Everything/$arch/os/', 'https://kojipkgs.fedoraproject.org/compose/29/latest-Fedora-29/compose/Everything/$arch/os/'
], ],
'subvariant': 'Container_Minimal_Base', 'subvariant': 'Container_Minimal_Base',
}, },