FBR: Update new-updates-sync for f28(m) updates-testing

[Patrick Uiterwijk]

Hi all,

Can I get +1s to fix up new-updates-sync to fix syncing f28 to the correct
directory, and f28m (modular) as well?

Patrick

diff --git a/roles/bodhi2/backend/files/new-updates-sync
b/roles/bodhi2/backend/files/new-updates-sync
index 9ca341d79..734e6faa5 100755
--- a/roles/bodhi2/backend/files/new-updates-sync
+++ b/roles/bodhi2/backend/files/new-updates-sync
@@ -22,22 +22,7 @@ ATOMICDEST = '/mnt/koji/atomic/repo/'
 RELEASES = {'f28': {'topic': 'fedora',
                     'version': '28',
                     'modules': ['fedora', 'fedora-secondary'],
-                    'repos': {'updates': {
-                        'from': 'f28-updates',
-                        'ostrees': [{'ref':
'fedora/28/%(arch)s/updates/atomic-host',
-                                     'dest': ATOMICDEST,
-                                     'arches': ['x86_64', 'ppc64le',
'aarch64']},
-                                    {'ref':
'fedora/28/x86_64/updates/workstation',
-                                     'dest': ATOMICDEST},
-                                    # Hack around for the fact that ostree
on f25 doesn't know links
-                                    {'ref': 'fedora/28/x86_64/workstation',
-                                     'dest': ATOMICDEST}],
-                        'to': [{'arches': ['aarch64', 'x86_64', 'armhfp',
'source'],
-                                'dest': os.path.join(FEDORADEST, '28')},
-                               {'arches': ['i386', 'ppc64', 'ppc64le',
's390x'],
-                                'dest': os.path.join(FEDORAALTDEST, '28')}
-                              ]},
-                              'updates-testing': {
+                    'repos': {'updates-testing': {
                         'from': 'f28-updates-testing',
                         'ostrees': [{'ref':
'fedora/28/%(arch)s/testing/atomic-host',
                                      'dest': ATOMICDEST,
@@ -45,9 +30,21 @@ RELEASES = {'f28': {'topic': 'fedora',
                                     {'ref':
'fedora/28/x86_64/testing/workstation',
                                      'dest': ATOMICDEST}],
                         'to': [{'arches': ['x86_64', 'armhfp', 'source'],
-                                'dest': os.path.join(FEDORADEST,
'testing', '28')},
+                                'dest': os.path.join(FEDORADEST,
'testing', '28', 'Everything')},
+                               {'arches': ['aarch64', 'i386', 'ppc64',
'ppc64le', 's390x'],
+                                'dest': os.path.join(FEDORAALTDEST,
'testing', '28', 'Everything')}
+                              ]}}
+                   },
+            'f28m': {'topic': 'fedora',
+                    'version': '28m',
+                    'modules': ['fedora', 'fedora-secondary'],
+                    'repos': {'updates-testing': {
+                        'from': 'f28m-updates-testing',
+                        'ostrees': [],
+                        'to': [{'arches': ['x86_64', 'armhfp', 'source'],
+                                'dest': os.path.join(FEDORADEST,
'testing', '28', 'Modular')},
                                {'arches': ['aarch64', 'i386', 'ppc64',
'ppc64le', 's390x'],
-                                'dest': os.path.join(FEDORAALTDEST,
'testing', '28')}
+                                'dest': os.path.join(FEDORAALTDEST,
'testing', '28', 'Modular')}
                               ]}}
                    },
            'f27': {'topic': 'fedora',

[Peter Robinson]

On Tue, Mar 6, 2018 at 11:34 PM, Patrick Uiterwijk
 wrote:
> Hi all,
>
> Can I get +1s to fix up new-updates-sync to fix syncing f28 to the correct
> directory, and f28m (modular) as well?

Comment inline below.
> diff --git a/roles/bodhi2/backend/files/new-updates-sync
> b/roles/bodhi2/backend/files/new-updates-sync
> index 9ca341d79..734e6faa5 100755
> --- a/roles/bodhi2/backend/files/new-updates-sync
> +++ b/roles/bodhi2/backend/files/new-updates-sync
> @@ -22,22 +22,7 @@ ATOMICDEST = '/mnt/koji/atomic/repo/'
>  RELEASES = {'f28': {'topic': 'fedora',
>                      'version': '28',
>                      'modules': ['fedora', 'fedora-secondary'],
>                'repos': {'updates': {
>                    'from': 'f28-updates',
>                    'ostrees': [{'ref':
>
> 'fedora/28/%(arch)s/updates/atomic-host',
>                                 'dest': ATOMICDEST,
>                                 'arches': ['x86_64', 'ppc64le',
>
> 'aarch64']},
>                                {'ref':
>
> 'fedora/28/x86_64/updates/workstation',
>                                 'dest': ATOMICDEST},
>                                # Hack around for the fact that ostree
>
> on f25 doesn't know links
>                                {'ref': 'fedora/28/x86_64/workstation',
>                                 'dest': ATOMICDEST}],
>                    'to': [{'arches': ['aarch64', 'x86_64', 'armhfp',
>
> 'source'],
>                            'dest': os.path.join(FEDORADEST, '28')},
>                           {'arches': ['i386', 'ppc64', 'ppc64le',
>
> 's390x'],
>                            'dest': os.path.join(FEDORAALTDEST, '28')}
>                          ]},
>                          'updates-testing': {
>                'repos': {'updates-testing': {
>                    'from': 'f28-updates-testing',
>                    'ostrees': [{'ref':
>
> 'fedora/28/%(arch)s/testing/atomic-host',
>                                       'dest': ATOMICDEST,
> @@ -45,9 +30,21 @@ RELEASES = {'f28': {'topic': 'fedora',
>                                      {'ref':
> 'fedora/28/x86_64/testing/workstation',
>                                       'dest': ATOMICDEST}],
>                          'to': [{'arches': ['x86_64', 'armhfp', 'source'],
>                            'dest': os.path.join(FEDORADEST, 'testing',
>
> '28')},
>                            'dest': os.path.join(FEDORADEST, 'testing',
>
> '28', 'Everything')},
>                           {'arches': ['aarch64', 'i386', 'ppc64',
>
> 'ppc64le', 's390x'],
>                            'dest': os.path.join(FEDORAALTDEST,
>
> 'testing', '28', 'Everything')}

I think aarch64 should be up with the ['x86_64', 'armhfp', 'source'] list now
>                          ]}}
>               },
>        'f28m': {'topic': 'fedora',
>                'version': '28m',
>                'modules': ['fedora', 'fedora-secondary'],
>                'repos': {'updates-testing': {
>                    'from': 'f28m-updates-testing',
>                    'ostrees': [],
>                    'to': [{'arches': ['x86_64', 'armhfp', 'source'],
>                            'dest': os.path.join(FEDORADEST, 'testing',
>
> '28', 'Modular')},
>                                 {'arches': ['aarch64', 'i386', 'ppc64',
> 'ppc64le', 's390x'],

Same here.
>                            'dest': os.path.join(FEDORAALTDEST,
>
> 'testing', '28')}
>                            'dest': os.path.join(FEDORAALTDEST,
>
> 'testing', '28', 'Modular')}
>                                ]}}
>                     },
>             'f27': {'topic': 'fedora',
>
> infrastructure mailing list -- [e-mail]
> To unsubscribe send an email to [e-mail]

[Patrick マルタインアンドレアス Uiterwijk]

> On Tue, Mar 6, 2018 at 11:34 PM, Patrick Uiterwijk
> <puiterwijk(a)redhat.com&gt; wrote:
>
> Comment inline below.
>
> I think aarch64 should be up with the ['x86_64', 'armhfp',
> 'source'] list now

Right, imagine that I've done that.  (lines of patch following).

+                        'to': [{'arches': ['x86_64', 'aarch64', 'armhfp', 'source'],
+                                'dest': os.path.join(FEDORADEST, 'testing', '28', 'Everything')},
+                               {'arches': ['i386', 'ppc64', 'ppc64le', 's390x'],
+                                'dest': os.path.join(FEDORAALTDEST, 'testing', '28', 'Everything')}
+                              ]}}

...

+                        'to': [{'arches': ['x86_64', 'aarch64', 'armhfp', 'source'],
+                                'dest': os.path.join(FEDORADEST, 'testing', '28', 'Modular')},
+                               {'arches': ['i386', 'ppc64', 'ppc64le', 's390x'],
+                                'dest': os.path.join(FEDORAALTDEST, 'testing', '28', 'Modular')}
                               ]}}
> Same here.
> >                            'dest': os.path.join(FEDORAALTDEST,
> >
> > 'testing', '28')}
> >                            'dest': os.path.join(FEDORAALTDEST,
> >
> > 'testing', '28', 'Modular')}
> >                                ]}}
> >                     },
> >             'f27': {'topic': 'fedora',
> >
> > infrastructure mailing list -- infrastructure(a)lists.fedoraproject.org
> > To unsubscribe send an email to infrastructure-leave(a)lists.fedoraproject.org

[Peter Robinson]

On Tue, Mar 6, 2018 at 11:54 PM, Patrick  マルタインアンドレアス  Uiterwijk
 wrote:
> > On Tue, Mar 6, 2018 at 11:34 PM, Patrick Uiterwijk
> > <puiterwijk(a)redhat.com&gt; wrote:
> >
> > Comment inline below.
> >
> > I think aarch64 should be up with the ['x86_64', 'armhfp',
> > 'source'] list now
>
> Right, imagine that I've done that.  (lines of patch following).

+1 from me then ;-)
>                    'to': [{'arches': ['x86_64', 'aarch64', 'armhfp', 'source'],
>                            'dest': os.path.join(FEDORADEST, 'testing', '28', 'Everything')},
>                           {'arches': ['i386', 'ppc64', 'ppc64le', 's390x'],
>                            'dest': os.path.join(FEDORAALTDEST, 'testing', '28', 'Everything')}
>                          ]}}
>
> ...
>                    'to': [{'arches': ['x86_64', 'aarch64', 'armhfp', 'source'],
>                            'dest': os.path.join(FEDORADEST, 'testing', '28', 'Modular')},
>                           {'arches': ['i386', 'ppc64', 'ppc64le', 's390x'],
>                            'dest': os.path.join(FEDORAALTDEST, 'testing', '28', 'Modular')}
>                          ]}}
>
>
> > Same here.
> > >                            'dest': os.path.join(FEDORAALTDEST,
> > >
> > > 'testing', '28')}
> > >                            'dest': os.path.join(FEDORAALTDEST,
> > >
> > > 'testing', '28', 'Modular')}
> > >                                ]}}
> > >                     },
> > >             'f27': {'topic': 'fedora',
> > >
> > > infrastructure mailing list -- infrastructure(a)lists.fedoraproject.org
> > > To unsubscribe send an email to infrastructure-leave(a)lists.fedoraproject.org
>
> infrastructure mailing list -- [e-mail]
> To unsubscribe send an email to [e-mail]

[Stephen John Smoogen]

ack.

On 6 March 2018 at 18:34, Patrick Uiterwijk  wrote:
> Hi all,
>
> Can I get +1s to fix up new-updates-sync to fix syncing f28 to the correct
> directory, and f28m (modular) as well?
>
> Patrick
>
> diff --git a/roles/bodhi2/backend/files/new-updates-sync
> b/roles/bodhi2/backend/files/new-updates-sync
> index 9ca341d79..734e6faa5 100755
> --- a/roles/bodhi2/backend/files/new-updates-sync
> +++ b/roles/bodhi2/backend/files/new-updates-sync
> @@ -22,22 +22,7 @@ ATOMICDEST = '/mnt/koji/atomic/repo/'
>  RELEASES = {'f28': {'topic': 'fedora',
>                      'version': '28',
>                      'modules': ['fedora', 'fedora-secondary'],
>                'repos': {'updates': {
>                    'from': 'f28-updates',
>                    'ostrees': [{'ref':
>
> 'fedora/28/%(arch)s/updates/atomic-host',
>                                 'dest': ATOMICDEST,
>                                 'arches': ['x86_64', 'ppc64le',
>
> 'aarch64']},
>                                {'ref':
>
> 'fedora/28/x86_64/updates/workstation',
>                                 'dest': ATOMICDEST},
>                                # Hack around for the fact that ostree
>
> on f25 doesn't know links
>                                {'ref': 'fedora/28/x86_64/workstation',
>                                 'dest': ATOMICDEST}],
>                    'to': [{'arches': ['aarch64', 'x86_64', 'armhfp',
>
> 'source'],
>                            'dest': os.path.join(FEDORADEST, '28')},
>                           {'arches': ['i386', 'ppc64', 'ppc64le',
>
> 's390x'],
>                            'dest': os.path.join(FEDORAALTDEST, '28')}
>                          ]},
>                          'updates-testing': {
>                'repos': {'updates-testing': {
>                    'from': 'f28-updates-testing',
>                    'ostrees': [{'ref':
>
> 'fedora/28/%(arch)s/testing/atomic-host',
>                                       'dest': ATOMICDEST,
> @@ -45,9 +30,21 @@ RELEASES = {'f28': {'topic': 'fedora',
>                                      {'ref':
> 'fedora/28/x86_64/testing/workstation',
>                                       'dest': ATOMICDEST}],
>                          'to': [{'arches': ['x86_64', 'armhfp', 'source'],
>                            'dest': os.path.join(FEDORADEST, 'testing',
>
> '28')},
>                            'dest': os.path.join(FEDORADEST, 'testing',
>
> '28', 'Everything')},
>                           {'arches': ['aarch64', 'i386', 'ppc64',
>
> 'ppc64le', 's390x'],
>                            'dest': os.path.join(FEDORAALTDEST,
>
> 'testing', '28', 'Everything')}
>                          ]}}
>               },
>        'f28m': {'topic': 'fedora',
>                'version': '28m',
>                'modules': ['fedora', 'fedora-secondary'],
>                'repos': {'updates-testing': {
>                    'from': 'f28m-updates-testing',
>                    'ostrees': [],
>                    'to': [{'arches': ['x86_64', 'armhfp', 'source'],
>                            'dest': os.path.join(FEDORADEST, 'testing',
>
> '28', 'Modular')},
>                                 {'arches': ['aarch64', 'i386', 'ppc64',
> 'ppc64le', 's390x'],
>                            'dest': os.path.join(FEDORAALTDEST,
>
> 'testing', '28')}
>                            'dest': os.path.join(FEDORAALTDEST,
>
> 'testing', '28', 'Modular')}
>                                ]}}
>                     },
>             'f27': {'topic': 'fedora',
>
> infrastructure mailing list -- [e-mail]
> To unsubscribe send an email to [e-mail]