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@xxxxxxxxxxxxxxxxxxxxxxx/thread/KLN5L33BIR3ZEHC5RIG4NXGO7LT6HBXJ/ --- roles/bodhi2/backend/files/new-updates-sync | 30 ++++++++++++------------ roles/bodhi2/backend/templates/pungi.rpm.conf.j2 | 4 ++-- 2 files changed, 17 insertions(+), 17 deletions(-) diff --git a/roles/bodhi2/backend/files/new-updates-sync b/roles/bodhi2/backend/files/new-updates-sync index 6e7c8a072..548616a16 100755 --- a/roles/bodhi2/backend/files/new-updates-sync +++ b/roles/bodhi2/backend/files/new-updates-sync @@ -17,21 +17,21 @@ FEDORADEST = '/pub/fedora/linux/updates/' FEDORAMODDEST = '/pub/fedora/linux/modular/updates/' FEDORAALTDEST = '/pub/fedora-secondary/updates/' EPELDEST = '/pub/epel/' -ATOMICSOURCE = '/mnt/koji/compose/updates/atomic/' -ATOMICDEST = '/mnt/koji/atomic/' +ATOMICSOURCE = '/mnt/koji/compose/atomic/repo/' +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': os.path.join(ATOMICDEST, '28'), + 'dest': ATOMICDEST, 'arches': ['x86_64', 'ppc64le', 'aarch64']}, {'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 {'ref': 'fedora/28/x86_64/workstation', - 'dest': os.path.join(ATOMICDEST, 'workstation')}], + 'dest': ATOMICDEST}], 'to': [{'arches': ['aarch64', 'x86_64', 'armhfp', 'source'], 'dest': os.path.join(FEDORADEST, '28')}, {'arches': ['i386', 'ppc64', 'ppc64le', 's390x'], @@ -40,10 +40,10 @@ RELEASES = {'f28': {'topic': 'fedora', 'updates-testing': { 'from': 'f28-updates-testing', 'ostrees': [{'ref': 'fedora/28/%(arch)s/testing/atomic-host', - 'dest': os.path.join(ATOMICDEST, '28'), + 'dest': ATOMICDEST, 'arches': ['x86_64', 'ppc64le', 'aarch64']}, {'ref': 'fedora/28/x86_64/testing/workstation', - 'dest': os.path.join(ATOMICDEST, 'workstation')}], + 'dest': ATOMICDEST}], 'to': [{'arches': ['x86_64', 'armhfp', 'source'], 'dest': os.path.join(FEDORADEST, 'testing', '28')}, {'arches': ['aarch64', 'i386', 'ppc64', 'ppc64le', 's390x'], @@ -56,13 +56,13 @@ RELEASES = {'f28': {'topic': 'fedora', 'repos': {'updates': { 'from': 'f27-updates', 'ostrees': [{'ref': 'fedora/27/%(arch)s/updates/atomic-host', - 'dest': os.path.join(ATOMICDEST, '27'), + 'dest': ATOMICDEST, 'arches': ['x86_64', 'ppc64le', 'aarch64']}, {'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 {'ref': 'fedora/27/x86_64/workstation', - 'dest': os.path.join(ATOMICDEST, 'workstation')}], + 'dest': ATOMICDEST}], 'to': [{'arches': ['x86_64', 'armhfp', 'source'], 'dest': os.path.join(FEDORADEST, '27')}, {'arches': ['aarch64', 'i386', 'ppc64', 'ppc64le', 's390x'], @@ -71,10 +71,10 @@ RELEASES = {'f28': {'topic': 'fedora', 'updates-testing': { 'from': 'f27-updates-testing', 'ostrees': [{'ref': 'fedora/27/%(arch)s/testing/atomic-host', - 'dest': os.path.join(ATOMICDEST, '27'), + 'dest': ATOMICDEST, 'arches': ['x86_64', 'ppc64le', 'aarch64']}, {'ref': 'fedora/27/x86_64/testing/workstation', - 'dest': os.path.join(ATOMICDEST, 'workstation')}], + 'dest': ATOMICDEST}], 'to': [{'arches': ['x86_64', 'armhfp', 'source'], 'dest': os.path.join(FEDORADEST, 'testing', '27')}, {'arches': ['aarch64', 'i386', 'ppc64', 'ppc64le', 's390x'], @@ -87,10 +87,10 @@ RELEASES = {'f28': {'topic': 'fedora', 'repos': {'updates': { 'from': 'f26-updates', '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 {'ref': 'fedora/26/x86_64/atomic-host', - 'dest': os.path.join(ATOMICDEST, '26')}], + 'dest': ATOMICDEST}], 'to': [{'arches': ['x86_64', 'armhfp', 'source'], 'dest': os.path.join(FEDORADEST, '26')}, {'arches': ['aarch64', 'i386', 'ppc64', 'ppc64le'], @@ -99,7 +99,7 @@ RELEASES = {'f28': {'topic': 'fedora', 'updates-testing': { 'from': 'f26-updates-testing', 'ostrees': [{'ref': 'fedora/26/x86_64/testing/atomic-host', - 'dest': os.path.join(ATOMICDEST, '26')}], + 'dest': ATOMICDEST}], 'to': [{'arches': ['x86_64', 'armhfp', 'source'], 'dest': os.path.join(FEDORADEST, 'testing', '26')}, {'arches': ['aarch64', 'i386', 'ppc64', 'ppc64le'], diff --git a/roles/bodhi2/backend/templates/pungi.rpm.conf.j2 b/roles/bodhi2/backend/templates/pungi.rpm.conf.j2 index 8040bb71b..0f1c8ecc0 100644 --- a/roles/bodhi2/backend/templates/pungi.rpm.conf.j2 +++ b/roles/bodhi2/backend/templates/pungi.rpm.conf.j2 @@ -126,7 +126,7 @@ ostree = { [% endif %] "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, "arches": ["x86_64", [% if release.version_int >= 27 %] @@ -154,7 +154,7 @@ ostree = { [% endif %] "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, "arches": ["x86_64"], "failable": ["x86_64"] -- 2.14.3 _______________________________________________ infrastructure mailing list -- infrastructure@xxxxxxxxxxxxxxxxxxxxxxx To unsubscribe send an email to infrastructure-leave@xxxxxxxxxxxxxxxxxxxxxxx
