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

Revert "Adding ostree sync for rawhide"

Browse source 
This reverts commits
ca3b247c3c
d6ba1f5b54
fc9b896bed
2da175571c
328128cc3f

Signed-off-by: Mohan Boddu <mboddu@redhat.com>
This commit is contained in:
Mohan Boddu 2018-09-28 17:50:29 +00:00
parent 646010c992
commit 319df04da2
1 changed files with 11 additions and 46 deletions
Download patch file Download diff file Expand all files Collapse all files

43
roles/bodhi2/backend/files/new-updates-sync
View file

@ -14,32 +14,13 @@ logger = logging.getLogger('updates-sync')
SOURCE = '/mnt/koji/compose/updates/' SOURCE = '/mnt/koji/compose/updates/'
RAWHIDESOURCE = '/mnt/koji/compose/rawhide/'
FEDORADEST = '/pub/fedora/linux/updates/' FEDORADEST = '/pub/fedora/linux/updates/'
FEDORAMODDEST = '/pub/fedora/linux/modular/updates/' FEDORAMODDEST = '/pub/fedora/linux/modular/updates/'
FEDORAALTDEST = '/pub/fedora-secondary/updates/' FEDORAALTDEST = '/pub/fedora-secondary/updates/'
RAWHIDEDEST = '/pub/fedora/linux/development/'
RAWHIDEALTDEST = '/pub/fedora-secondary/development/'
EPELDEST = '/pub/epel/' EPELDEST = '/pub/epel/'
ATOMICSOURCE = '/mnt/koji/compose/atomic/repo/' ATOMICSOURCE = '/mnt/koji/compose/atomic/repo/'
ATOMICDEST = '/mnt/koji/atomic/repo/' ATOMICDEST = '/mnt/koji/atomic/repo/'
RELEASES = {'rawhide': {'topic': 'fedora', RELEASES = {'f29': {'topic': 'fedora',
'version': 'rawhide',
'modules': ['fedora', 'fedora-secondary'],
'repos': {'rawhide': {
'from': 'latest-Fedora-Rawhide',
'ostrees': [{'ref': 'fedora/rawhide/%(arch)s/atomic-host',
'dest': ATOMICDEST,
'arches': ['x86_64', 'ppc64le', 'aarch64']},
{'ref': 'fedora/rawhide/x86_64/silverblue',
'dest': ATOMICDEST}],
'to': [{'arches': ['x86_64', 'armhfp', 'aarch64', 'source'],
'dest': os.path.join(RAWHIDEDEST, 'rawhide', 'Everything')},
{'arches': ['i386', 'ppc64le', 's390x'],
'dest': os.path.join(RAWHIDEALTDEST, 'rawhide', 'Everything')}
]}},
},
'f29': {'topic': 'fedora',
'version': '29', 'version': '29',
'modules': ['fedora', 'fedora-secondary'], 'modules': ['fedora', 'fedora-secondary'],
'repos': {'updates': { 'repos': {'updates': {
@ -47,10 +28,10 @@ RELEASES = {'rawhide': {'topic': 'fedora',
'ostrees': [{'ref': 'fedora/29/%(arch)s/updates/atomic-host', 'ostrees': [{'ref': 'fedora/29/%(arch)s/updates/atomic-host',
'dest': ATOMICDEST, 'dest': ATOMICDEST,
'arches': ['x86_64', 'ppc64le', 'aarch64']}, 'arches': ['x86_64', 'ppc64le', 'aarch64']},
{'ref': 'fedora/29/x86_64/updates/silverblue', {'ref': 'fedora/29/x86_64/updates/workstation',
'dest': ATOMICDEST}, 'dest': ATOMICDEST},
# Hack around for the fact that ostree on f25 doesn't know links # Hack around for the fact that ostree on f25 doesn't know links
{'ref': 'fedora/29/x86_64/silverblue', {'ref': 'fedora/29/x86_64/workstation',
'dest': ATOMICDEST}], 'dest': ATOMICDEST}],
'to': [{'arches': ['x86_64', 'armhfp', 'aarch64', 'source'], 'to': [{'arches': ['x86_64', 'armhfp', 'aarch64', 'source'],
'dest': os.path.join(FEDORADEST, '29', 'Everything')}, 'dest': os.path.join(FEDORADEST, '29', 'Everything')},
@ -62,7 +43,7 @@ RELEASES = {'rawhide': {'topic': 'fedora',
'ostrees': [{'ref': 'fedora/29/%(arch)s/testing/atomic-host', 'ostrees': [{'ref': 'fedora/29/%(arch)s/testing/atomic-host',
'dest': ATOMICDEST, 'dest': ATOMICDEST,
'arches': ['x86_64', 'ppc64le', 'aarch64']}, 'arches': ['x86_64', 'ppc64le', 'aarch64']},
{'ref': 'fedora/29/x86_64/testing/silverblue', {'ref': 'fedora/29/x86_64/testing/workstation',
'dest': ATOMICDEST}], 'dest': ATOMICDEST}],
'to': [{'arches': ['x86_64', 'aarch64', 'armhfp', 'source'], 'to': [{'arches': ['x86_64', 'aarch64', 'armhfp', 'source'],
'dest': os.path.join(FEDORADEST, 'testing', '29', 'Everything')}, 'dest': os.path.join(FEDORADEST, 'testing', '29', 'Everything')},
@ -294,11 +275,6 @@ def to_human(num_bytes):
def sync_single_repo_arch(release, repo, arch, dest_path): def sync_single_repo_arch(release, repo, arch, dest_path):
if repo == 'rawhide':
source_path = os.path.join(RAWHIDESOURCE,
RELEASES[release]['repos'][repo]['from'],
'compose', 'Everything', arch)
else:
source_path = os.path.join(SOURCE, source_path = os.path.join(SOURCE,
RELEASES[release]['repos'][repo]['from'], RELEASES[release]['repos'][repo]['from'],
'compose', 'Everything', arch) 'compose', 'Everything', arch)
@ -344,9 +320,6 @@ def sync_single_repo(release, repo):
for archdef in RELEASES[release]['repos'][repo]['to']: for archdef in RELEASES[release]['repos'][repo]['to']:
for arch in archdef['arches']: for arch in archdef['arches']:
destarch = 'SRPMS' if arch == 'source' else arch destarch = 'SRPMS' if arch == 'source' else arch
if repo == 'rawhide':
dest_path = os.path.join(archdef['dest'], destarch, 'os')
else:
dest_path = os.path.join(archdef['dest'], destarch) dest_path = os.path.join(archdef['dest'], destarch)
results.append(sync_single_repo_arch(release, repo, arch, dest_path)) results.append(sync_single_repo_arch(release, repo, arch, dest_path))
@ -367,14 +340,6 @@ def sync_single_repo(release, repo):
def determine_last_link(release, repo): def determine_last_link(release, repo):
if repo == 'rawhide':
source_path = os.path.join(RAWHIDESOURCE,
RELEASES[release]['repos'][repo]['from'])
#Since latest-Fedora-Rawhide is a symlink pointing to just the
#compose dir rather than its full path, we need the absolute path
#of the compose rather than relative path
target = os.path.realpath(source_path)
else:
source_path = os.path.join(SOURCE, source_path = os.path.join(SOURCE,
RELEASES[release]['repos'][repo]['from']) RELEASES[release]['repos'][repo]['from'])
target = os.readlink(source_path) target = os.readlink(source_path)