[releng] build-current: Put ignorelist in one line again
by Till Maas
commit bad25602c8b26ec34aef8c06d3687ceae0bdef7c
Author: Till Maas <opensource(a)till.name>
Date: Wed Mar 11 23:15:11 2015 +0100
build-current: Put ignorelist in one line again
scripts/build-current.py | 21 ++-------------------
1 files changed, 2 insertions(+), 19 deletions(-)
---
diff --git a/scripts/build-current.py b/scripts/build-current.py
index 1977ad7..9e6e90f 100755
--- a/scripts/build-current.py
+++ b/scripts/build-current.py
@@ -145,25 +145,8 @@ localkojisession.ssl_login(CLIENTCERT, CLIENTCA, SERVERCA)
tag = 'f18-rebuild'
-ignorelist = "Agda amtu aunit adobe-source-libraries acpid apmd apmud \
-athcool bunny blktap biosdevname cpuid clean cabal-dev cmospwd cmucl \
-compat-gcc-296 darktable dmidecode darcs dyninst dssi-vst efibootmgr \
-edac-utils edb fedora-ksplice frysk florist firmware-addon-dell groonga \
-ghc-aeson ghc-mwc-random gnu-efi ghc-ForSyDe ghc-Agda GtkAda gprbuild grub \
-ghdl grub2 ghc-hakyll ghc-hamlet gnatcoll gpart gprolog ghc-vector \
-ghc-hashtables ghc-parameterized-data ghc-shakespeare ghc-type-level \
-i8kutils ibmasm imvirt infiniband-diags ioport iprutils ipw2100-firmware \
-ipw2200-firmware ksplice latrace libbsr libipathverbs libseccomp librtas \
-lightning lrmi libsmbios matreshka mactel-boot memtest86+ maxima \
-microcode_ctl mkbootdisk mcelog mono-debugger msr-tools numactl numad \
-openscada openni openni-primesense openalchemist pcc perftest pesign \
-php-pecl-xhprof planets pmtools powerpc-utils powerpc-utils-papr ppc64-utils \
-ps3-utils picprog pvs-sbcl perl-threads-tbb qperf rubygem-virt-p2v s3switch \
-semantik sgabios sbcl syslinux seabios spicctrl stripesnoop spice-xpi \
-sugar-tamtam superiotool svgalib sysprof system-config-boot spice tboot tbb \
-unetbootin virt-v2v vrq wraplinux x86info xen xorg-x11-drv-openchrome \
-xorg-x11-drv-neomagic xorg-x11-drv-geode xorg-x11-drv-vmware \
-xorg-x11-drv-vmmouse xorg-x11-drv-intel yaboot zeromq-ada"
+# This list is copied from somwhere else and is therefore kept in one line
+ignorelist = "Agda amtu aunit adobe-source-libraries acpid apmd apmud athcool bunny blktap biosdevname cpuid clean cabal-dev cmospwd cmucl compat-gcc-296 darktable dmidecode darcs dyninst dssi-vst efibootmgr edac-utils edb fedora-ksplice frysk florist firmware-addon-dell groonga ghc-aeson ghc-mwc-random gnu-efi ghc-ForSyDe ghc-Agda GtkAda gprbuild grub ghdl grub2 ghc-hakyll ghc-hamlet gnatcoll gpart gprolog ghc-vector ghc-hashtables ghc-parameterized-data ghc-shakespeare ghc-type-level i8kutils ibmasm imvirt infiniband-diags ioport iprutils ipw2100-firmware ipw2200-firmware ksplice latrace libbsr libipathverbs libseccomp librtas lightning lrmi libsmbios matreshka mactel-boot memtest86+ maxima microcode_ctl mkbootdisk mcelog mono-debugger msr-tools numactl numad openscada openni openni-primesense openalchemist pcc perftest pesign php-pecl-xhprof planets pmtools powerpc-utils powerpc-utils-papr ppc64-utils ps3-utils picprog pvs-sbcl perl-threads-tbb qperf rubygem-virt-p2v s3sw
itch semantik sgabios sbcl syslinux seabios spicctrl stripesnoop spice-xpi sugar-tamtam superiotool svgalib sysprof system-config-boot spice tboot tbb unetbootin virt-v2v vrq wraplinux x86info xen xorg-x11-drv-openchrome xorg-x11-drv-neomagic xorg-x11-drv-geode xorg-x11-drv-vmware xorg-x11-drv-vmmouse xorg-x11-drv-intel yaboot zeromq-ada"
pkgs = remotekojisession.listPackages(tagID=tag, inherited=True)
9 years, 1 month
[releng] build-current: Simplify code
by Till Maas
commit f9ac92fcc9361cbf52ea9f0742835015222d797b
Author: Till Maas <opensource(a)till.name>
Date: Wed Mar 11 22:47:19 2015 +0100
build-current: Simplify code
scripts/build-current.py | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
---
diff --git a/scripts/build-current.py b/scripts/build-current.py
index 475a795..1977ad7 100755
--- a/scripts/build-current.py
+++ b/scripts/build-current.py
@@ -244,7 +244,7 @@ for pkg in pkgs:
fname)
if not os.path.isfile(fpath):
- file = grabber.urlopen(url, progress_obj=pg, text="%s" % (fname))
+ file = grabber.urlopen(url, progress_obj=pg, text=fname)
out = os.open(fpath, os.O_WRONLY | os.O_CREAT | os.O_TRUNC, 0666)
try:
while 1:
9 years, 1 month
[releng] build-current: Remove unnecessary imports
by Till Maas
commit 13e67c95716b228688fcc8f73d6784398c549261
Author: Till Maas <opensource(a)till.name>
Date: Wed Mar 11 22:44:22 2015 +0100
build-current: Remove unnecessary imports
scripts/build-current.py | 2 --
1 files changed, 0 insertions(+), 2 deletions(-)
---
diff --git a/scripts/build-current.py b/scripts/build-current.py
index 82cdcc6..475a795 100755
--- a/scripts/build-current.py
+++ b/scripts/build-current.py
@@ -9,12 +9,10 @@ import koji
import logging
import urlgrabber.grabber as grabber
import urlgrabber.progress as progress
-import urllib2
import time
import random
import string
import rpm
-import shutil
import operator
LOCALKOJIHUB = 'http://arm.koji.fedoraproject.org/kojihub'
9 years, 1 month
[releng] releng: Make build-current.py pep8 compliant
by Till Maas
commit e3e5267e67e6243ed4a084f7a87df69ae9bb797c
Author: Iulia Manda <iulia.manda21(a)gmail.com>
Date: Tue Mar 10 15:35:46 2015 +0200
releng: Make build-current.py pep8 compliant
Solve pep8 warnings on build-current.py script.
Also, the script was run after the changes were applied and it works.
Signed-off-by: Iulia Manda <iulia.manda21(a)gmail.com>
scripts/build-current.py | 122 +++++++++++++++++++++++++++++----------------
1 files changed, 78 insertions(+), 44 deletions(-)
---
diff --git a/scripts/build-current.py b/scripts/build-current.py
old mode 100644
new mode 100755
index 800ec71..82cdcc6
--- a/scripts/build-current.py
+++ b/scripts/build-current.py
@@ -13,7 +13,7 @@ import urllib2
import time
import random
import string
-import rpm
+import rpm
import shutil
import operator
@@ -32,52 +32,59 @@ loglevel = logging.DEBUG
logging.basicConfig(format='%(levelname)s: %(message)s',
level=loglevel)
+
def _unique_path(prefix):
"""Create a unique path fragment by appending a path component
- to prefix. The path component will consist of a string of letter and numbers
- that is unlikely to be a duplicate, but is not guaranteed to be unique."""
+ to prefix. The path component will consist of a string of letter and
+ numbers that is unlikely to be a duplicate, but is not guaranteed to be
+ unique."""
# Use time() in the dirname to provide a little more information when
# browsing the filesystem.
# For some reason repr(time.time()) includes 4 or 5
# more digits of precision than str(time.time())
return '%s/%r.%s' % (prefix, time.time(),
- ''.join([random.choice(string.ascii_letters) for i in range(8)]))
+ ''.join([random.choice(string.ascii_letters)
+ for i in range(8)]))
+
-def _rpmvercmp ((e1, v1, r1), (e2, v2, r2)):
+def _rpmvercmp((e1, v1, r1), (e2, v2, r2)):
"""find out which build is newer"""
rc = rpm.labelCompare((e1, v1, r1), (e2, v2, r2))
if rc == 1:
- #first evr wins
+ # first evr wins
return 1
elif rc == 0:
- #same evr
+ # same evr
return 0
else:
- #second evr wins
+ # second evr wins
return -1
+
def isNoarch(rpms):
if not rpms:
return False
noarch = False
for rpminfo in rpms:
if rpminfo['arch'] == 'noarch':
- #note that we've seen a noarch rpm
+ # note that we've seen a noarch rpm
noarch = True
elif rpminfo['arch'] != 'src':
return False
return noarch
+
def tagSuccessful(nvr, tag):
"""tag completed builds into final tags"""
localkojisession.tagBuildBypass(tag, nvr)
print "tagged %s to %s" % (nvr, tag)
+
def _downloadURL(url, destf):
"""Download a url and save it to a file"""
- file = grabber.urlopen(url, progress_obj = pg, text = "%s" % (destf))
+ file = grabber.urlopen(url, progress_obj=pg, text="%s" % (destf))
- out = os.open(destf, os.O_WRONLY|os.O_CREAT|os.O_TRUNC, 0666)
+ out = os.open(destf, os.O_WRONLY | os.O_CREAT | os.O_TRUNC, 0666)
try:
while 1:
buf = file.read(4096)
@@ -88,24 +95,27 @@ def _downloadURL(url, destf):
os.close(out)
file.close()
+
def _importURL(url, fn):
"""Import an rpm directly from a url"""
serverdir = _unique_path('build-recent')
- #TODO - would be possible, using uploadFile directly, to upload without writing locally.
- #for now, though, just use uploadWrapper
+ # TODO - would be possible, using uploadFile directly, to upload without
+ # writing locally.
+ # for now, though, just use uploadWrapper
koji.ensuredir(workpath)
dst = "%s/%s" % (workpath, fn)
print "Downloading %s to %s..." % (url, dst)
_downloadURL(url, dst)
- #fsrc = urllib2.urlopen(url)
- #fdst = file(dst, 'w')
- #shutil.copyfileobj(fsrc, fdst)
- #fsrc.close()
- #fdst.close()
+ # fsrc = urllib2.urlopen(url)
+ # fdst = file(dst, 'w')
+ # shutil.copyfileobj(fsrc, fdst)
+ # fsrc.close()
+ # fdst.close()
print "Uploading %s..." % dst
localkojisession.uploadWrapper(dst, serverdir, blocksize=65536)
localkojisession.importRPM(serverdir, fn)
+
def importBuild(build, rpms, buildinfo, tag=None):
'''import a build from remote hub'''
for rpminfo in rpms:
@@ -118,7 +128,7 @@ def importBuild(build, rpms, buildinfo, tag=None):
_importURL(url, fname)
for rpminfo in rpms:
if rpminfo['arch'] == 'src':
- #already imported above
+ # already imported above
continue
relpath = pathinfo.rpm(rpminfo)
url = "%s/%s" % (build_url, relpath)
@@ -137,7 +147,25 @@ localkojisession.ssl_login(CLIENTCERT, CLIENTCA, SERVERCA)
tag = 'f18-rebuild'
-ignorelist="Agda amtu aunit adobe-source-libraries acpid apmd apmud athcool bunny blktap biosdevname cpuid clean cabal-dev cmospwd cmucl compat-gcc-296 darktable dmidecode darcs dyninst dssi-vst efibootmgr edac-utils edb fedora-ksplice frysk florist firmware-addon-dell groonga ghc-aeson ghc-mwc-random gnu-efi ghc-ForSyDe ghc-Agda GtkAda gprbuild grub ghdl grub2 ghc-hakyll ghc-hamlet gnatcoll gpart gprolog ghc-vector ghc-hashtables ghc-parameterized-data ghc-shakespeare ghc-type-level i8kutils ibmasm imvirt infiniband-diags ioport iprutils ipw2100-firmware ipw2200-firmware ksplice latrace libbsr libipathverbs libseccomp librtas lightning lrmi libsmbios matreshka mactel-boot memtest86+ maxima microcode_ctl mkbootdisk mcelog mono-debugger msr-tools numactl numad openscada openni openni-primesense openalchemist pcc perftest pesign php-pecl-xhprof planets pmtools powerpc-utils powerpc-utils-papr ppc64-utils ps3-utils picprog pvs-sbcl perl-threads-tbb qperf rubygem-virt-p2v s3swit
ch semantik sgabios sbcl syslinux seabios spicctrl stripesnoop spice-xpi sugar-tamtam superiotool svgalib sysprof system-config-boot spice tboot tbb unetbootin virt-v2v vrq wraplinux x86info xen xorg-x11-drv-openchrome xorg-x11-drv-neomagic xorg-x11-drv-geode xorg-x11-drv-vmware xorg-x11-drv-vmmouse xorg-x11-drv-intel yaboot zeromq-ada"
+ignorelist = "Agda amtu aunit adobe-source-libraries acpid apmd apmud \
+athcool bunny blktap biosdevname cpuid clean cabal-dev cmospwd cmucl \
+compat-gcc-296 darktable dmidecode darcs dyninst dssi-vst efibootmgr \
+edac-utils edb fedora-ksplice frysk florist firmware-addon-dell groonga \
+ghc-aeson ghc-mwc-random gnu-efi ghc-ForSyDe ghc-Agda GtkAda gprbuild grub \
+ghdl grub2 ghc-hakyll ghc-hamlet gnatcoll gpart gprolog ghc-vector \
+ghc-hashtables ghc-parameterized-data ghc-shakespeare ghc-type-level \
+i8kutils ibmasm imvirt infiniband-diags ioport iprutils ipw2100-firmware \
+ipw2200-firmware ksplice latrace libbsr libipathverbs libseccomp librtas \
+lightning lrmi libsmbios matreshka mactel-boot memtest86+ maxima \
+microcode_ctl mkbootdisk mcelog mono-debugger msr-tools numactl numad \
+openscada openni openni-primesense openalchemist pcc perftest pesign \
+php-pecl-xhprof planets pmtools powerpc-utils powerpc-utils-papr ppc64-utils \
+ps3-utils picprog pvs-sbcl perl-threads-tbb qperf rubygem-virt-p2v s3switch \
+semantik sgabios sbcl syslinux seabios spicctrl stripesnoop spice-xpi \
+sugar-tamtam superiotool svgalib sysprof system-config-boot spice tboot tbb \
+unetbootin virt-v2v vrq wraplinux x86info xen xorg-x11-drv-openchrome \
+xorg-x11-drv-neomagic xorg-x11-drv-geode xorg-x11-drv-vmware \
+xorg-x11-drv-vmmouse xorg-x11-drv-intel yaboot zeromq-ada"
pkgs = remotekojisession.listPackages(tagID=tag, inherited=True)
@@ -156,43 +184,50 @@ for pkg in pkgs:
if pkg['blocked']:
logging.debug("Blocked pkg: %s" % pkg['package_name'])
continue
- pkginfo = remotekojisession.listTagged(tag, inherit=False, package=pkg['package_name'])
+ pkginfo = remotekojisession.listTagged(tag, inherit=False,
+ package=pkg['package_name'])
pkgindex = 0
if len(pkginfo) > pkgindex:
logging.info("got build %s" % pkginfo[pkgindex]['nvr'])
- elif len(pkginfo)==1:
+ elif len(pkginfo) == 1:
pkgindex = 0
logging.info("no previous build for %s" % pkg['package_name'])
logging.info("reverting to current %s" % pkginfo[pkgindex]['nvr'])
else:
- # We apparently have 0 builds for this package!
- logging.info("no builds for %s - skipping" % pkg['package_name'])
- continue
+ # We apparently have 0 builds for this package!
+ logging.info("no builds for %s - skipping" % pkg['package_name'])
+ continue
nvr = pkginfo[pkgindex]['nvr']
name = pkginfo[pkgindex]['package_name']
epoch = pkginfo[pkgindex]['epoch']
version = pkginfo[pkgindex]['version']
- release = pkginfo[pkgindex]['release']
+ release = pkginfo[pkgindex]['release']
build_id = pkginfo[pkgindex]['build_id']
task_id = pkginfo[pkgindex]['task_id']
-
# check if we have the nvr built or not
localBuild = localkojisession.getBuild(nvr)
- # if we have never built the nvr on our target hub localBuild is None localLatestBuild wil be empty as well if we have never built it
- # in which case we have nothing to compare and we need to build it
- localLatestBuild = localkojisession.getLatestBuilds(tag, package=str(pkg['package_name']))
- if not localBuild == None and not localLatestBuild == []:
+ # if we have never built the nvr on our target hub localBuild is None
+ # localLatestBuild wil be empty as well if we have never built it in which
+ # case we have nothing to compare and we need to build it
+ pkg_name = str(pkg['package_name'])
+ localLatestBuild = localkojisession.getLatestBuilds(tag, package=pkg_name)
+
+ if localBuild is not None and not localLatestBuild == []:
if localBuild['state'] == 1:
logging.debug("Local Complete Build: %s" % nvr)
continue
else:
parentevr = (str(epoch), version, release)
- latestevr = (str(localLatestBuild[0]['epoch']), localLatestBuild[0]['version'], localLatestBuild[0]['release'])
- newestRPM = _rpmvercmp( parentevr, latestevr)
- logging.debug("remote evr: %s \nlocal evr: %s \nResult: %s" % (parentevr, latestevr, newestRPM))
+ latestevr = (str(localLatestBuild[0]['epoch']),
+ localLatestBuild[0]['version'],
+ localLatestBuild[0]['release'])
+ newestRPM = _rpmvercmp(parentevr, latestevr)
+ logging.debug("remote evr: %s \nlocal evr: %s \nResult: %s",
+ parentevr, latestevr, newestRPM)
if newestRPM == -1:
- logging.info("Newer locally: %s locally is newer than remote" % (latestevr,))
+ logging.info("Newer locally: %s locally is newer than remote"
+ % (latestevr,))
continue
if newestRPM == 0:
logging.info("Already Built: %s " % (latestevr,))
@@ -203,16 +238,16 @@ for pkg in pkgs:
importBuild(nvr, rpms, buildinfo, tag=tag)
continue
request = remotekojisession.getTaskRequest(task_id)
- #localkojisession.build(request[0], request[1], opts=None, priority=2)
-
- fname = "%s.src.rpm" % nvr
- fpath = "%s/%s.src.rpm" % (workpath, nvr)
- url = "%s/packages/%s/%s/%s/src/%s" % (PACKAGEURL, name, version, release, fname)
+ # localkojisession.build(request[0], request[1], opts=None, priority=2)
+ fname = "%s.src.rpm" % nvr
+ fpath = "%s/%s.src.rpm" % (workpath, nvr)
+ url = "%s/packages/%s/%s/%s/src/%s" % (PACKAGEURL, name, version, release,
+ fname)
if not os.path.isfile(fpath):
- file = grabber.urlopen(url, progress_obj = pg, text = "%s" % (fname))
- out = os.open(fpath, os.O_WRONLY|os.O_CREAT|os.O_TRUNC, 0666)
+ file = grabber.urlopen(url, progress_obj=pg, text="%s" % (fname))
+ out = os.open(fpath, os.O_WRONLY | os.O_CREAT | os.O_TRUNC, 0666)
try:
while 1:
buf = file.read(4096)
@@ -222,7 +257,7 @@ for pkg in pkgs:
finally:
os.close(out)
file.close()
-
+
serverdir = _unique_path('cli-build')
localkojisession.uploadWrapper(fpath, serverdir, blocksize=65536)
source = "%s/%s" % (serverdir, fname)
@@ -239,4 +274,3 @@ for pkg in pkgs:
localkojisession.build(source, target, opts=None, priority=2)
logging.info("submitted build: %s" % nvr)
-
9 years, 1 month
Introduction
by Nathan Sosnovske
Hi All,
My name is Nathan Sosnovske and I am looking to get involved with the Release Engineering group. I live on the West Coast of the US (Pacific Time).
In the past I have been a Sysadmin at a medium-sized university and now work as a Build/Release Engineer in the Seattle area. I have configuration management experience, as well as programming experience in C++, C#, and Python. I’m currently also working on an online B.S. In CompSci from Oregon State University.
I want to join to give back to a distro that I regularly find myself using both at home and at work. I’ve talked to a couple of people on IRC and it sounds like a good starting place would be looking at some of the python scripts and converting them from Python 2.x to Python 3.x. I’m hoping to be able to volunteer at least 2 hours of time a week.
Sorry for the long email, I hope to help out however I can!
Nathan Sosnovske
nathan(a)sosnovske.com
9 years, 1 month
#6008: Fedora 21 Alpha .composeinfo should have family=Fedora
by Fedora Release Engineering
#6008: Fedora 21 Alpha .composeinfo should have family=Fedora
----------------------+------------------------
Reporter: dcallagh | Owner: rel-eng@…
Type: defect | Status: new
Milestone: | Component: other
Keywords: | Blocked By:
Blocking: |
----------------------+------------------------
The .composeinfo file for Fedora 21 Alpha Server currently has this:
{{{
[product]
family = Fedora-Server
name = Fedora-Server-21_Alpha
version = 21_Alpha
variants = Server
}}}
For future F21 composes please update it so that the family is just
"Fedora", with "Server" as the variant like it is currently.
This is consistent with how RHEL has been doing its variant products for
many years. It also just makes more sense -- all the new Fedora variants
are in the same family, that's the whole point of that field. And it will
make our lives easier in Beaker, where we use the family to figure out
which harness builds to use and which kickstart syntax to use.
--
Ticket URL: <https://fedorahosted.org/rel-eng/ticket/6008>
Fedora Release Engineering <http://fedorahosted.org/rel-eng>
Release Engineering for the Fedora Project
9 years, 1 month
[releng] update the pungi flags for pungi 3.14
by Dennis Gilmore
commit 442a41b192af3c65713a5ae0d3542d67e1214eb6
Author: Dennis Gilmore <dennis(a)ausil.us>
Date: Tue Mar 10 22:19:50 2015 -0500
update the pungi flags for pungi 3.14
scripts/run-pungi | 12 ++++++------
1 files changed, 6 insertions(+), 6 deletions(-)
---
diff --git a/scripts/run-pungi b/scripts/run-pungi
index 11c7445..01b9b47 100755
--- a/scripts/run-pungi
+++ b/scripts/run-pungi
@@ -53,9 +53,9 @@ popd
for arch in armhfp i386 x86_64
do
mock -r fedora-branched-compose-i386 --init || exit 1
- mock -r fedora-branched-compose-i386 --shell "pungi -c $KICKSTARTS/fedora-install-workstation.ks --destdir $DESTDIR --cachedir /srv/pungi/cache/ --arch=$arch -G -C --ver $VERSION --workdirbase=/tmp/work --name Fedora-Workstation --flavor Workstation --installpkgs fedora-productimg-workstation" || exit 1
- mock -r fedora-branched-compose-i386 --shell "pungi -c $KICKSTARTS/fedora-install-server.ks --destdir $DESTDIR --cachedir /srv/pungi/cache/ --arch=$arch -G -C --ver $VERSION --workdirbase=/tmp/work --name Fedora-Server --flavor Server --installpkgs fedora-productimg-server" || exit 1
- mock -r fedora-branched-compose-i386 --shell "pungi -c $KICKSTARTS/fedora-install-cloud.ks --destdir $DESTDIR --cachedir /srv/pungi/cache/ --arch=$arch -G -C --ver $VERSION --workdirbase=/tmp/work --name Fedora-Cloud --flavor Cloud --installpkgs fedora-productimg-cloud" || exit 1
+ mock -r fedora-branched-compose-i386 --shell "pungi -c $KICKSTARTS/fedora-install-workstation.ks --destdir $DESTDIR --cachedir /srv/pungi/cache/ --arch=$arch -G -C --ver $VERSION --workdirbase=/tmp/work --family Fedora --variant Workstation --installpkgs fedora-productimg-workstation" || exit 1
+ mock -r fedora-branched-compose-i386 --shell "pungi -c $KICKSTARTS/fedora-install-server.ks --destdir $DESTDIR --cachedir /srv/pungi/cache/ --arch=$arch -G -C --ver $VERSION --workdirbase=/tmp/work --family Fedora --variant Server --installpkgs fedora-productimg-server" || exit 1
+ mock -r fedora-branched-compose-i386 --shell "pungi -c $KICKSTARTS/fedora-install-cloud.ks --destdir $DESTDIR --cachedir /srv/pungi/cache/ --arch=$arch -G -C --ver $VERSION --workdirbase=/tmp/work --family Fedora --variant Cloud --installpkgs fedora-productimg-cloud" || exit 1
mock -r fedora-branched-compose-i386 --clean || exit 1
done
@@ -76,9 +76,9 @@ do
set -x
umask 002
mock -r fedora-branched-compose-$arch --init || exit 1
- mock -r fedora-branched-compose-$arch --shell "XZ_DEFAULTS=--memlimit-compress=3700MiB pungi -c $KICKSTARTS/fedora-install-workstation.ks --destdir $DESTDIR --cachedir /srv/pungi/cache/ -B -I --no-dvd --ver $VERSION --workdirbase=/tmp/work --flavor Workstation --name=Fedora-Workstation --installpkgs fedora-productimg-workstation"
- mock -r fedora-branched-compose-$arch --shell "XZ_DEFAULTS=--memlimit-compress=3700MiB pungi -c $KICKSTARTS/fedora-install-server.ks --destdir $DESTDIR --cachedir /srv/pungi/cache/ -B -I --ver $VERSION --workdirbase=/tmp/work --flavor Server --name=Fedora-Server --installpkgs fedora-productimg-server"
- mock -r fedora-branched-compose-$arch --shell "XZ_DEFAULTS=--memlimit-compress=3700MiB pungi -c $KICKSTARTS/fedora-install-cloud.ks --destdir $DESTDIR --cachedir /srv/pungi/cache/ -B -I --no-dvd --ver $VERSION --workdirbase=/tmp/work --flavor Cloud --name=Fedora-Cloud --installpkgs fedora-productimg-cloud"
+ mock -r fedora-branched-compose-$arch --shell "XZ_DEFAULTS=--memlimit-compress=3700MiB pungi -c $KICKSTARTS/fedora-install-workstation.ks --destdir $DESTDIR --cachedir /srv/pungi/cache/ -B -I --no-dvd --ver $VERSION --workdirbase=/tmp/work --variant Workstation --family Fedora --installpkgs fedora-productimg-workstation"
+ mock -r fedora-branched-compose-$arch --shell "XZ_DEFAULTS=--memlimit-compress=3700MiB pungi -c $KICKSTARTS/fedora-install-server.ks --destdir $DESTDIR --cachedir /srv/pungi/cache/ -B -I --ver $VERSION --workdirbase=/tmp/work --variant Server --family Fedora --installpkgs fedora-productimg-server"
+ mock -r fedora-branched-compose-$arch --shell "XZ_DEFAULTS=--memlimit-compress=3700MiB pungi -c $KICKSTARTS/fedora-install-cloud.ks --destdir $DESTDIR --cachedir /srv/pungi/cache/ -B -I --no-dvd --ver $VERSION --workdirbase=/tmp/work --variant Cloud --family Fedora --installpkgs fedora-productimg-cloud"
mock -r fedora-branched-compose-$arch --clean || exit 1
sg releng "repoclosure -a $basearch --repofrompath=$arch,$DESTDIR$VERSION/Workstation/$arch/os --repoid=$arch > $DESTDIR/logs/Workstation.$arch.repoclosure.log"
sg releng "repoclosure -a $basearch --repofrompath=$arch,$DESTDIR$VERSION/Server/$arch/os --repoid=$arch > $DESTDIR/logs/Server.$arch.repoclosure.log"
9 years, 1 month
