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

move to unified atomic ostree repo structure

Browse source 
We move to /compose/atomic/repo for the compose time repo and to
/atomic/repo for the production/user repo. See [1].

[1] https://lists.fedoraproject.org/archives/list/rel-eng@lists.fedoraproject.org/thread/KLN5L33BIR3ZEHC5RIG4NXGO7LT6HBXJ/
This commit is contained in:
Dusty Mabe 2018-03-05 15:58:05 -05:00
parent 9b802fc4c2
commit c728992501
No known key found for this signature in database
GPG key ID: 3302DBD73952E671
2 changed files with 17 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -17,21 +17,21 @@ 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/'
EPELDEST = '/pub/epel/' EPELDEST = '/pub/epel/'
ATOMICSOURCE = '/mnt/koji/compose/updates/atomic/' ATOMICSOURCE = '/mnt/koji/compose/atomic/repo/'
ATOMICDEST = '/mnt/koji/atomic/' ATOMICDEST = '/mnt/koji/atomic/repo/'
RELEASES = {'f28': {'topic': 'fedora', RELEASES = {'f28': {'topic': 'fedora',
'version': '28', 'version': '28',
'modules': ['fedora', 'fedora-secondary'], 'modules': ['fedora', 'fedora-secondary'],
'repos': {'updates': { 'repos': {'updates': {
'from': 'f28-updates', 'from': 'f28-updates',
'ostrees': [{'ref': 'fedora/28/%(arch)s/updates/atomic-host', 'ostrees': [{'ref': 'fedora/28/%(arch)s/updates/atomic-host',
'dest': os.path.join(ATOMICDEST, '28'), 'dest': ATOMICDEST,
'arches': ['x86_64', 'ppc64le', 'aarch64']}, 'arches': ['x86_64', 'ppc64le', 'aarch64']},
{'ref': 'fedora/28/x86_64/updates/workstation', {'ref': 'fedora/28/x86_64/updates/workstation',
'dest': os.path.join(ATOMICDEST, 'workstation')}, '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/28/x86_64/workstation', {'ref': 'fedora/28/x86_64/workstation',
'dest': os.path.join(ATOMICDEST, 'workstation')}], 'dest': ATOMICDEST}],
'to': [{'arches': ['aarch64', 'x86_64', 'armhfp', 'source'], 'to': [{'arches': ['aarch64', 'x86_64', 'armhfp', 'source'],
'dest': os.path.join(FEDORADEST, '28')}, 'dest': os.path.join(FEDORADEST, '28')},
{'arches': ['i386', 'ppc64', 'ppc64le', 's390x'], {'arches': ['i386', 'ppc64', 'ppc64le', 's390x'],
@ -40,10 +40,10 @@ RELEASES = {'f28': {'topic': 'fedora',
'updates-testing': { 'updates-testing': {
'from': 'f28-updates-testing', 'from': 'f28-updates-testing',
'ostrees': [{'ref': 'fedora/28/%(arch)s/testing/atomic-host', 'ostrees': [{'ref': 'fedora/28/%(arch)s/testing/atomic-host',
'dest': os.path.join(ATOMICDEST, '28'), 'dest': ATOMICDEST,
'arches': ['x86_64', 'ppc64le', 'aarch64']}, 'arches': ['x86_64', 'ppc64le', 'aarch64']},
{'ref': 'fedora/28/x86_64/testing/workstation', {'ref': 'fedora/28/x86_64/testing/workstation',
'dest': os.path.join(ATOMICDEST, 'workstation')}], 'dest': ATOMICDEST}],
'to': [{'arches': ['x86_64', 'armhfp', 'source'], 'to': [{'arches': ['x86_64', 'armhfp', 'source'],
'dest': os.path.join(FEDORADEST, 'testing', '28')}, 'dest': os.path.join(FEDORADEST, 'testing', '28')},
{'arches': ['aarch64', 'i386', 'ppc64', 'ppc64le', 's390x'], {'arches': ['aarch64', 'i386', 'ppc64', 'ppc64le', 's390x'],
@ -56,13 +56,13 @@ RELEASES = {'f28': {'topic': 'fedora',
'repos': {'updates': { 'repos': {'updates': {
'from': 'f27-updates', 'from': 'f27-updates',
'ostrees': [{'ref': 'fedora/27/%(arch)s/updates/atomic-host', 'ostrees': [{'ref': 'fedora/27/%(arch)s/updates/atomic-host',
'dest': os.path.join(ATOMICDEST, '27'), 'dest': ATOMICDEST,
'arches': ['x86_64', 'ppc64le', 'aarch64']}, 'arches': ['x86_64', 'ppc64le', 'aarch64']},
{'ref': 'fedora/27/x86_64/updates/workstation', {'ref': 'fedora/27/x86_64/updates/workstation',
'dest': os.path.join(ATOMICDEST, 'workstation')}, '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/27/x86_64/workstation', {'ref': 'fedora/27/x86_64/workstation',
'dest': os.path.join(ATOMICDEST, 'workstation')}], 'dest': ATOMICDEST}],
'to': [{'arches': ['x86_64', 'armhfp', 'source'], 'to': [{'arches': ['x86_64', 'armhfp', 'source'],
'dest': os.path.join(FEDORADEST, '27')}, 'dest': os.path.join(FEDORADEST, '27')},
{'arches': ['aarch64', 'i386', 'ppc64', 'ppc64le', 's390x'], {'arches': ['aarch64', 'i386', 'ppc64', 'ppc64le', 's390x'],
@ -71,10 +71,10 @@ RELEASES = {'f28': {'topic': 'fedora',
'updates-testing': { 'updates-testing': {
'from': 'f27-updates-testing', 'from': 'f27-updates-testing',
'ostrees': [{'ref': 'fedora/27/%(arch)s/testing/atomic-host', 'ostrees': [{'ref': 'fedora/27/%(arch)s/testing/atomic-host',
'dest': os.path.join(ATOMICDEST, '27'), 'dest': ATOMICDEST,
'arches': ['x86_64', 'ppc64le', 'aarch64']}, 'arches': ['x86_64', 'ppc64le', 'aarch64']},
{'ref': 'fedora/27/x86_64/testing/workstation', {'ref': 'fedora/27/x86_64/testing/workstation',
'dest': os.path.join(ATOMICDEST, 'workstation')}], 'dest': ATOMICDEST}],
'to': [{'arches': ['x86_64', 'armhfp', 'source'], 'to': [{'arches': ['x86_64', 'armhfp', 'source'],
'dest': os.path.join(FEDORADEST, 'testing', '27')}, 'dest': os.path.join(FEDORADEST, 'testing', '27')},
{'arches': ['aarch64', 'i386', 'ppc64', 'ppc64le', 's390x'], {'arches': ['aarch64', 'i386', 'ppc64', 'ppc64le', 's390x'],
@ -87,10 +87,10 @@ RELEASES = {'f28': {'topic': 'fedora',
'repos': {'updates': { 'repos': {'updates': {
'from': 'f26-updates', 'from': 'f26-updates',
'ostrees': [{'ref': 'fedora/26/x86_64/updates/atomic-host', 'ostrees': [{'ref': 'fedora/26/x86_64/updates/atomic-host',
'dest': os.path.join(ATOMICDEST, '26')}, '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/26/x86_64/atomic-host', {'ref': 'fedora/26/x86_64/atomic-host',
'dest': os.path.join(ATOMICDEST, '26')}], 'dest': ATOMICDEST}],
'to': [{'arches': ['x86_64', 'armhfp', 'source'], 'to': [{'arches': ['x86_64', 'armhfp', 'source'],
'dest': os.path.join(FEDORADEST, '26')}, 'dest': os.path.join(FEDORADEST, '26')},
{'arches': ['aarch64', 'i386', 'ppc64', 'ppc64le'], {'arches': ['aarch64', 'i386', 'ppc64', 'ppc64le'],
@ -99,7 +99,7 @@ RELEASES = {'f28': {'topic': 'fedora',
'updates-testing': { 'updates-testing': {
'from': 'f26-updates-testing', 'from': 'f26-updates-testing',
'ostrees': [{'ref': 'fedora/26/x86_64/testing/atomic-host', 'ostrees': [{'ref': 'fedora/26/x86_64/testing/atomic-host',
'dest': os.path.join(ATOMICDEST, '26')}], 'dest': ATOMICDEST}],
'to': [{'arches': ['x86_64', 'armhfp', 'source'], 'to': [{'arches': ['x86_64', 'armhfp', 'source'],
'dest': os.path.join(FEDORADEST, 'testing', '26')}, 'dest': os.path.join(FEDORADEST, 'testing', '26')},
{'arches': ['aarch64', 'i386', 'ppc64', 'ppc64le'], {'arches': ['aarch64', 'i386', 'ppc64', 'ppc64le'],

4
roles/bodhi2/backend/templates/pungi.rpm.conf.j2
View file

@ -126,7 +126,7 @@ ostree = {
[% endif %] [% endif %]
"https://kojipkgs{{ env_suffix }}.fedoraproject.org/compose/[[ release.version_int ]]/latest-Fedora-[[ release.version_int ]]/compose/Everything/$basearch/os/" "https://kojipkgs{{ env_suffix }}.fedoraproject.org/compose/[[ release.version_int ]]/latest-Fedora-[[ release.version_int ]]/compose/Everything/$basearch/os/"
] ]
"ostree_repo": "/mnt/koji/compose/updates/atomic", "ostree_repo": "/mnt/koji/compose/atomic/repo",
"tag_ref": False, "tag_ref": False,
"arches": ["x86_64", "arches": ["x86_64",
[% if release.version_int >= 27 %] [% if release.version_int >= 27 %]
@ -154,7 +154,7 @@ ostree = {
[% endif %] [% endif %]
"https://kojipkgs{{ env_suffix }}.fedoraproject.org/compose/[[ release.version_int ]]/latest-Fedora-[[ release.version_int ]]/compose/Everything/$basearch/os/" "https://kojipkgs{{ env_suffix }}.fedoraproject.org/compose/[[ release.version_int ]]/latest-Fedora-[[ release.version_int ]]/compose/Everything/$basearch/os/"
] ]
"ostree_repo": "/mnt/koji/compose/updates/atomic", "ostree_repo": "/mnt/koji/compose/atomic/repo",
"tag_ref": False, "tag_ref": False,
"arches": ["x86_64"], "arches": ["x86_64"],
"failable": ["x86_64"] "failable": ["x86_64"]