diff --git a/fedora-cloud.conf b/fedora-cloud.conf index 120e5ea..8eecfeb 100644 --- a/fedora-cloud.conf +++ b/fedora-cloud.conf @@ -1,7 +1,7 @@ # PRODUCT INFO release_name = 'Fedora-Cloud' release_short = 'Fedora-Cloud' -release_version = '29' +release_version = '33' release_is_layered = False skip_phases = ["buildinstall", "productimg", "pkgset", "gather", "extra_files", "createrepo"] # GENERAL SETTINGS @@ -10,11 +10,11 @@ comps_file = { 'scm': 'git', 'repo': 'https://pagure.io/fedora-comps.git', 'branch': 'master', - 'file': 'comps-f29.xml', - 'command': 'make comps-f29.xml' + 'file': 'comps-f33.xml', + 'command': 'make comps-f33.xml' } variants_file='variants-fedora.xml' -sigkeys = ['429476B4'] # None = unsigned +sigkeys = ['9570FF31'] # None = unsigned # limit tree architectures # if undefined, all architectures from variants.xml will be included tree_arches = ['aarch64', 'ppc64le', 's390x', 'x86_64'] @@ -26,10 +26,10 @@ hashed_directories = True runroot = True #runroot_channel = 'fedora_compose' runroot_channel = 'compose' -runroot_tag = 'f29-build' +runroot_tag = 'f33-build' # PKGSET pkgset_source = 'koji' # koji, repos -pkgset_koji_tag = 'f29-updates' +pkgset_koji_tag = 'f33-updates' pkgset_koji_inherit = True filter_system_release_packages = False # GATHER @@ -107,7 +107,7 @@ filter_packages = [ 'generic*', 'GConf2-dbus*', 'bluez-gnome', - 'java-1.8.0-openjdk', + 'java-11-openjdk', 'community-mysql*', 'jruby*', 'gimp-help-*', @@ -118,7 +118,7 @@ filter_packages = [ multilib_blacklist = { '*': ['kernel', 'kernel-PAE*', 'kernel*debug*', 'dmraid-devel', 'kdeutils-devel', 'mkinitrd-devel', - 'php-devel', 'java-*', + 'php-devel', 'java-*', 'bash-devel', 'httpd-devel', 'tomcat-native', 'php*', 'httpd', 'krb5-server', 'krb5-server-ldap', 'mod_*', 'ghc-*', 'mp' @@ -217,19 +217,19 @@ image_build = { 'image-build': { 'format': [('qcow2','qcow2'), ('raw-xz','raw.xz')], 'name': 'Fedora-Cloud-Base', - 'target': 'f29', - 'version': '29', + 'target': 'f33', + 'version': '33', 'release': None, - 'ksurl': 'git+https://pagure.io/fedora-kickstarts.git?#origin/f29', + 'ksurl': 'git+https://pagure.io/fedora-kickstarts.git?#origin/f33', 'kickstart': 'fedora-cloud-base.ks', 'distro': 'Fedora-22', 'disk_size': 4, 'arches': ['aarch64', 'ppc64le', 's390x', 'x86_64'], 'repo': [ - '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/' + 'https://kojipkgs.fedoraproject.org/compose/updates/f33-updates/compose/Everything/$arch/os/' + 'https://kojipkgs.fedoraproject.org/compose/33/latest-Fedora-33/compose/Everything/$arch/os/' ], - 'install_tree_from': 'https://kojipkgs.fedoraproject.org/compose/29/latest-Fedora-29/compose/Everything/$arch/os/', + 'install_tree_from': 'https://kojipkgs.fedoraproject.org/compose/33/latest-Fedora-33/compose/Everything/$arch/os/', 'subvariant': 'Cloud_Base' } }, @@ -237,19 +237,19 @@ image_build = { 'image-build': { 'format': [('vagrant-libvirt','vagrant-libvirt.box'), ('vagrant-virtualbox','vagrant-virtualbox.box')] 'name': 'Fedora-Cloud-Base-Vagrant', - 'target': 'f29', - 'version': '29', + 'target': 'f33', + 'version': '33', 'release': None, - 'ksurl': 'git+https://pagure.io/fedora-kickstarts.git?#origin/f29', + 'ksurl': 'git+https://pagure.io/fedora-kickstarts.git?#origin/f33', 'kickstart': 'fedora-cloud-base-vagrant.ks', 'distro': 'Fedora-22', 'disk_size': 40, 'arches': ['x86_64'], 'repo': [ - '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/' + 'https://kojipkgs.fedoraproject.org/compose/updates/f33-updates/compose/Everything/$arch/os/' + 'https://kojipkgs.fedoraproject.org/compose/33/latest-Fedora-33/compose/Everything/$arch/os/' ], - 'install_tree_from': 'https://kojipkgs.fedoraproject.org/compose/29/latest-Fedora-29/compose/Everything/$arch/os/', + 'install_tree_from': 'https://kojipkgs.fedoraproject.org/compose/33/latest-Fedora-33/compose/Everything/$arch/os/', 'subvariant': 'Cloud_Base', } }, diff --git a/fedora-container.conf b/fedora-container.conf index 7ad1dae..2ec9ce8 100644 --- a/fedora-container.conf +++ b/fedora-container.conf @@ -1,7 +1,7 @@ # PRODUCT INFO release_name = 'Fedora-Container' release_short = 'Fedora-Container' -release_version = '29' +release_version = '33' release_is_layered = False skip_phases = ["buildinstall", "productimg", "pkgset", "gather", "extra_files", "createrepo"] # GENERAL SETTINGS @@ -10,11 +10,11 @@ comps_file = { 'scm': 'git', 'repo': 'https://pagure.io/fedora-comps.git', 'branch': 'master', - 'file': 'comps-f29.xml', - 'command': 'make comps-f29.xml' + 'file': 'comps-f33.xml', + 'command': 'make comps-f33.xml' } variants_file='variants-fedora.xml' -sigkeys = ['429476B4'] # None = unsigned +sigkeys = ['9570FF31'] # None = unsigned # limit tree architectures # if undefined, all architectures from variants.xml will be included tree_arches = ['armhfp', 'aarch64', 'ppc64le', 's390x', 'x86_64'] @@ -26,10 +26,10 @@ hashed_directories = True runroot = True #runroot_channel = 'fedora_compose' runroot_channel = 'compose' -runroot_tag = 'f29-build' +runroot_tag = 'f33-build' # PKGSET pkgset_source = 'koji' # koji, repos -pkgset_koji_tag = 'f29-updates' +pkgset_koji_tag = 'f33-updates' pkgset_koji_inherit = True filter_system_release_packages = False # GATHER @@ -107,7 +107,7 @@ filter_packages = [ 'generic*', 'GConf2-dbus*', 'bluez-gnome', - 'java-1.8.0-openjdk', + 'java-11-openjdk', 'community-mysql*', 'jruby*', 'gimp-help-*', @@ -118,7 +118,7 @@ filter_packages = [ multilib_blacklist = { '*': ['kernel', 'kernel-PAE*', 'kernel*debug*', 'dmraid-devel', 'kdeutils-devel', 'mkinitrd-devel', - 'php-devel', 'java-*', + 'php-devel', 'java-*', 'bash-devel', 'httpd-devel', 'tomcat-native', 'php*', 'httpd', 'krb5-server', 'krb5-server-ldap', 'mod_*', 'ghc-*', 'mp' @@ -132,7 +132,7 @@ multilib_whitelist = { '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'. + 'mariadb-connector-odbc', 'compiler-rt', 'nvidia-query-resource-opengl-lib', 'ibus-libs', 'ibus-gtk2', 'ibus-gtk3', 'glib-networking', 'dssi-vst-wine' @@ -213,10 +213,10 @@ translate_paths = [ ] # These will be inherited by live_media, live_images and image_build -global_ksurl = 'git+https://pagure.io/fedora-kickstarts.git?#origin/f29' +global_ksurl = 'git+https://pagure.io/fedora-kickstarts.git?#origin/f33' global_release = '!RELEASE_FROM_LABEL_DATE_TYPE_RESPIN' -global_version = '29' -global_target = 'f29' +global_version = '33' +global_target = 'f33' image_build = { '^Container$': [ @@ -228,18 +228,18 @@ image_build = { 'distro': 'Fedora-22', 'disk_size': 5, 'arches': ['armhfp', 'aarch64', 'ppc64le', 's390x', 'x86_64'], - 'install_tree_from': 'https://kojipkgs.fedoraproject.org/compose/29/latest-Fedora-29/compose/Everything/$arch/os/', + 'install_tree_from': 'https://kojipkgs.fedoraproject.org/compose/33/latest-Fedora-33/compose/Everything/$arch/os/', 'repo': [ - '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/' + 'https://kojipkgs.fedoraproject.org/compose/updates/f33-updates/compose/Everything/$arch/os/' + 'https://kojipkgs.fedoraproject.org/compose/33/latest-Fedora-33/compose/Everything/$arch/os/' ], 'subvariant': 'Container_Base' }, 'factory-parameters': { 'dockerversion': "1.10.1", 'docker_cmd': '[ "/bin/bash" ]', - 'docker_env': '[ "DISTTAG=f29container", "FGC=f29", "container=oci" ]', - 'docker_label': '{ "name": "fedora", "license": "MIT", "vendor": "Fedora Project", "version": "29"}', + 'docker_env': '[ "DISTTAG=f33container", "FGC=f33", "container=oci" ]', + 'docker_label': '{ "name": "fedora", "license": "MIT", "vendor": "Fedora Project", "version": "33"}', }, }, { @@ -250,18 +250,18 @@ image_build = { 'distro': 'Fedora-22', 'disk_size': 5, 'arches': ['armhfp', 'aarch64', 'ppc64le', 's390x', 'x86_64'], - 'install_tree_from': 'https://kojipkgs.fedoraproject.org/compose/29/latest-Fedora-29/compose/Everything/$arch/os/', + 'install_tree_from': 'https://kojipkgs.fedoraproject.org/compose/33/latest-Fedora-33/compose/Everything/$arch/os/', 'repo': [ - '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/' + 'https://kojipkgs.fedoraproject.org/compose/updates/f33-updates/compose/Everything/$arch/os/' + 'https://kojipkgs.fedoraproject.org/compose/33/latest-Fedora-33/compose/Everything/$arch/os/' ], 'subvariant': 'Container_Minimal_Base', }, 'factory-parameters': { 'dockerversion': "1.10.1", 'docker_cmd': '[ "/bin/bash" ]', - 'docker_env': '[ "DISTTAG=f29container", "FGC=f29", "container=oci" ]', - 'docker_label': '{ "name": "fedora", "license": "MIT", "vendor": "Fedora Project", "version": "29"}', + 'docker_env': '[ "DISTTAG=f33container", "FGC=f33", "container=oci" ]', + 'docker_label': '{ "name": "fedora", "license": "MIT", "vendor": "Fedora Project", "version": "33"}', }, } ], diff --git a/fedora.conf b/fedora.conf index dbd0757..bc48781 100644 --- a/fedora.conf +++ b/fedora.conf @@ -1,20 +1,20 @@ # PRODUCT INFO release_name = 'Fedora' release_short = 'Fedora' -release_version = 'Rawhide' +release_version = '33' # GENERAL SETTINGS comps_file = { 'scm': 'git', 'repo': 'https://pagure.io/fedora-comps.git', 'branch': 'master', - 'file': 'comps-rawhide.xml', - 'command': 'make comps-rawhide.xml' + 'file': 'comps-f33.xml', + 'command': 'make comps-f33.xml' } module_defaults_dir = { 'scm': 'git', 'repo': 'https://pagure.io/releng/fedora-module-defaults.git', - 'branch': 'master', + 'branch': 'f33', 'dir': '.' } @@ -75,7 +75,7 @@ repoclosure_backend = 'dnf' createrepo_deltas = False createrepo_database = True createrepo_use_xz = True -createrepo_extra_args = ['--zck', '--zck-dict-dir=/usr/share/fedora-repo-zdicts/rawhide'] +createrepo_extra_args = ['--zck', '--zck-dict-dir=/usr/share/fedora-repo-zdicts/%s' % pkgset_koji_tag] createrepo_num_workers = 10 # CHECKSUMS @@ -290,9 +290,9 @@ translate_paths = [ ] # These will be inherited by live_media, live_images and image_build -global_ksurl = 'git+https://pagure.io/fedora-kickstarts.git?#HEAD' +global_ksurl = 'git+https://pagure.io/fedora-kickstarts.git?origin/f33' global_release = '!RELEASE_FROM_LABEL_DATE_TYPE_RESPIN' -global_version = 'Rawhide' +global_version = '33' # live_images ignores this in favor of live_target global_target = 'f33' @@ -743,11 +743,11 @@ ostree = { "force_new_commit": True, "treefile": "fedora-silverblue.yaml", "config_url": "https://pagure.io/workstation-ostree-config.git", - "config_branch": "master", + "config_branch": "f33", "repo": "Everything", "tag_ref": False, "ostree_repo": "/mnt/koji/compose/ostree/repo/", - "ostree_ref": "fedora/rawhide/${basearch}/silverblue", + "ostree_ref": "fedora/33/${basearch}/silverblue", "arches": ["x86_64", "ppc64le", "aarch64"], "failable": ['*'], } @@ -768,8 +768,8 @@ ostree_installer = [ "ostree_osname=fedora", "ostree_oskey=fedora-33-primary", "ostree_contenturl=mirrorlist=https://ostree.fedoraproject.org/mirrorlist", - "ostree_install_ref=fedora/rawhide/x86_64/silverblue", - "ostree_update_ref=fedora/rawhide/x86_64/silverblue", + "ostree_install_ref=fedora/33/x86_64/silverblue", + "ostree_update_ref=fedora/33/x86_64/silverblue", "flatpak_remote_name=fedora", # using registry-no-cdn avoids redirects to the CDN; # needed because of network restrictions on koji runroot @@ -777,7 +777,7 @@ ostree_installer = [ "flatpak_remote_refs=runtime/org.fedoraproject.Platform/x86_64/f32 app/org.gnome.Baobab/x86_64/stable app/org.gnome.Calculator/x86_64/stable app/org.gnome.Calendar/x86_64/stable app/org.gnome.Characters/x86_64/stable app/org.gnome.clocks/x86_64/stable app/org.gnome.Contacts/x86_64/stable app/org.gnome.eog/x86_64/stable app/org.gnome.Evince/x86_64/stable app/org.gnome.FileRoller/x86_64/stable app/org.gnome.font-viewer/x86_64/stable app/org.gnome.gedit/x86_64/stable app/org.gnome.Logs/x86_64/stable app/org.gnome.NautilusPreviewer/x86_64/stable app/org.gnome.Maps/x86_64/stable app/org.gnome.Screenshot/x86_64/stable app/org.gnome.Weather/x86_64/stable", ], 'template_repo': 'https://pagure.io/fedora-lorax-templates.git', - 'template_branch': 'master', + 'template_branch': 'f33', # dbus-run-session is needed for Flatpak to talk to flatpak-oci-authenticator 'extra_runroot_pkgs': ['flatpak', 'dbus-daemon'], 'failable': ['*'], @@ -794,8 +794,8 @@ ostree_installer = [ "ostree_osname=fedora", "ostree_oskey=fedora-33-primary", "ostree_contenturl=mirrorlist=https://ostree.fedoraproject.org/mirrorlist", - "ostree_install_ref=fedora/rawhide/ppc64le/silverblue", - "ostree_update_ref=fedora/rawhide/ppc64le/silverblue", + "ostree_install_ref=fedora/33/ppc64le/silverblue", + "ostree_update_ref=fedora/33/ppc64le/silverblue", "flatpak_remote_name=fedora", # using registry-no-cdn avoids redirects to the CDN; # needed because of network restrictions on koji runroot @@ -803,7 +803,7 @@ ostree_installer = [ "flatpak_remote_refs=", ], 'template_repo': 'https://pagure.io/fedora-lorax-templates.git', - 'template_branch': 'master', + 'template_branch': 'f33', # dbus-run-session is needed for Flatpak to talk to flatpak-oci-authenticator 'extra_runroot_pkgs': ['flatpak', 'dbus-daemon'], 'failable': ['*'], @@ -820,8 +820,8 @@ ostree_installer = [ "ostree_osname=fedora", "ostree_oskey=fedora-33-primary", "ostree_contenturl=mirrorlist=https://ostree.fedoraproject.org/mirrorlist", - "ostree_install_ref=fedora/rawhide/aarch64/silverblue", - "ostree_update_ref=fedora/rawhide/aarch64/silverblue", + "ostree_install_ref=fedora/f33/aarch64/silverblue", + "ostree_update_ref=fedora/f33/aarch64/silverblue", "flatpak_remote_name=fedora", # using registry-no-cdn avoids redirects to the CDN; # needed because of network restrictions on koji runroot @@ -829,7 +829,7 @@ ostree_installer = [ "flatpak_remote_refs=", ], 'template_repo': 'https://pagure.io/fedora-lorax-templates.git', - 'template_branch': 'master', + 'template_branch': 'f33', # dbus-run-session is needed for Flatpak to talk to flatpak-oci-authenticator 'extra_runroot_pkgs': ['flatpak', 'dbus-daemon'], 'failable': ['*'], diff --git a/nightly.sh b/nightly.sh index eeb1a94..c79536b 100755 --- a/nightly.sh +++ b/nightly.sh @@ -4,16 +4,16 @@ export LC_ALL=C CONFIG="fedora.conf" -TARGET_DIR="/mnt/koji/compose/rawhide" +TARGET_DIR="/mnt/koji/compose/branched" #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" -RELEASE="rawhide" -RELEASE_TITLE="Rawhide" -COMPSFILE="comps-rawhide.xml" +RELEASE="33" +RELEASE_TITLE="33" +COMPSFILE="comps-f33.xml" TMPDIR=`mktemp -d /tmp/$RELEASE.$DATE.XXXX` TOMAIL="devel@lists.fedoraproject.org test@lists.fedoraproject.org" FROM="Fedora Rawhide Report " @@ -111,7 +111,7 @@ fi ./releng/scripts/spam-o-matic --nomail --treename="$TREENAME" "$DESTDIR/compose/Everything/" --only-arches ppc64le s390x x86_64> "$DESTDIR/logs/depcheck" [ -z "$ARCH" ] && { -./releng/scripts/critpath.py --url file://$DESTDIR/compose/Everything/ -o $DESTDIR/logs/critpath.txt rawhide &> $DESTDIR/logs/critpath.log +./releng/scripts/critpath.py --url file://$DESTDIR/compose/Everything/ -o $DESTDIR/logs/critpath.txt branched &> $DESTDIR/logs/critpath.log } # Tell interested persons that the rsync is starting (zomg!) @@ -192,7 +192,7 @@ $RSYNCPREFIX ./releng/scripts/build_composeinfo "$RSYNCSECTARGET/" --name "$NEWC old_umask=$(umask) umask 0002 for arch in x86_64 ppc64le aarch64; do - ref="fedora/rawhide/${arch}/silverblue" + ref="fedora/33/${arch}/silverblue" if ! ostree --repo=$OSTREESRCREPO rev-parse "${ref}"; then continue; fi ostree pull-local --repo=$OSTREEDESTREPO $OSTREESRCREPO --depth=-1 "${ref}"