Update koschei config for new release

This commit is contained in:
Michael Simacek 2016-02-26 15:22:19 +01:00
parent ba1d126598
commit 3f4015d805

View file

@ -13,22 +13,13 @@ config = {
"server": "http://{{ koschei_koji_hub }}/kojihub", "server": "http://{{ koschei_koji_hub }}/kojihub",
"topurl": "http://{{ koschei_kojipkgs }}", "topurl": "http://{{ koschei_kojipkgs }}",
"weburl": "http://{{ koschei_koji_web }}/koji", "weburl": "http://{{ koschei_koji_web }}/koji",
{% if env == 'staging' %}
"srpm_relative_path_root": "../vol/prod", "srpm_relative_path_root": "../vol/prod",
{% endif %}
{% if env == 'staging' %}
{# upcoming config change #}
"login_method": "ssl_login", "login_method": "ssl_login",
"login_args": { "login_args": {
"cert": "/etc/koschei/koschei.pem", "cert": "/etc/koschei/koschei.pem",
"ca": "/etc/koschei/fedora-ca.cert", "ca": "/etc/koschei/fedora-ca.cert",
"serverca": "/etc/koschei/fedora-ca.cert", "serverca": "/etc/koschei/fedora-ca.cert",
}, },
{% else %}
"cert": "/etc/koschei/koschei.pem",
"ca": "/etc/koschei/fedora-ca.cert",
"server_ca": "/etc/koschei/fedora-ca.cert",
{% endif %}
"source_tag": "{{ koschei_koji_tag }}", "source_tag": "{{ koschei_koji_tag }}",
"target_tag": "{{ koschei_koji_tag }}", "target_tag": "{{ koschei_koji_tag }}",
"build_tag": "{{ koschei_koji_tag }}-build", "build_tag": "{{ koschei_koji_tag }}-build",
@ -38,10 +29,7 @@ config = {
}, },
"load_threshold": 0.65, "load_threshold": 0.65,
"task_priority": 30, "task_priority": 30,
{% if env == 'staging' %}
{# upcoming config change #}
"repo_url": "http://{{ koschei_kojipkgs }}/repos/{build_tag}/{repo_id}/{arch}", "repo_url": "http://{{ koschei_kojipkgs }}/repos/{build_tag}/{repo_id}/{arch}",
{% endif %}
}, },
"dependency": { "dependency": {
"build_group": "build", "build_group": "build",
@ -50,21 +38,15 @@ config = {
"keep_build_deps_for": 1, "keep_build_deps_for": 1,
"local": False, "local": False,
"arches": ['x86_64', 'i386'], "arches": ['x86_64', 'i386'],
{% if env != 'staging' %}
"remote_repo": "http://{{ koschei_kojipkgs }}/repos/{{ koschei_koji_tag }}-build/{repo_id}/{arch}",
{% endif %}
# For upcoming paraller resolver
"cache_l1_capacity": 4, "cache_l1_capacity": 4,
"cache_l2_capacity": 128, "cache_l2_capacity": 128,
"cache_l1_threads": 1, "cache_l1_threads": 1,
"cache_l2_threads": 1, "cache_l2_threads": 1,
"cache_threads_max": 2, "cache_threads_max": 2,
{# hawkey on el7 doesn't support ignore_weak_deps and Koji is not {% if False %}
ignoring them either {# hawkey on el7 doesn't support ignore_weak_deps and Koji is not ignoring them either #}
{% if env == 'staging' %}
"ignore_weak_deps": True, "ignore_weak_deps": True,
{% endif %} {% endif %}
#}
}, },
"services": { "services": {
"watcher": { "watcher": {