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

rawhide: fix bogus f29 config for f35

Browse Source 
Signed-off-by: Kevin Fenzi <kevin@scrye.com>
This commit is contained in:
Kevin Fenzi 2021-05-02 10:14:21 -07:00
parent 07ec618db7
commit 2cb59bab0a
3 changed files with 23 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
cloud-nightly.sh
View File

@ -13,9 +13,9 @@ 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="29" RELEASE="35"
RELEASE_TITLE="29" RELEASE_TITLE="35"
COMPSFILE="comps-f29.xml" COMPSFILE="comps-f35.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>"

6
container-nightly.sh
View File

@ -12,9 +12,9 @@ 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-Docker" SHORT="Fedora-Docker"
RELEASE="29" RELEASE="35"
RELEASE_TITLE="29" RELEASE_TITLE="35"
COMPSFILE="comps-f29.xml" COMPSFILE="comps-f35.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>"

34
fedora-cloud.conf
View File

@ -1,7 +1,7 @@
# PRODUCT INFO # PRODUCT INFO
release_name = 'Fedora-Cloud' release_name = 'Fedora-Cloud'
release_short = 'Fedora-Cloud' release_short = 'Fedora-Cloud'
release_version = '29' release_version = '35'
release_is_layered = False release_is_layered = False
skip_phases = ["buildinstall", "productimg", "pkgset", "gather", "extra_files", "createrepo"] skip_phases = ["buildinstall", "productimg", "pkgset", "gather", "extra_files", "createrepo"]
# GENERAL SETTINGS # GENERAL SETTINGS
@ -10,8 +10,8 @@ comps_file = {
'scm': 'git', 'scm': 'git',
'repo': 'https://pagure.io/fedora-comps.git', 'repo': 'https://pagure.io/fedora-comps.git',
'branch': 'master', 'branch': 'master',
'file': 'comps-f29.xml', 'file': 'comps-f35.xml',
'command': 'make comps-f29.xml' 'command': 'make comps-f35.xml'
} }
variants_file='variants-fedora.xml' variants_file='variants-fedora.xml'
sigkeys = ['429476B4'] # None = unsigned sigkeys = ['429476B4'] # None = unsigned
@ -26,10 +26,10 @@ hashed_directories = True
runroot = True runroot = True
#runroot_channel = 'fedora_compose' #runroot_channel = 'fedora_compose'
runroot_channel = 'compose' runroot_channel = 'compose'
runroot_tag = 'f29-build' runroot_tag = 'f35-build'
# PKGSET # PKGSET
pkgset_source = 'koji' # koji, repos pkgset_source = 'koji' # koji, repos
pkgset_koji_tag = 'f29-updates' pkgset_koji_tag = 'f35-updates'
pkgset_koji_inherit = True pkgset_koji_inherit = True
filter_system_release_packages = False filter_system_release_packages = False
# GATHER # GATHER
@ -217,19 +217,19 @@ image_build = {
'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': 'f29', 'target': 'f35',
'version': '29', 'version': '35',
'release': None, 'release': None,
'ksurl': 'git+https://pagure.io/fedora-kickstarts.git?#origin/f29', 'ksurl': 'git+https://pagure.io/fedora-kickstarts.git?#origin/f35',
'kickstart': 'fedora-cloud-base.ks', 'kickstart': 'fedora-cloud-base.ks',
'distro': 'Fedora-22', 'distro': 'Fedora-22',
'disk_size': 4, 'disk_size': 4,
'arches': ['aarch64', 'ppc64le', 's390x', 'x86_64'], 'arches': ['aarch64', 'ppc64le', 's390x', 'x86_64'],
'repo': [ 'repo': [
'https://kojipkgs.fedoraproject.org/compose/updates/f29-updates/compose/Everything/$arch/os/' 'https://kojipkgs.fedoraproject.org/compose/updates/f35-updates/compose/Everything/$arch/os/'
'https://kojipkgs.fedoraproject.org/compose/29/latest-Fedora-29/compose/Everything/$arch/os/' 'https://kojipkgs.fedoraproject.org/compose/35/latest-Fedora-35/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/35/latest-Fedora-35/compose/Everything/$arch/os/',
'subvariant': 'Cloud_Base' 'subvariant': 'Cloud_Base'
} }
}, },
@ -237,19 +237,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': 'f29', 'target': 'f35',
'version': '29', 'version': '35',
'release': None, 'release': None,
'ksurl': 'git+https://pagure.io/fedora-kickstarts.git?#origin/f29', 'ksurl': 'git+https://pagure.io/fedora-kickstarts.git?#origin/f35',
'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': [
'https://kojipkgs.fedoraproject.org/compose/updates/f29-updates/compose/Everything/$arch/os/' 'https://kojipkgs.fedoraproject.org/compose/updates/f35-updates/compose/Everything/$arch/os/'
'https://kojipkgs.fedoraproject.org/compose/29/latest-Fedora-29/compose/Everything/$arch/os/' 'https://kojipkgs.fedoraproject.org/compose/35/latest-Fedora-35/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/35/latest-Fedora-35/compose/Everything/$arch/os/',
'subvariant': 'Cloud_Base', 'subvariant': 'Cloud_Base',
} }
}, },