Merge branch 'master' of /git/ansible

inventory/group_vars/taskotron-dev

@@ -31,6 +31,7 @@ grokmirror_repos:
   - { name: fedoraqa/simpledocker, url: 'https://bitbucket.org/fedoraqa/task-simpledocker.git'}
   - { name: fedoraqa/python-versions, url: 'https://github.com/fedora-python/task-python-versions'}
   - { name: fedoraqa/check_modulemd, url: 'https://github.com/fedora-modularity/check_modulemd'}
+  - { name: fedoraqa/rpmdeplint, url: 'https://pagure.io/taskotron/task-rpmdeplint.git'}
 grokmirror_default_branch: develop
 
 

roles/copr/backend/files/yum/_copr_@modularity-modulemd.custom.repo

@@ -1,12 +0,0 @@
-[group_modularity-modulemd_custom]
-name=Copr Modularity repo
-failovermethod=priority
-baseurl=file:///var/lib/copr/public_html/results/@modularity/modulemd/fedora-$releasever-x86_64/
-        http://209.132.184.48/results/@modularity/modulemd/fedora-$releasever-x86_64/
-        https://copr-be.cloud.fedoraproject.org/results/@modularity/modulemd/fedora-$releasever-x86_64/
-        http://172.25.32.109/results/@modularity/modulemd/fedora-$releasever-x86_64/
-
-gpgcheck=1
-gpgkey=https://copr-be.cloud.fedoraproject.org/results/@modularity/modulemd/pubkey.gpg
-enabled=1
-skip_if_unavailable=1

roles/copr/backend/files/yum/copr_local.repo

@@ -0,0 +1,10 @@
+[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

roles/copr/backend/tasks/main.yml

@@ -5,31 +5,20 @@
 - name: setup networking
   include: "network.yml"
 
-- name: install copr modularity repofile
+- name: install copr local path repo
-  copy: src="yum/_copr_@modularity-modulemd.custom.repo" dest="/etc/yum.repos.d/_copr_@modularity-modulemd.custom.repo"
+  copy: src="yum/copr_local.repo" dest="/etc/yum.repos.d/copr_local.repo"
   tags:
   - config
 
-- name: install python2-modulemd
-  shell: yum-deprecated install -y python2-modulemd || yum install -y python2-modulemd
-
-# BZ 1241507
-- name: install copr-backend
-  shell: yum-deprecated install -y copr-backend || yum install -y copr-backend
-- name: install copr-selinux
-  shell: yum-deprecated install -y copr-selinux || yum install -y copr-selinux
-
 - name: add packages for copr backend
   dnf: state=present name={{ item }}
   with_items:
-  #- copr-backend
+  - copr-backend
+  - copr-selinux
   - python-novaclient
   - python-glanceclient
   - python-neutronclient
   - python-keystoneclient
-  - obs-signd  # TODO: remove, since it will be installed as dependency by copr-backend
-  - redis  # we need this to start the service in next step
-  - python-futures  # remove when new version of copr-backend will be released
   - logstash
 
 - name: make copr dirs

roles/copr/base/files/yum/copr.repo

@@ -1,12 +1,10 @@
-[Copr]
+[group_copr-copr]
-name=Copr
+name=Copr repo for copr owned by @copr
-failovermethod=priority
+baseurl=https://copr-be.cloud.fedoraproject.org/results/@copr/copr/fedora-$releasever-$basearch/
-baseurl=file:///var/lib/copr/public_html/results/@copr/copr/fedora-$releasever-x86_64/
+type=rpm-md
-        http://209.132.184.48/results/@copr/copr/fedora-$releasever-x86_64/
+skip_if_unavailable=True
-        https://copr-be.cloud.fedoraproject.org/results/@copr/copr/fedora-$releasever-x86_64/
-        http://172.25.32.109/results/@copr/copr/fedora-$releasever-x86_64/
-
 gpgcheck=1
 gpgkey=https://copr-be.cloud.fedoraproject.org/results/@copr/copr/pubkey.gpg
+repo_gpgcheck=0
 enabled=1
-skip_if_unavailable=1
+enabled_metadata=1

roles/taskotron/taskotron-client/templates/namespaces.yaml.j2

@@ -14,6 +14,7 @@ namespaces_whitelist:
         - {{ grokmirror_user }}@{{ buildmaster }}:/var/lib/git/mirror/fedoraqa/rpmgrill/
         - {{ grokmirror_user }}@{{ buildmaster }}:/var/lib/git/mirror/fedoraqa/python-versions/
         - {{ grokmirror_user }}@{{ buildmaster }}:/var/lib/git/mirror/fedoraqa/check_modulemd/
+        - {{ grokmirror_user }}@{{ buildmaster }}:/var/lib/git/mirror/fedoraqa/rpmdeplint/
     pkg:
         # The directory used to be called rpms-checks
         - git://pkgs.fedoraproject.org/rpms-checks/

roles/taskotron/taskotron-trigger/templates/trigger_rules.yml.j2

@@ -24,7 +24,11 @@
     - {tasks: [abicheck]}
 - when: {message_type: KojiTagChanged}
   do:
+{% if deployment_type in ['dev'] %}
+    - {tasks: [depcheck, rpmdeplint]}
+{% else %}
     - {tasks: [depcheck]}
+{% endif %}
 - when:
     message_type: KojiTagChanged
     tag: {$regex: '/.*(?<!testing-pending)$$/'}