From 2079c8852beb9ae8925af532eef12e8d6e579ab3 Mon Sep 17 00:00:00 2001 From: clime Date: Fri, 28 Jul 2017 14:48:45 +0200 Subject: [PATCH] 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: