Hopefully this is the last change:
--- a/roles/bodhi2/backend/files/new-updates-sync
+++ b/roles/bodhi2/backend/files/new-updates-sync
@@ -18,11 +18,13 @@ RAWHIDESOURCE = '/mnt/koji/compose/rawhide/'
FEDORADEST = '/pub/fedora/linux/updates/'
FEDORAMODDEST = '/pub/fedora/linux/modular/updates/'
FEDORAALTDEST = '/pub/fedora-secondary/updates/'
+RAWHIDEDEST = '/pub/fedora/linux/development/'
+RAWHIDEALTDEST = '/pub/fedora-secondary/development/'
EPELDEST = '/pub/epel/'
ATOMICSOURCE = '/mnt/koji/compose/atomic/repo/'
ATOMICDEST = '/mnt/koji/atomic/repo/'
-RELEASES = {'f30': {'topic': 'fedora',
- 'version': '30',
+RELEASES = {'rawhide': {'topic': 'fedora',
+ 'version': 'rawhide',
'modules': ['fedora', 'fedora-secondary'],
'repos': {'rawhide': {
'from': 'latest-Fedora-Rawhide',
@@ -32,9 +34,9 @@ RELEASES = {'f30': {'topic': 'fedora',
{'ref': 'fedora/rawhide/x86_64/silverblue',
'dest': ATOMICDEST}],
'to': [{'arches': ['x86_64', 'armhfp', 'aarch64', 'source'],
- 'dest': os.path.join(FEDORADEST, '30', 'Everything')},
+ 'dest': os.path.join(RAWHIDEDEST, 'rawhide', 'Everything')},
{'arches': ['i386', 'ppc64le', 's390x'],
- 'dest': os.path.join(FEDORAALTDEST, '30', 'Everything')}
+ 'dest': os.path.join(RAWHIDEALTDEST, 'rawhide', 'Everything')}
]}},
},
'f29': {'topic': 'fedora',
On Mon, Aug 27, 2018 at 4:14 PM Dusty Mabe <dusty@xxxxxxxxxxxxx> wrote:
LGTM
On 08/27/2018 04:07 PM, Mohan Boddu wrote:
> Dusty, how about this:
>
> diff --git a/roles/bodhi2/backend/files/new-updates-sync b/roles/bodhi2/backend/files/new-updates-sync
> index 9ddc591..194e2bd 100755
> --- a/roles/bodhi2/backend/files/new-updates-sync
> +++ b/roles/bodhi2/backend/files/new-updates-sync
> @@ -14,6 +14,7 @@ logger = logging.getLogger('updates-sync')
>
>
> SOURCE = '/mnt/koji/compose/updates/'
> +RAWHIDESOURCE = '/mnt/koji/compose/rawhide/'
> FEDORADEST = '/pub/fedora/linux/updates/'
> FEDORAMODDEST = '/pub/fedora/linux/modular/updates/'
> FEDORAALTDEST = '/pub/fedora-secondary/updates/'
> @@ -24,7 +25,7 @@ RELEASES = {'f30': {'topic': 'fedora',
> 'version': '30',
> 'modules': ['fedora', 'fedora-secondary'],
> 'repos': {'rawhide': {
> - 'from': 'f30',
> + 'from': 'latest-Fedora-Rawhide',
> 'ostrees': [{'ref': 'fedora/rawhide/%(arch)s/atomic-host',
> 'dest': ATOMICDEST,
> 'arches': ['x86_64', 'ppc64le', 'aarch64']},
> @@ -291,9 +292,14 @@ def to_human(num_bytes):
>
>
> def sync_single_repo_arch(release, repo, arch, dest_path):
> - source_path = os.path.join(SOURCE,
> - RELEASES[release]['repos'][repo]['from'],
> - 'compose', 'Everything', arch)
> + if repo == 'rawhide':
> + source_path = os.path.join(RAWHIDESOURCE,
> + RELEASES[release]['repos'][repo]['from'],
> + 'compose', 'Everything', arch)
> + else:
> + source_path = os.path.join(SOURCE,
> + RELEASES[release]['repos'][repo]['from'],
> + 'compose', 'Everything', arch)
>
> maindir = 'tree' if arch == 'source' else 'os'
>
> @@ -356,8 +362,12 @@ def sync_single_repo(release, repo):
>
>
> def determine_last_link(release, repo):
> - source_path = os.path.join(SOURCE,
> - RELEASES[release]['repos'][repo]['from'])
> + if repo == 'rawhide':
> + source_path = os.path.join(RAWHIDESOURCE,
> + RELEASES[release]['repos'][repo]['from'])
> + else:
> + source_path = os.path.join(SOURCE,
> + RELEASES[release]['repos'][repo]['from'])
> target = os.readlink(source_path)
> logger.info <http://logger.info>('Release %s, repo %s, target %s', release, repo, target)
> RELEASES[release]['repos'][repo]['from'] = target
>
_______________________________________________ infrastructure mailing list -- infrastructure@xxxxxxxxxxxxxxxxxxxxxxx To unsubscribe send an email to infrastructure-leave@xxxxxxxxxxxxxxxxxxxxxxx Fedora Code of Conduct: https://getfedora.org/code-of-conduct.html List Guidelines: https://fedoraproject.org/wiki/Mailing_list_guidelines List Archives: https://lists.fedoraproject.org/archives/list/infrastructure@xxxxxxxxxxxxxxxxxxxxxxx
