From 45d7132e35972e298ddf36b8f314fef2bd420d8c Mon Sep 17 00:00:00 2001 From: Kevin Fenzi Date: Sat, 18 Jun 2016 00:09:40 +0000 Subject: [PATCH] No atomic for f24 here, it's all done in 2week atomic now. --- .../bodhi2/backend/files/fedora-updates-push | 2 +- .../backend/templates/atomic-config.py.j2 | 54 ------------------- 2 files changed, 1 insertion(+), 55 deletions(-) diff --git a/roles/bodhi2/backend/files/fedora-updates-push b/roles/bodhi2/backend/files/fedora-updates-push index 7f7b4b147a..2fce4e1620 100755 --- a/roles/bodhi2/backend/files/fedora-updates-push +++ b/roles/bodhi2/backend/files/fedora-updates-push @@ -49,7 +49,7 @@ for rel in 22 23 24; do fi done -for rel in 22 23 24; do +for rel in 22 23; do OUTPUT1=$(rsync $OPTIONS --ignore-existing \ $ATOMICSOURCE/$rel/objects/ $ATOMICDEST/$rel/objects/) diff --git a/roles/bodhi2/backend/templates/atomic-config.py.j2 b/roles/bodhi2/backend/templates/atomic-config.py.j2 index aa14c2ef09..12f2ff842f 100644 --- a/roles/bodhi2/backend/templates/atomic-config.py.j2 +++ b/roles/bodhi2/backend/templates/atomic-config.py.j2 @@ -6,60 +6,6 @@ rhel6 = dist[0] == 'redhat' and int(float(dist[1])) == 6 config = dict( releases={ - 'f24-updates': { - 'name': 'f24-updates', - 'repo': 'updates', - 'version': '24', - 'arch': 'x86_64', - - # OSTree treefile configuration - # https://github.com/projectatomic/rpm-ostree/blob/master/doc/treefile.md - 'tree': 'docker-host', - 'treefile': { - 'include': 'fedora-atomic-docker-host.json', - 'ref': 'fedora-atomic/f24/x86_64/docker-host', - 'repos': ['fedora-24', 'fedora-24-updates'], - 'packages': [], - }, - - # The name of the mock container to build and maintain - 'mock': 'fedora-24-updates-x86_64', - - # The git branch to use in the `git_repo` for the parent - # treefile & repo configurations - 'git_branch': 'f24', - - # Add or overwrite yum repository name:urls. This lets you - # compose trees against your own repositories. - 'repos': {}, - }, - 'f24-updates-testing': { - 'name': 'f24-updates-testing', - 'repo': 'updates-testing', - 'version': '24', - 'arch': 'x86_64', - - # OSTree treefile configuration - # https://github.com/projectatomic/rpm-ostree/blob/master/doc/treefile.md - 'tree': 'docker-host', - 'treefile': { - 'include': 'fedora-atomic-docker-host.json', - 'ref': 'fedora-atomic/f24/x86_64/testing/docker-host', - 'repos': ['fedora-24', 'fedora-24-updates', 'updates-testing'], - 'packages': [], - }, - - # The name of the mock container to build and maintain - 'mock': 'fedora-24-updates-testing-x86_64', - - # The git branch to use in the `git_repo` for the parent - # treefile & repo configurations - 'git_branch': 'f24', - - # Add or overwrite yum repository name:urls. This lets you - # compose trees against your own repositories. - 'repos': {}, - }, 'f23-updates': { 'name': 'f23-updates', 'repo': 'updates',