-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
Hi All,
Yesterday I made a bunch of changes to enable building and shipping
epel7 beta, due to time zone differences and no one being around on
sunday night in the US i made the changes to get things working but was
unable to ask for approvals.
Attached is all the patches I applied.
allong with on in the private repo adjusting sudoers to allow the beta
contents to be synced out
Dennis
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.22 (GNU/Linux)
iQIcBAEBAgAGBQJSr78gAAoJEH7ltONmPFDRHrEP/1rAeH+pnxCTPk+ffmMO8xrp
3IsEOFoscsBOageWh0gu+7cLe5eUEZ/iCBqklrW3d5A4qV7jYtDZviKNeXmJeKuT
BVsiN3gs33t6eIfLXJ+xX4eSFhRd6KcSle2jcy9TgMLyqtuqnbQEYz9XlVXw2i78
5ZPQK4X46hAQfHQJOUx3YmRAVLcdSYxIcMOT7VAdp8kU1DjcsFWOM6pMe3AKHQ+b
GOXxAgsbbAe5bP2OZRYSvTYCjohZzO49CVOl51b4ba2FcEVrI9ENkgsVgZ0zzl2z
d08KNMzF1o5ycgxuWiGgKtJqLmLvK5t1HG/9j9ngZ4vTZTmWEO59moAWVNkH04oR
KeqPlVusfEu+TsyqPekb4TTKVzEUVQDfVN15Oh/F6HS8Uv/MxBMhjSccdUvr5Qe8
10uqVfpwfxlGGbr+KhBpSJ1kppvM5bUl9sAJJ+VGgzIG89pFkEc+GCYrhPE/yqZT
ygKWQXt7K/9LAW2q1mfvkvizhZtflJzM5yc3Yu6YoJ9vbmuRpX4tJrdcZSsT7R7b
+OuoKSL9ZFg+OcP/jSJWCj59cetT+Vu/I/xJDjU4Ml4jcBgBkxNLPBJpj8wcevZS
OFW2Ff2LQqMqSQ1NgxSXmZBTBmLmXpgf8ThOks1yMK+XywtFrM1EKcjJxdJfiM/X
zbO7Hj3iJVeDdZkCM+/G
=NeFF
-----END PGP SIGNATURE-----
From f86b6a64f6b25fae9cfdea683437c99461953e55 Mon Sep 17 00:00:00 2001
From: Dennis Gilmore <ausil@xxxxxxxxxxxxxxxxx>
Date: Sun, 15 Dec 2013 22:44:05 +0000
Subject: [PATCH 01/13] setup things for epel7
---
manifests/services/koji.pp | 13 ++++++++++++-
modules/gitolite/files/distgit/genacls.pkgdb | 2 +-
modules/gitolite/files/distgit/pkgdb2branch.py | 5 +++--
3 files changed, 16 insertions(+), 4 deletions(-)
diff --git a/manifests/services/koji.pp b/manifests/services/koji.pp
index f8de58d..1817ae2 100644
--- a/manifests/services/koji.pp
+++ b/manifests/services/koji.pp
@@ -360,6 +360,12 @@ class kojiownersync {
minute => [ 7, 17, 27, 37, 47, 57 ],
ensure => present,
}
+
+ cron { update-koji-owner-EL-7:
+ command => "/usr/local/bin/owner-sync-pkgdb epel7 >& /dev/null",
+ minute => [ 3, 13, 23, 33, 43, 53 ],
+ ensure => present,
+ }
}
# We do want any output in production.
else {
@@ -380,6 +386,11 @@ class kojiownersync {
minute => [ 7, 17, 27, 37, 47, 57 ],
ensure => present,
}
-
+
+ cron { update-koji-owner-EL-7:
+ command => "/usr/local/bin/owner-sync-pkgdb epel7 >& /dev/null",
+ minute => [ 3, 13, 23, 33, 43, 53 ],
+ ensure => present,
+ }
}
}
diff --git a/modules/gitolite/files/distgit/genacls.pkgdb b/modules/gitolite/files/distgit/genacls.pkgdb
index e2e0964..fd975f3 100755
--- a/modules/gitolite/files/distgit/genacls.pkgdb
+++ b/modules/gitolite/files/distgit/genacls.pkgdb
@@ -22,7 +22,7 @@ if __name__ == '__main__':
# Set the active branches to create ACLs for
# Give them the git branch eqiv until pkgdb follows suite
ACTIVE = {'OLPC-2': 'olpc2', 'OLPC-3': 'olpc3', 'EL-4': 'el4',
- 'EL-5': 'el5', 'EL-6': 'el6', 'F-11': 'f11',
+ 'EL-5': 'el5', 'EL-6': 'el6', 'EL-7': 'epel7', 'F-11': 'f11',
'F-12': 'f12', 'F-13': 'f13', 'f14': 'f14', 'f15': 'f15', 'f16': 'f16', 'f17': 'f17', 'f18': 'f18', 'f19': 'f19', 'f20': 'f20',
'devel': 'master'}
diff --git a/modules/gitolite/files/distgit/pkgdb2branch.py b/modules/gitolite/files/distgit/pkgdb2branch.py
index bef6038..e30a345 100755
--- a/modules/gitolite/files/distgit/pkgdb2branch.py
+++ b/modules/gitolite/files/distgit/pkgdb2branch.py
@@ -30,7 +30,7 @@ GITDIR='/srv/git/rpms'
BASEURL = os.environ.get('PACKAGEDBURL') or 'https://admin.fedoraproject.org/pkgdb/'
MKBRANCH='/usr/local/bin/mkbranch'
SETUP_PACKAGE='/usr/local/bin/setup_git_package'
-BRANCHES = {'el4': 'master', 'el5': 'master', 'el6': 'master',
+BRANCHES = {'el4': 'master', 'el5': 'master', 'el6': 'master', 'epel7': 'master',
'olpc2': 'f7',
'olpc3': 'f11',
'master': None,
@@ -48,7 +48,8 @@ BRANCHES = {'el4': 'master', 'el5': 'master', 'el6': 'master',
}
# The branch names we get out of pkgdb have to be translated to git
-GITBRANCHES = {'EL-4': 'el4', 'EL-5': 'el5', 'EL-6': 'el6', 'OLPC-2': 'olpc2',
+GITBRANCHES = {'EL-4': 'el4', 'EL-5': 'el5', 'EL-6': 'el6', 'EL-7': 'epel7',
+ 'OLPC-2': 'olpc2',
'FC-6': 'fc6', 'F-7': 'f7', 'F-8': 'f8', 'F-9': 'f9',
'F-10': 'f10', 'OLPC-3': 'olpc3',
'F-11': 'f11', 'F-12': 'f12', 'F-13': 'f13', 'f14': 'f14', 'f15': 'f15', 'f16': 'f16', 'f17': 'f17',
--
1.7.2.1
From 01a78545691559f447b9a12e6653ea5ac70d36d3 Mon Sep 17 00:00:00 2001
From: Dennis Gilmore <ausil@xxxxxxxxxxxxxxxxx>
Date: Sun, 15 Dec 2013 23:25:29 +0000
Subject: [PATCH 02/13] using epel7 not EL-7 for epel 7
---
manifests/services/koji.pp | 4 ++--
modules/gitolite/files/distgit/genacls.pkgdb | 2 +-
modules/gitolite/files/distgit/pkgdb2branch.py | 2 +-
3 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/manifests/services/koji.pp b/manifests/services/koji.pp
index 1817ae2..17b32be 100644
--- a/manifests/services/koji.pp
+++ b/manifests/services/koji.pp
@@ -361,7 +361,7 @@ class kojiownersync {
ensure => present,
}
- cron { update-koji-owner-EL-7:
+ cron { update-koji-owner-epel7:
command => "/usr/local/bin/owner-sync-pkgdb epel7 >& /dev/null",
minute => [ 3, 13, 23, 33, 43, 53 ],
ensure => present,
@@ -387,7 +387,7 @@ class kojiownersync {
ensure => present,
}
- cron { update-koji-owner-EL-7:
+ cron { update-koji-owner-epel7:
command => "/usr/local/bin/owner-sync-pkgdb epel7 >& /dev/null",
minute => [ 3, 13, 23, 33, 43, 53 ],
ensure => present,
diff --git a/modules/gitolite/files/distgit/genacls.pkgdb b/modules/gitolite/files/distgit/genacls.pkgdb
index fd975f3..88bb946 100755
--- a/modules/gitolite/files/distgit/genacls.pkgdb
+++ b/modules/gitolite/files/distgit/genacls.pkgdb
@@ -22,7 +22,7 @@ if __name__ == '__main__':
# Set the active branches to create ACLs for
# Give them the git branch eqiv until pkgdb follows suite
ACTIVE = {'OLPC-2': 'olpc2', 'OLPC-3': 'olpc3', 'EL-4': 'el4',
- 'EL-5': 'el5', 'EL-6': 'el6', 'EL-7': 'epel7', 'F-11': 'f11',
+ 'EL-5': 'el5', 'EL-6': 'el6', 'epel7': 'epel7', 'F-11': 'f11',
'F-12': 'f12', 'F-13': 'f13', 'f14': 'f14', 'f15': 'f15', 'f16': 'f16', 'f17': 'f17', 'f18': 'f18', 'f19': 'f19', 'f20': 'f20',
'devel': 'master'}
diff --git a/modules/gitolite/files/distgit/pkgdb2branch.py b/modules/gitolite/files/distgit/pkgdb2branch.py
index e30a345..46845ee 100755
--- a/modules/gitolite/files/distgit/pkgdb2branch.py
+++ b/modules/gitolite/files/distgit/pkgdb2branch.py
@@ -48,7 +48,7 @@ BRANCHES = {'el4': 'master', 'el5': 'master', 'el6': 'master', 'epel7': 'master'
}
# The branch names we get out of pkgdb have to be translated to git
-GITBRANCHES = {'EL-4': 'el4', 'EL-5': 'el5', 'EL-6': 'el6', 'EL-7': 'epel7',
+GITBRANCHES = {'EL-4': 'el4', 'EL-5': 'el5', 'EL-6': 'el6', 'epel7': 'epel7',
'OLPC-2': 'olpc2',
'FC-6': 'fc6', 'F-7': 'f7', 'F-8': 'f8', 'F-9': 'f9',
'F-10': 'f10', 'OLPC-3': 'olpc3',
--
1.7.2.1
From b7ad3a47818ba52e8eab2cac7162ae46519cebe0 Mon Sep 17 00:00:00 2001
From: Dennis Gilmore <ausil@xxxxxxxxxxxxxxxxx>
Date: Sun, 15 Dec 2013 23:51:14 +0000
Subject: [PATCH 03/13] add the brisbane install sync to fedora-enchilada0
---
modules/rsync/files/rsyncd.conf.download-phx | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/modules/rsync/files/rsyncd.conf.download-phx b/modules/rsync/files/rsyncd.conf.download-phx
index f41c794..a47a745 100644
--- a/modules/rsync/files/rsyncd.conf.download-phx
+++ b/modules/rsync/files/rsyncd.conf.download-phx
@@ -72,7 +72,7 @@ refuse options = checksum
list = no
uid = nobody
gid = 263
- hosts allow = jobbot1.ibiblio.org 200.17.202.1/28 zeus1.kernel.org zeus2.kernel.org zeus3.kernel.org zeus4.kernel.org 149.20.20.132 204.152.191.36 199.6.1.170 130.239.17.3 sinclair.wpi.edu bonaparte.hrz.tu-chemnitz.de josephine.hrz.tu-che mirror.speedpartner.de rsyncer.ftp.heanet.ie archive.linux.duke.edu lists.us.dell.com auslistsprd01.us.dell.com auslistsdr01.us.dell.com 65.18.175.19 198.129.224.34 mirror.hiwaay.net sagres.c3sl.ufpr.br mail.fedoraunity.org scrye.com odysseus.fi.muni.cz odysseus.linux.cz rhlx01.hs-esslingen.de ftp.nrc.ca zaphod.gtlib.gatech.edu 128.171.104.148 129.21.171.98 torrent01.fedoraproject.org torrent02.fedoraproject.org sunsite.mff.cuni.cz sunsite.ms.mff.cuni.cz ultra.linux.cz ftp.cz.kernel.org 202.158.214.12 speculum.rbc.ru 71.19.151.18 152.19.134.145 mirrors.mit.edu solar-one.mit.edu
+ hosts allow = jobbot1.ibiblio.org 200.17.202.1/28 zeus1.kernel.org zeus2.kernel.org zeus3.kernel.org zeus4.kernel.org 149.20.20.132 204.152.191.36 199.6.1.170 130.239.17.3 sinclair.wpi.edu bonaparte.hrz.tu-chemnitz.de josephine.hrz.tu-che mirror.speedpartner.de rsyncer.ftp.heanet.ie archive.linux.duke.edu lists.us.dell.com auslistsprd01.us.dell.com auslistsdr01.us.dell.com 65.18.175.19 198.129.224.34 mirror.hiwaay.net sagres.c3sl.ufpr.br mail.fedoraunity.org scrye.com odysseus.fi.muni.cz odysseus.linux.cz rhlx01.hs-esslingen.de ftp.nrc.ca zaphod.gtlib.gatech.edu 128.171.104.148 129.21.171.98 torrent01.fedoraproject.org torrent02.fedoraproject.org sunsite.mff.cuni.cz sunsite.ms.mff.cuni.cz ultra.linux.cz ftp.cz.kernel.org 202.158.214.12 speculum.rbc.ru 71.19.151.18 152.19.134.145 mirrors.mit.edu solar-one.mit.edu 10.64.10.11
[fedora-buffet]
comment = Fedora Buffet for Tier0|1 Mirrors
--
1.7.2.1
From d1db547e3bba57ef10e627f71ac08956de75a42c Mon Sep 17 00:00:00 2001
From: Dennis Gilmore <ausil@xxxxxxxxxxxxxxxxx>
Date: Mon, 16 Dec 2013 01:32:30 +0000
Subject: [PATCH 04/13] have kojipkgs serving rhel beta content but only allow access from phx2
---
configs/web/applications/kojipkgs.conf | 7 +++++++
modules/squid/files/squid.conf | 2 ++
2 files changed, 9 insertions(+), 0 deletions(-)
diff --git a/configs/web/applications/kojipkgs.conf b/configs/web/applications/kojipkgs.conf
index 3bc6253..be0e03e 100644
--- a/configs/web/applications/kojipkgs.conf
+++ b/configs/web/applications/kojipkgs.conf
@@ -44,3 +44,10 @@ Alias /images /mnt/fedora_koji/koji/images
FileETag None
</Directory>
+Alias /rhel /mnt/fedora_koji/rhel
+
+<Directory /mnt/fedora_koji/rhel>
+ Options Indexes FollowSymLinks
+ FileETag None
+</Directory>
+
diff --git a/modules/squid/files/squid.conf b/modules/squid/files/squid.conf
index 827cbe6..2bfa9b5 100644
--- a/modules/squid/files/squid.conf
+++ b/modules/squid/files/squid.conf
@@ -43,6 +43,8 @@ acl Safe_ports port 488 # gss-http
acl Safe_ports port 591 # filemaker
acl Safe_ports port 777 # multiling http
acl CONNECT method CONNECT
+acl rhel urlpath_regex -i ^/rhel/
+http_access allow rhel phx2
http_access allow manager localhost
http_access deny manager
http_access deny !Safe_ports
--
1.7.2.1
From bed06a2a4a39132a67d5f8707b72c13c6361ebff Mon Sep 17 00:00:00 2001
From: Dennis Gilmore <ausil@xxxxxxxxxxxxxxxxx>
Date: Mon, 16 Dec 2013 02:19:46 +0000
Subject: [PATCH 05/13] update owner-sync-pkgdb for new epel tag names
---
configs/system/owner-sync-pkgdb | 12 +++++++++---
1 files changed, 9 insertions(+), 3 deletions(-)
diff --git a/configs/system/owner-sync-pkgdb b/configs/system/owner-sync-pkgdb
index 5b9bf4d..870cec2 100755
--- a/configs/system/owner-sync-pkgdb
+++ b/configs/system/owner-sync-pkgdb
@@ -61,14 +61,20 @@ if __name__ == '__main__':
usage()
pkgdb = PackageDB(BASEURL)
- if tag.endswith('epel'):
- version = tag.split('-')[1][:-1]
+ if tag.endswith('epel') or tag.startswith('epel'):
+ if tag.startswith('epel'):
+ version = tag.split('epel')[1]
+ else
+ version = tag.split('-')[1][:-1]
collections = pkgdb.get_collection_list(eol=False)
branch_names = set()
for collection in collections:
branch_names.add(collection[0]['branchname'])
- reponame = 'EL-%s' % version
+ if tag.startswith('epel'):
+ reponame = tag
+ else:
+ reponame = 'EL-%s' % version
if reponame not in branch_names:
print 'tag %s => repo %s: does not seem to be a non-EOL branch' % (tag, reponame)
sys.exit(1)
--
1.7.2.1
From 7adb7c26fe06aa42508cbee043342625ce6c31b7 Mon Sep 17 00:00:00 2001
From: Dennis Gilmore <ausil@xxxxxxxxxxxxxxxxx>
Date: Mon, 16 Dec 2013 02:21:45 +0000
Subject: [PATCH 06/13] add missing :
---
configs/system/owner-sync-pkgdb | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/configs/system/owner-sync-pkgdb b/configs/system/owner-sync-pkgdb
index 870cec2..f0c4b22 100755
--- a/configs/system/owner-sync-pkgdb
+++ b/configs/system/owner-sync-pkgdb
@@ -64,7 +64,7 @@ if __name__ == '__main__':
if tag.endswith('epel') or tag.startswith('epel'):
if tag.startswith('epel'):
version = tag.split('epel')[1]
- else
+ else:
version = tag.split('-')[1][:-1]
collections = pkgdb.get_collection_list(eol=False)
branch_names = set()
--
1.7.2.1
From a2e9b4f5fe6d52d7f1f10264035dce76ec69ea01 Mon Sep 17 00:00:00 2001
From: Dennis Gilmore <ausil@xxxxxxxxxxxxxxxxx>
Date: Mon, 16 Dec 2013 04:55:17 +0000
Subject: [PATCH 07/13] branch epel7 from f19
---
modules/gitolite/files/distgit/pkgdb2branch.py | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/modules/gitolite/files/distgit/pkgdb2branch.py b/modules/gitolite/files/distgit/pkgdb2branch.py
index 46845ee..aa39096 100755
--- a/modules/gitolite/files/distgit/pkgdb2branch.py
+++ b/modules/gitolite/files/distgit/pkgdb2branch.py
@@ -30,7 +30,7 @@ GITDIR='/srv/git/rpms'
BASEURL = os.environ.get('PACKAGEDBURL') or 'https://admin.fedoraproject.org/pkgdb/'
MKBRANCH='/usr/local/bin/mkbranch'
SETUP_PACKAGE='/usr/local/bin/setup_git_package'
-BRANCHES = {'el4': 'master', 'el5': 'master', 'el6': 'master', 'epel7': 'master',
+BRANCHES = {'el4': 'master', 'el5': 'master', 'el6': 'master', 'epel7': 'f19',
'olpc2': 'f7',
'olpc3': 'f11',
'master': None,
--
1.7.2.1
From 3e4e8e8da9ed5337966e591b2bd601dd08520594 Mon Sep 17 00:00:00 2001
From: Dennis Gilmore <ausil@xxxxxxxxxxxxxxxxx>
Date: Mon, 16 Dec 2013 04:56:05 +0000
Subject: [PATCH 08/13] reserve all epel branche to 99
---
modules/gitolite/files/distgit/genacls.pkgdb | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/modules/gitolite/files/distgit/genacls.pkgdb b/modules/gitolite/files/distgit/genacls.pkgdb
index 88bb946..f79bdcd 100755
--- a/modules/gitolite/files/distgit/genacls.pkgdb
+++ b/modules/gitolite/files/distgit/genacls.pkgdb
@@ -27,7 +27,7 @@ if __name__ == '__main__':
'devel': 'master'}
# Create a "regex"ish list 0f the reserved branches
- RESERVED = ['f[0-9][0-9]', 'el[0-9]', 'olpc[0-9]']
+ RESERVED = ['f[0-9][0-9]', 'epel[0-9]', 'epel[0-9][0-9]'. 'el[0-9]', 'olpc[0-9]']
# Read the ACL information from the packageDB
pkgdb = fedora.client.PackageDB()
--
1.7.2.1
From 920fd9b579b57e4d04d2ee002dedb74bd8e069d7 Mon Sep 17 00:00:00 2001
From: Dennis Gilmore <ausil@xxxxxxxxxxxxxxxxx>
Date: Mon, 16 Dec 2013 07:03:36 +0000
Subject: [PATCH 09/13] rhel7 drops 32 bit support
---
manifests/services/epel-beta.pp | 4 +-
modules/mock/files/mock/rhel-compose-i386.cfg | 42 -----------------------
modules/mock/files/mock/rhel-compose-x86_64.cfg | 37 ++++++++++++++++++++
3 files changed, 39 insertions(+), 44 deletions(-)
delete mode 100644 modules/mock/files/mock/rhel-compose-i386.cfg
create mode 100644 modules/mock/files/mock/rhel-compose-x86_64.cfg
diff --git a/manifests/services/epel-beta.pp b/manifests/services/epel-beta.pp
index 566d4bc..4e27824 100644
--- a/manifests/services/epel-beta.pp
+++ b/manifests/services/epel-beta.pp
@@ -7,11 +7,11 @@ class epelbetabuilder {
# This is kind of a hack - we need to find
# out if this can use the mock module
- file { "/etc/mock/rhel-compose-i386.cfg":
+ file { "/etc/mock/rhel-compose-x86_64.cfg":
owner => "root",
group => "root",
mode => 0644,
- source => "puppet:///mock/mock/rhel-compose-i386.cfg",
+ source => "puppet:///mock/mock/rhel-compose-x86_64.cfg",
require => Package["mock"],
}
diff --git a/modules/mock/files/mock/rhel-compose-i386.cfg b/modules/mock/files/mock/rhel-compose-i386.cfg
deleted file mode 100644
index fc3e1c9..0000000
--- a/modules/mock/files/mock/rhel-compose-i386.cfg
+++ /dev/null
@@ -1,42 +0,0 @@
-config_opts['root'] = 'rhel-compose-i386'
-config_opts['target_arch'] = 'i686'
-config_opts['chroot_setup_cmd'] = 'groupinstall build'
-config_opts['dist'] = 'el6' # only useful for --resultdir variable subst
-config_opts['plugin_conf']['bind_mount_opts']['dirs'].append(('/mnt/koji', '/mnt/koji' ))
-config_opts['plugin_conf']['bind_mount_opts']['dirs'].append(('/pub/epel', '/pub/epel' ))
-config_opts['plugin_conf']['root_cache_enable'] = False
-
-config_opts['yum.conf'] = """
-[main]
-cachedir=/var/cache/yum
-debuglevel=2
-reposdir=/dev/null
-logfile=/var/log/yum.log
-retries=20
-obsoletes=1
-gpgcheck=0
-assumeyes=1
-
-# repos
-
-[rhel]
-name=rhel
-baseurl=http://kojipkgs.fedoraproject.org/repo/rhel/beta/5.90Server/i386/os/
-enabled=1
-cost=5000
-
-[rhel-optional]
-name=rhel-optional
-baseurl=http://kojipkgs.fedoraproject.org/repo/rhel/beta/5.90Server/optional/i386/os/
-enabled=1
-cost=5000
-
-[static]
-name=static
-baseurl=http://kojipkgs.fedoraproject.org/repos/dist-6E-epel-build/latest/i386/
-enabled=1
-#cost=2000
-"""
-
-
-
diff --git a/modules/mock/files/mock/rhel-compose-x86_64.cfg b/modules/mock/files/mock/rhel-compose-x86_64.cfg
new file mode 100644
index 0000000..be7fe8b
--- /dev/null
+++ b/modules/mock/files/mock/rhel-compose-x86_64.cfg
@@ -0,0 +1,37 @@
+config_opts['root'] = 'rhel-compose-x86_64'
+config_opts['target_arch'] = 'x86_64'
+config_opts['chroot_setup_cmd'] = 'groupinstall build'
+config_opts['dist'] = 'el7' # only useful for --resultdir variable subst
+config_opts['plugin_conf']['bind_mount_opts']['dirs'].append(('/mnt/koji', '/mnt/koji' ))
+config_opts['plugin_conf']['bind_mount_opts']['dirs'].append(('/pub/epel', '/pub/epel' ))
+config_opts['plugin_conf']['root_cache_enable'] = False
+
+config_opts['yum.conf'] = """
+[main]
+cachedir=/var/cache/yum
+debuglevel=2
+reposdir=/dev/null
+logfile=/var/log/yum.log
+retries=20
+obsoletes=1
+gpgcheck=0
+assumeyes=1
+
+# repos
+
+[rhel]
+name=rhel
+baseurl=http://kojipkgs.fedoraproject.org/rhel/beta/7/x86_64/os/
+enabled=1
+cost=5000
+
+
+[static]
+name=static
+baseurl=http://kojipkgs.fedoraproject.org/repos/epel7-build/latest/x86_64/
+enabled=1
+#cost=2000
+"""
+
+
+
--
1.7.2.1
From d8d5e9a5d497ea65f113d262c8f9e12f3f4f04c0 Mon Sep 17 00:00:00 2001
From: Dennis Gilmore <ausil@xxxxxxxxxxxxxxxxx>
Date: Mon, 16 Dec 2013 12:23:29 +0000
Subject: [PATCH 10/13] enable nightly epel7 beta composes
---
configs/build/epelbeta | 1 +
manifests/services/epel-beta.pp | 5 +++++
2 files changed, 6 insertions(+), 0 deletions(-)
create mode 100644 configs/build/epelbeta
diff --git a/configs/build/epelbeta b/configs/build/epelbeta
new file mode 100644
index 0000000..6d413fe
--- /dev/null
+++ b/configs/build/epelbeta
@@ -0,0 +1 @@
+15 8 * * * masher TMPDIR=`mktemp -d /tmp/rawhide.XXXXXX` && cd $TMPDIR && git clone -n git://git.fedorahosted.org/releng && cd releng && git checkout -b stable rawhide-stable && LANG=en_US.UTF-8 ./scripts/buildepelbeta $(date "+\%Y\%m\%d") && sudo -u ftpsync /usr/local/bin/update-fullfilelist epel
diff --git a/manifests/services/epel-beta.pp b/manifests/services/epel-beta.pp
index 4e27824..c078f44 100644
--- a/manifests/services/epel-beta.pp
+++ b/manifests/services/epel-beta.pp
@@ -5,6 +5,11 @@ class epelbetabuilder {
include koji-package
include git::package
+ #when epel 7 goes stable make sure this file is absent
+ configfile { '/etc/cron.d/epelbeta':
+ source => 'build/epelbeta',
+ }
+
# This is kind of a hack - we need to find
# out if this can use the mock module
file { "/etc/mock/rhel-compose-x86_64.cfg":
--
1.7.2.1
From 15b7f2e33a0703e1cecf4320367f0cd48e0b161e Mon Sep 17 00:00:00 2001
From: Dennis Gilmore <ausil@xxxxxxxxxxxxxxxxx>
Date: Mon, 16 Dec 2013 12:30:25 +0000
Subject: [PATCH 11/13] use epelbeta in parth for checkout
---
configs/build/epelbeta | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/configs/build/epelbeta b/configs/build/epelbeta
index 6d413fe..97514fe 100644
--- a/configs/build/epelbeta
+++ b/configs/build/epelbeta
@@ -1 +1 @@
-15 8 * * * masher TMPDIR=`mktemp -d /tmp/rawhide.XXXXXX` && cd $TMPDIR && git clone -n git://git.fedorahosted.org/releng && cd releng && git checkout -b stable rawhide-stable && LANG=en_US.UTF-8 ./scripts/buildepelbeta $(date "+\%Y\%m\%d") && sudo -u ftpsync /usr/local/bin/update-fullfilelist epel
+15 8 * * * masher TMPDIR=`mktemp -d /tmp/epelbeta.XXXXXX` && cd $TMPDIR && git clone -n git://git.fedorahosted.org/releng && cd releng && git checkout -b stable rawhide-stable && LANG=en_US.UTF-8 ./scripts/buildepelbeta $(date "+\%Y\%m\%d") && sudo -u ftpsync /usr/local/bin/update-fullfilelist epel
--
1.7.2.1
From 1a3a7346003b745929bea8d3d7a9dd0b09e77893 Mon Sep 17 00:00:00 2001
From: Dennis Gilmore <ausil@xxxxxxxxxxxxxxxxx>
Date: Mon, 16 Dec 2013 22:13:41 +0000
Subject: [PATCH 13/13] replace . ith , silly
---
modules/gitolite/files/distgit/genacls.pkgdb | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/modules/gitolite/files/distgit/genacls.pkgdb b/modules/gitolite/files/distgit/genacls.pkgdb
index f79bdcd..3e17811 100755
--- a/modules/gitolite/files/distgit/genacls.pkgdb
+++ b/modules/gitolite/files/distgit/genacls.pkgdb
@@ -27,7 +27,7 @@ if __name__ == '__main__':
'devel': 'master'}
# Create a "regex"ish list 0f the reserved branches
- RESERVED = ['f[0-9][0-9]', 'epel[0-9]', 'epel[0-9][0-9]'. 'el[0-9]', 'olpc[0-9]']
+ RESERVED = ['f[0-9][0-9]', 'epel[0-9]', 'epel[0-9][0-9]', 'el[0-9]', 'olpc[0-9]']
# Read the ACL information from the packageDB
pkgdb = fedora.client.PackageDB()
--
1.7.2.1
_______________________________________________
infrastructure mailing list
infrastructure@xxxxxxxxxxxxxxxxxxxxxxx
https://admin.fedoraproject.org/mailman/listinfo/infrastructure
