diff options
| author | Mikolaj Izdebski <mizdebsk@redhat.com> | 2017-04-26 16:19:00 +0000 |
|---|---|---|
| committer | Mikolaj Izdebski <mizdebsk@redhat.com> | 2017-04-26 16:19:20 +0000 |
| commit | a3b31b0676ddabd62dba68ed0b90dd2b33ed4ed9 (patch) | |
| tree | 5159d7b4182601f67bd781eea1d823e8a1823544 | |
| parent | 499ff86b9fcaaf2c07b4ff91f17b080a930165f2 (diff) | |
| download | ansible-a3b31b0676ddabd62dba68ed0b90dd2b33ed4ed9.tar.gz ansible-a3b31b0676ddabd62dba68ed0b90dd2b33ed4ed9.tar.xz ansible-a3b31b0676ddabd62dba68ed0b90dd2b33ed4ed9.zip | |
Enable Koschei Copr plugin in staging
| -rw-r--r-- | roles/koschei/backend/tasks/main.yml | 3 | ||||
| -rw-r--r-- | roles/koschei/backend/templates/config-backend.cfg.j2 | 13 | ||||
| -rw-r--r-- | roles/koschei/frontend/tasks/main.yml | 1 | ||||
| -rw-r--r-- | roles/koschei/frontend/templates/config-frontend.cfg.j2 | 4 |
4 files changed, 21 insertions, 0 deletions
diff --git a/roles/koschei/backend/tasks/main.yml b/roles/koschei/backend/tasks/main.yml index d586005f7..a7667ede1 100644 --- a/roles/koschei/backend/tasks/main.yml +++ b/roles/koschei/backend/tasks/main.yml @@ -4,6 +4,7 @@ - koschei-admin - koschei-backend - koschei-backend-fedora + - koschei-backend-copr - postgresql tags: - koschei @@ -62,6 +63,8 @@ - config - fedmsgdconfig +# TODO install copr config, /etc/koschei/copr-config + - name: install koji client config file template: > src="koji.conf.j2" diff --git a/roles/koschei/backend/templates/config-backend.cfg.j2 b/roles/koschei/backend/templates/config-backend.cfg.j2 index 0ec2f09f6..e2668604a 100644 --- a/roles/koschei/backend/templates/config-backend.cfg.j2 +++ b/roles/koschei/backend/templates/config-backend.cfg.j2 @@ -83,7 +83,11 @@ config = { }, }, }, + {% if env == 'staging' %} + "plugins": ['pkgdb', 'fedmsg', 'copr'], + {% else %} "plugins": ['pkgdb', 'fedmsg'], + {% endif %} "fedmsg": { {% if env == 'staging' %} "topic": "org.fedoraproject.stg.buildsys", @@ -127,6 +131,15 @@ config = { {% endif %} "sync_tracked": True, }, + "copr": { + "require_admin": True, + "copr_owner": "mizdebsk", + "config_path": "/etc/koschei/copr-config", + "chroot_name": "custom-1-x86_64", + "max_builds": 15, + "default_schedule_count": 8, + "fedmsg_topic": "org.fedoraproject.prod.copr.build.end", + }, } # Local Variables: diff --git a/roles/koschei/frontend/tasks/main.yml b/roles/koschei/frontend/tasks/main.yml index c1933ee4a..128ddd911 100644 --- a/roles/koschei/frontend/tasks/main.yml +++ b/roles/koschei/frontend/tasks/main.yml @@ -3,6 +3,7 @@ with_items: - koschei-frontend - koschei-frontend-fedora + - koschei-frontend-copr - mod_auth_openid tags: - koschei diff --git a/roles/koschei/frontend/templates/config-frontend.cfg.j2 b/roles/koschei/frontend/templates/config-frontend.cfg.j2 index 559751caa..8569959b9 100644 --- a/roles/koschei/frontend/templates/config-frontend.cfg.j2 +++ b/roles/koschei/frontend/templates/config-frontend.cfg.j2 @@ -38,7 +38,11 @@ config = { }, }, }, + {% if env == 'staging' %} + "plugins": ['pkgdb', 'copr'], + {% else %} "plugins": ['pkgdb'], + {% endif %} "caching": { "plugin": { "pkgdb": { |