From 512b8157584743ce88365f870a2bb0fc67eea75a Mon Sep 17 00:00:00 2001 From: Matt Prahl Date: Apr 20 2017 13:38:15 +0000 Subject: Merge #506 `Use prod services in BaseConfiguration and staging in TestConfiguration.` --- diff --git a/conf/config.py b/conf/config.py index 0dc82f3..5bf04df 100644 --- a/conf/config.py +++ b/conf/config.py @@ -30,13 +30,13 @@ class BaseConfiguration(object): KOJI_PROFILE = 'koji' KOJI_ARCHES = ['i686', 'armv7hl', 'x86_64'] KOJI_PROXYUSER = True - KOJI_REPOSITORY_URL = 'https://kojipkgs.stg.fedoraproject.org/repos' + KOJI_REPOSITORY_URL = 'https://kojipkgs.fedoraproject.org/repos' KOJI_TAG_PREFIXES = ['module'] COPR_CONFIG = '/etc/module-build-service/copr.conf' - PDC_URL = 'http://modularity.fedorainfracloud.org:8080/rest_api/v1' + PDC_URL = 'http://pdc.fedoraproject.org/rest_api/v1' PDC_INSECURE = True PDC_DEVELOP = True - SCMURLS = ["git://pkgs.stg.fedoraproject.org/modules/"] + SCMURLS = ["git://pkgs.fedoraproject.org/modules/"] YAML_SUBMIT_ALLOWED = False # How often should we resort to polling, in seconds @@ -60,7 +60,7 @@ class BaseConfiguration(object): SSL_CERTIFICATE_KEY_FILE = '/etc/module-build-service/server.key' SSL_CA_CERTIFICATE_FILE = '/etc/module-build-service/cacert.pem' - PKGDB_API_URL = 'https://admin.stg.fedoraproject.org/pkgdb/api' + PKGDB_API_URL = 'https://admin.fedoraproject.org/pkgdb/api' ALLOWED_GROUPS = set([ 'packager', @@ -158,6 +158,10 @@ class TestConfiguration(BaseConfiguration): KOJI_PROFILE = 'staging' SERVER_NAME = 'localhost' + KOJI_REPOSITORY_URL = 'https://kojipkgs.stg.fedoraproject.org/repos' + SCMURLS = ["git://pkgs.stg.fedoraproject.org/modules/"] + PKGDB_API_URL = 'https://admin.stg.fedoraproject.org/pkgdb/api' + class ProdConfiguration(BaseConfiguration): pass