Infrastructure/ansible
3
0
Fork 0
Code Issues Pull requests 6 Projects Releases Packages Wiki Activity Actions

Merge branch 'master' of /git/ansible

Browse source
This commit is contained in:
Stephen Smoogen 2016-12-01 17:47:03 +00:00
commit 1b9f4facbd
4 changed files with 13 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

2
playbooks/manual/staging-sync/scripts/export-pkgdb-stg-modules.py
View file

@ -16,6 +16,6 @@ response = requests.get(
)
data = response.json()
with open(filename, 'wb') as f:
f.write(json.dumps(data).encode('utf-8'))
f.write(json.dumps(data, indent=2).encode('utf-8'))
print "Wrote %s" % filename

6
roles/distgit/templates/genacls.pkgdb
View file

@ -77,10 +77,12 @@ if __name__ == '__main__':
# https://github.com/fedora-infra/pkgdb2/issues/329#issuecomment-207050233
# And then, this got renamed from rpms-checks to test-rpms
# https://pagure.io/fedora-infrastructure/issue/5570
data['test-rpms'] = copy.copy(data['rpms'])
if 'rpms' in data:
data['test-rpms'] = copy.copy(data['rpms'])
# Also, modules are a thing
# https://pagure.io/fedora-infrastructure/issue/5571
data['test-modules'] = copy.copy(data['modules'])
if 'modules' in data:
data['test-modules'] = copy.copy(data['modules'])
# Get a list of all the packages
for key in data:

6
roles/distgit/templates/genacls.pkgdb.stg
View file

@ -293,10 +293,12 @@ if __name__ == '__main__':
# https://github.com/fedora-infra/pkgdb2/issues/329#issuecomment-207050233
# And then, this got renamed from rpms-checks to test-rpms
# https://pagure.io/fedora-infrastructure/issue/5570
data['test-rpms'] = copy.copy(data['rpms'])
if 'rpms' in data:
data['test-rpms'] = copy.copy(data['rpms'])
# Also, modules are a thing
# https://pagure.io/fedora-infrastructure/issue/5571
data['test-modules'] = copy.copy(data['modules'])
if 'modules' in data:
data['test-modules'] = copy.copy(data['modules'])
# Get a list of all the packages
for key in data:

6
roles/distgit/templates/pkgdb_sync_git_branches.py
View file

@ -256,10 +256,12 @@ def main():
# https://github.com/fedora-infra/pkgdb2/issues/329#issuecomment-207050233
# And then, this got renamed from rpms-checks to test-rpms
# https://pagure.io/fedora-infrastructure/issue/5570
pkgdb_info['test-rpms'] = copy.copy(pkgdb_info['rpms'])
if 'rpms' in pkgdb_info:
pkgdb_info['test-rpms'] = copy.copy(pkgdb_info['rpms'])
# Also, modules are a thing
# https://pagure.io/fedora-infrastructure/issue/5571
pkgdb_info['test-modules'] = copy.copy(pkgdb_info['modules'])
if 'modules' in pkgdb_info:
pkgdb_info['test-modules'] = copy.copy(pkgdb_info['modules'])
for ns in pkgdb_info:
namespace = ns