From f04001aa0f117005e9ee5795612824c066ea780c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan=20Kalu=C5=BEa?= Date: Fri, 28 Jul 2017 06:18:57 +0000 Subject: [PATCH 01/10] Set the priority of MBS builds to 4, so it has higher priority than F27 mass rebuild. --- roles/mbs/common/templates/config.py | 3 +++ 1 file changed, 3 insertions(+) diff --git a/roles/mbs/common/templates/config.py b/roles/mbs/common/templates/config.py index 6e120ca15a..08313622d9 100644 --- a/roles/mbs/common/templates/config.py +++ b/roles/mbs/common/templates/config.py @@ -175,3 +175,6 @@ class ProdConfiguration(BaseConfiguration): # Don't let people submit yaml directly. it has to come from dist-git YAML_SUBMIT_ALLOWED = False + + # Set the priority to 4 to have higher priority than F27 mass rebuild. + KOJI_BUILD_PRIORITY = 4 From c7ba75e6ccf798ed3a6b6e8d95327ab603bd396e Mon Sep 17 00:00:00 2001 From: Pierre-Yves Chibon Date: Fri, 28 Jul 2017 10:12:14 +0200 Subject: [PATCH 02/10] Turn off group management in pagure --- roles/distgit/pagure/templates/pagure.cfg | 1 + 1 file changed, 1 insertion(+) diff --git a/roles/distgit/pagure/templates/pagure.cfg b/roles/distgit/pagure/templates/pagure.cfg index 70647221b0..4bb11f2ad8 100644 --- a/roles/distgit/pagure/templates/pagure.cfg +++ b/roles/distgit/pagure/templates/pagure.cfg @@ -176,6 +176,7 @@ ENABLE_NEW_PROJECTS = False ENABLE_DEL_PROJECTS = False ENABLE_TICKETS = False ENABLE_USER_MNGT = False +ENABLE_GROUP_MANAGEMENT = False ALLOWED_PREFIX = ['rpms', 'modules', 'container'] DISABLED_PLUGINS = ['IRC', 'Pagure tickets', 'Read the Doc'] From 56c2c54787b1868baf6f1733ce14f0a037535cdf Mon Sep 17 00:00:00 2001 From: Pierre-Yves Chibon Date: Fri, 28 Jul 2017 10:44:18 +0200 Subject: [PATCH 03/10] Adjust variable name, thanks cverna --- roles/distgit/pagure/templates/pagure.cfg | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/roles/distgit/pagure/templates/pagure.cfg b/roles/distgit/pagure/templates/pagure.cfg index 4bb11f2ad8..55cbdb8e28 100644 --- a/roles/distgit/pagure/templates/pagure.cfg +++ b/roles/distgit/pagure/templates/pagure.cfg @@ -176,7 +176,7 @@ ENABLE_NEW_PROJECTS = False ENABLE_DEL_PROJECTS = False ENABLE_TICKETS = False ENABLE_USER_MNGT = False -ENABLE_GROUP_MANAGEMENT = False +ENABLE_GROUP_MNGT = False ALLOWED_PREFIX = ['rpms', 'modules', 'container'] DISABLED_PLUGINS = ['IRC', 'Pagure tickets', 'Read the Doc'] From b57925043df71885ef1a1991c18aa1e745a18456 Mon Sep 17 00:00:00 2001 From: Pierre-Yves Chibon Date: Fri, 28 Jul 2017 11:04:40 +0200 Subject: [PATCH 04/10] Let's get real --- roles/distgit/pagure/templates/pagure.cfg | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/roles/distgit/pagure/templates/pagure.cfg b/roles/distgit/pagure/templates/pagure.cfg index 55cbdb8e28..e4c8a9d45c 100644 --- a/roles/distgit/pagure/templates/pagure.cfg +++ b/roles/distgit/pagure/templates/pagure.cfg @@ -100,7 +100,10 @@ TICKETS_FOLDER = None REMOTE_GIT_FOLDER = '/srv/git/remotes' ### Configuration file for gitolite -GITOLITE_CONFIG = '/srv/git/.gitolite/conf/gitolite.conf.pagure' +GITOLITE_CONFIG = '/srv/git/.gitolite/conf/gitolite.conf' + +### File to include at the top of the gitolite configuration file +GITOLITE_PRE_CONFIG = '/var/tmp/gitolite-prefix.txt' ### Temp folder to be used to make the clones to work around bug in libgit2: ## refs: https://github.com/libgit2/libgit2/issues/2965 From 195d222557afcd05eb535a336018629250f3653a Mon Sep 17 00:00:00 2001 From: Pierre-Yves Chibon Date: Fri, 28 Jul 2017 11:13:17 +0200 Subject: [PATCH 05/10] Couple of missing gitolite options --- roles/distgit/pagure/templates/pagure.cfg | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/roles/distgit/pagure/templates/pagure.cfg b/roles/distgit/pagure/templates/pagure.cfg index e4c8a9d45c..c94027c986 100644 --- a/roles/distgit/pagure/templates/pagure.cfg +++ b/roles/distgit/pagure/templates/pagure.cfg @@ -99,6 +99,12 @@ TICKETS_FOLDER = None ### Folder containing the clones of the remotes git repo REMOTE_GIT_FOLDER = '/srv/git/remotes' +### Folder where to run gl-compile-conf from +GITOLITE_HOME = '/srv/git/' + +### Folder containing all the public ssh keys for gitolite +GITOLITE_KEYDIR = '/srv/git/.gitolite/keydir/' + ### Configuration file for gitolite GITOLITE_CONFIG = '/srv/git/.gitolite/conf/gitolite.conf' From a246d2dda592e3ccbe195855a3002540d6acb33d Mon Sep 17 00:00:00 2001 From: Pierre-Yves Chibon Date: Fri, 28 Jul 2017 11:50:06 +0200 Subject: [PATCH 06/10] There is no single user on dist-git --- roles/distgit/pagure/templates/pagure.cfg | 3 --- 1 file changed, 3 deletions(-) diff --git a/roles/distgit/pagure/templates/pagure.cfg b/roles/distgit/pagure/templates/pagure.cfg index c94027c986..550b4491bf 100644 --- a/roles/distgit/pagure/templates/pagure.cfg +++ b/roles/distgit/pagure/templates/pagure.cfg @@ -102,9 +102,6 @@ REMOTE_GIT_FOLDER = '/srv/git/remotes' ### Folder where to run gl-compile-conf from GITOLITE_HOME = '/srv/git/' -### Folder containing all the public ssh keys for gitolite -GITOLITE_KEYDIR = '/srv/git/.gitolite/keydir/' - ### Configuration file for gitolite GITOLITE_CONFIG = '/srv/git/.gitolite/conf/gitolite.conf' From 1999d3cc8bad417c2fbf5a094e69955fc98e4955 Mon Sep 17 00:00:00 2001 From: Peter Robinson Date: Fri, 28 Jul 2017 10:05:43 +0000 Subject: [PATCH 07/10] bodhi2: backend: drop f23 and EPEL-5 from bodhi as they're both EOL --- .../backend/files/dist-5E-epel-testing.mash | 17 ----------------- roles/bodhi2/backend/files/dist-5E-epel.mash | 17 ----------------- .../backend/files/f23-updates-testing.mash | 19 ------------------- roles/bodhi2/backend/files/f23-updates.mash | 17 ----------------- roles/bodhi2/backend/tasks/main.yml | 14 -------------- 5 files changed, 84 deletions(-) delete mode 100644 roles/bodhi2/backend/files/dist-5E-epel-testing.mash delete mode 100644 roles/bodhi2/backend/files/dist-5E-epel.mash delete mode 100644 roles/bodhi2/backend/files/f23-updates-testing.mash delete mode 100644 roles/bodhi2/backend/files/f23-updates.mash diff --git a/roles/bodhi2/backend/files/dist-5E-epel-testing.mash b/roles/bodhi2/backend/files/dist-5E-epel-testing.mash deleted file mode 100644 index 694629c216..0000000000 --- a/roles/bodhi2/backend/files/dist-5E-epel-testing.mash +++ /dev/null @@ -1,17 +0,0 @@ -[dist-5E-epel-testing] -rpm_path = %(arch)s/ -source_path = SRPMS/ -debuginfo_path = %(arch)s/debug -debuginfo = True -multilib = True -multilib_method = devel -tag = dist-5E-epel-testing -inherit = False -strict_keys = True -keys = 217521f6 -use_repoview = False -repoviewurl = http://download.fedoraproject.org/pub/epel/testing/5/%(arch)s/ -repoviewtitle = "Fedora EPEL 5 Testing - %(arch)s" -arches = i386 x86_64 ppc -hash = sha -compress_type = compat diff --git a/roles/bodhi2/backend/files/dist-5E-epel.mash b/roles/bodhi2/backend/files/dist-5E-epel.mash deleted file mode 100644 index b3299e7647..0000000000 --- a/roles/bodhi2/backend/files/dist-5E-epel.mash +++ /dev/null @@ -1,17 +0,0 @@ -[dist-5E-epel] -rpm_path = %(arch)s/ -source_path = SRPMS/ -debuginfo_path = %(arch)s/debug -debuginfo = True -multilib = True -multilib_method = devel -tag = dist-5E-epel -inherit = False -strict_keys = True -keys = 217521f6 -use_repoview = False -repoviewurl = http://download.fedoraproject.org/pub/epel/5/%(arch)s/ -repoviewtitle = "Fedora EPEL 5 - %(arch)s" -arches = i386 x86_64 ppc -hash = sha -compress_type = compat diff --git a/roles/bodhi2/backend/files/f23-updates-testing.mash b/roles/bodhi2/backend/files/f23-updates-testing.mash deleted file mode 100644 index 5e4d23f838..0000000000 --- a/roles/bodhi2/backend/files/f23-updates-testing.mash +++ /dev/null @@ -1,19 +0,0 @@ -# mash config file - -[f23-updates-testing] -rpm_path = %(arch)s/ -source_path = SRPMS/ -debuginfo = True -multilib = True -multilib_method = devel -tag = f23-updates-testing -inherit = False -strict_keys = True -keys = 34EC9CBA -repoviewurl = http://download.fedoraproject.org/pub/fedora/linux/updates/testing/23/%(arch)s/ -repoviewtitle = "Fedora 23 Updates Testing - %(arch)s" -arches = armhfp i386 x86_64 -hash_packages = True -delta = True -delta_dirs = /pub/fedora/linux/releases/23/Everything/%(arch)s/os/,/mnt/koji/mash/updates/f23-updates/%(arch)s/ -parent_repos = http://download.fedoraproject.org/pub/fedora/linux/updates/23/%(arch)s, http://download.fedoraproject.org/pub/fedora/linux/releases/23/Everything/%(arch)s/os diff --git a/roles/bodhi2/backend/files/f23-updates.mash b/roles/bodhi2/backend/files/f23-updates.mash deleted file mode 100644 index b2061e07a7..0000000000 --- a/roles/bodhi2/backend/files/f23-updates.mash +++ /dev/null @@ -1,17 +0,0 @@ -[f23-updates] -rpm_path = %(arch)s/ -source_path = SRPMS/ -debuginfo = True -multilib = True -multilib_method = devel -tag = f23-updates -inherit = False -strict_keys = True -keys = 34EC9CBA -repoviewurl = http://download.fedoraproject.org/pub/fedora/linux/updates/23/%(arch)s/ -repoviewtitle = "Fedora 23 Updates - %(arch)s" -arches = armhfp i386 x86_64 -hash_packages = True -delta = True -delta_dirs = /pub/fedora/linux/releases/23/Everything/%(arch)s/os/,/mnt/koji/mash/updates/f23-updates/%(arch)s/ -parent_repos = http://download.fedoraproject.org/pub/fedora/linux/releases/23/Everything/%(arch)s/os diff --git a/roles/bodhi2/backend/tasks/main.yml b/roles/bodhi2/backend/tasks/main.yml index 2b6ff230cf..05ac39c1ad 100644 --- a/roles/bodhi2/backend/tasks/main.yml +++ b/roles/bodhi2/backend/tasks/main.yml @@ -102,16 +102,12 @@ owner=apache mode=0640 with_items: - - f23-updates.mash - - f23-updates-testing.mash - f24-updates.mash - f24-updates-testing.mash - f25-updates.mash - f25-updates-testing.mash - f26-updates.mash - f26-updates-testing.mash - - dist-5E-epel.mash - - dist-5E-epel-testing.mash - dist-6E-epel.mash - dist-6E-epel-testing.mash - epel7.mash @@ -143,16 +139,6 @@ - bodhi - cron -- name: sync packages from pkgdb2 to koji (el5) - cron: name="owner-sync-el5" minute="7,17,27,37,47,57" user="root" - job="/usr/local/bin/owner-sync-pkgdb dist-5E-epel" - cron_file=update-koji-owner-EL-5 - disabled=true - when: inventory_hostname.startswith('bodhi-backend01') and env == "production" - tags: - - bodhi - - cron - - name: sync packages from pkgdb2 to koji (el6) cron: name="owner-sync-el6" minute="7,17,27,37,47,57" user="root" job="/usr/local/bin/owner-sync-pkgdb dist-6E-epel" From 17e29970dc33c15ef085058ce784ab281eef8e42 Mon Sep 17 00:00:00 2001 From: Peter Robinson Date: Fri, 28 Jul 2017 10:15:48 +0000 Subject: [PATCH 08/10] bodhi2: backend: now bodhi is doing updates for secondary the update-fullfiletimelist cron needs to do fedora-secondary too --- roles/bodhi2/backend/tasks/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/roles/bodhi2/backend/tasks/main.yml b/roles/bodhi2/backend/tasks/main.yml index 05ac39c1ad..21f23eafef 100644 --- a/roles/bodhi2/backend/tasks/main.yml +++ b/roles/bodhi2/backend/tasks/main.yml @@ -222,7 +222,7 @@ - name: Updates sync cron job. cron: name="updates-sync" minute="15,45" user="ftpsync" - job="/usr/local/bin/lock-wrapper fedora-updates-push '/usr/local/bin/fedora-updates-push && /usr/local/bin/update-fullfiletimelist -l /pub/fedora-secondary/update-fullfiletimelist.lock -t /pub fedora'" + job="/usr/local/bin/lock-wrapper fedora-updates-push '/usr/local/bin/fedora-updates-push && /usr/local/bin/update-fullfiletimelist -l /pub/fedora-secondary/update-fullfiletimelist.lock -t /pub fedora fedora-secondary'" cron_file=updates-sync when: inventory_hostname.startswith('bodhi-backend01') and env == "production" tags: From 2079c8852beb9ae8925af532eef12e8d6e579ab3 Mon Sep 17 00:00:00 2001 From: clime Date: Fri, 28 Jul 2017 14:48:45 +0200 Subject: [PATCH 09/10] copr: do not enable @copr/copr repo --- .../files/provision/provision_builder_tasks.yml | 3 --- roles/copr/backend/files/yum/copr_local.repo | 10 ---------- roles/copr/backend/tasks/main.yml | 5 ----- roles/copr/base/files/yum/copr-dev.repo | 10 ---------- roles/copr/base/files/yum/copr.repo | 10 ---------- roles/copr/base/tasks/main.yml | 11 ----------- roles/copr/mbs/tasks/main.yml | 3 --- 7 files changed, 52 deletions(-) delete mode 100644 roles/copr/backend/files/yum/copr_local.repo delete mode 100644 roles/copr/base/files/yum/copr-dev.repo delete mode 100644 roles/copr/base/files/yum/copr.repo diff --git a/roles/copr/backend/files/provision/provision_builder_tasks.yml b/roles/copr/backend/files/provision/provision_builder_tasks.yml index 36eef03b72..acf96937d9 100644 --- a/roles/copr/backend/files/provision/provision_builder_tasks.yml +++ b/roles/copr/backend/files/provision/provision_builder_tasks.yml @@ -29,9 +29,6 @@ - nosync - expect -- name: enable @copr/copr for now - shell: dnf copr -y enable @copr/copr - - name: make sure newest rpm dnf: state=latest pkg={{ item }} with_items: diff --git a/roles/copr/backend/files/yum/copr_local.repo b/roles/copr/backend/files/yum/copr_local.repo deleted file mode 100644 index e7a27dcd19..0000000000 --- a/roles/copr/backend/files/yum/copr_local.repo +++ /dev/null @@ -1,10 +0,0 @@ -[group_copr-copr_local] -name=group_copr-copr_local -baseurl=file:///var/lib/copr/public_html/results/@copr/copr/fedora-$releasever-x86_64/ -type=rpm-md -gpgcheck=1 -gpgkey=file:///var/lib/copr/public_html/results/@copr/copr/pubkey.gpg -enabled=1 -enabled_metadata=1 -skip_if_unavailable=True -priority=1 diff --git a/roles/copr/backend/tasks/main.yml b/roles/copr/backend/tasks/main.yml index deb1ffbbd2..1214cc4525 100644 --- a/roles/copr/backend/tasks/main.yml +++ b/roles/copr/backend/tasks/main.yml @@ -9,11 +9,6 @@ - group: name=copr gid=986 - user: name=copr group=copr uid=989 -- name: install copr local path repo - copy: src="yum/copr_local.repo" dest="/etc/yum.repos.d/copr_local.repo" - tags: - - config - - name: install copr-backend and copr-selinux dnf: state=latest name={{ item }} with_items: diff --git a/roles/copr/base/files/yum/copr-dev.repo b/roles/copr/base/files/yum/copr-dev.repo deleted file mode 100644 index 725d490a51..0000000000 --- a/roles/copr/base/files/yum/copr-dev.repo +++ /dev/null @@ -1,10 +0,0 @@ -[group_copr-copr-dev] -name=Copr repo for copr-dev owned by @copr -baseurl=https://copr-be.cloud.fedoraproject.org/results/@copr/copr-dev/fedora-$releasever-$basearch/ -type=rpm-md -skip_if_unavailable=True -gpgcheck=1 -gpgkey=https://copr-be.cloud.fedoraproject.org/results/@copr/copr-dev/pubkey.gpg -repo_gpgcheck=0 -enabled=1 -enabled_metadata=1 diff --git a/roles/copr/base/files/yum/copr.repo b/roles/copr/base/files/yum/copr.repo deleted file mode 100644 index 93a7386cef..0000000000 --- a/roles/copr/base/files/yum/copr.repo +++ /dev/null @@ -1,10 +0,0 @@ -[group_copr-copr] -name=Copr repo for copr owned by @copr -baseurl=https://copr-be.cloud.fedoraproject.org/results/@copr/copr/fedora-$releasever-$basearch/ -type=rpm-md -skip_if_unavailable=True -gpgcheck=1 -gpgkey=https://copr-be.cloud.fedoraproject.org/results/@copr/copr/pubkey.gpg -repo_gpgcheck=0 -enabled=1 -enabled_metadata=1 diff --git a/roles/copr/base/tasks/main.yml b/roles/copr/base/tasks/main.yml index e5c26862b4..d14567820a 100644 --- a/roles/copr/base/tasks/main.yml +++ b/roles/copr/base/tasks/main.yml @@ -29,17 +29,6 @@ tags: - config -- name: install copr repo - copy: src="yum/copr.repo" dest="/etc/yum.repos.d/copr.repo" - tags: - - config - -- name: install copr-dev repo - copy: src="yum/copr-dev.repo" dest="/etc/yum.repos.d/copr-dev.repo" - when: env == "staging" - tags: - - config - - name: install common copr packages dnf: state=present pkg={{ item }} with_items: diff --git a/roles/copr/mbs/tasks/main.yml b/roles/copr/mbs/tasks/main.yml index 81cfa0626c..72eeae1fdc 100644 --- a/roles/copr/mbs/tasks/main.yml +++ b/roles/copr/mbs/tasks/main.yml @@ -6,9 +6,6 @@ command: dnf install --refresh -y python2 python2-dnf libselinux-python -- name: Enable copr repo - command: dnf -y copr enable @copr/copr - - name: Install stuff dnf: name={{ item }} state=latest with_items: From 6646b6db24fcb53ee665f747f2883a6e17e9b157 Mon Sep 17 00:00:00 2001 From: clime Date: Fri, 28 Jul 2017 15:12:42 +0200 Subject: [PATCH 10/10] copr-backend: explicitly disable @copr/copr on builders --- roles/copr/backend/files/provision/provision_builder_tasks.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/roles/copr/backend/files/provision/provision_builder_tasks.yml b/roles/copr/backend/files/provision/provision_builder_tasks.yml index acf96937d9..bd0bb32b3a 100644 --- a/roles/copr/backend/files/provision/provision_builder_tasks.yml +++ b/roles/copr/backend/files/provision/provision_builder_tasks.yml @@ -29,6 +29,9 @@ - nosync - expect +- name: disable @copr/copr explicitly + shell: dnf copr -y disable @copr/copr + - name: make sure newest rpm dnf: state=latest pkg={{ item }} with_items: