diff --git a/inventory/group_vars/blockerbugs_stg b/inventory/group_vars/blockerbugs_stg index 8073f7f2fa..ffeeb37241 100644 --- a/inventory/group_vars/blockerbugs_stg +++ b/inventory/group_vars/blockerbugs_stg @@ -30,7 +30,7 @@ blockerbugs_bugzilla_url: 'https://bugzilla.redhat.com/' blockerbugs_bodhi_url: 'https://bodhi.fedoraproject.org/' blockerbugs_koji_url: "http://koji.fedoraproject.org/" # these are to use stg stuff but that often doesn't work well -#blockerbugs_bugzilla_url: 'https://partner-bugzilla.redhat.com/' +#blockerbugs_bugzilla_url: 'https://bugzilla.stage.redhat.com/' #blockerbugs_bodhi_url: 'https://bodhi.stg.fedoraproject.org/' ############################################################ diff --git a/roles/blockerbugs/templates/blockerbugs-settings.py.j2 b/roles/blockerbugs/templates/blockerbugs-settings.py.j2 index b81072ebb5..ed8bb2cf77 100644 --- a/roles/blockerbugs/templates/blockerbugs-settings.py.j2 +++ b/roles/blockerbugs/templates/blockerbugs-settings.py.j2 @@ -9,9 +9,9 @@ FAS_CHECK_CERT = False PRODUCTION = False FAS_ENABLED = True SQLALCHEMY_TRACK_MODIFICATIONS = False -BUGZILLA_URL = 'https://partner-bugzilla.redhat.com/' +BUGZILLA_URL = 'https://bugzilla.stage.redhat.com/' BODHI_URL = 'https://bodhi.stg.fedoraproject.org/' -KOJI_URL = 'https://partner-bugzilla.redhat.com/' +KOJI_URL = 'https://bugzilla.stage.redhat.com/' {% else %} BUGZILLA_URL = '{{ blockerbugs_bugzilla_url }}' BODHI_URL = '{{ blockerbugs_bodhi_url }}' diff --git a/roles/bodhi2/base/templates/production.ini.j2 b/roles/bodhi2/base/templates/production.ini.j2 index 0817d8bf2b..12d33fbf2e 100644 --- a/roles/bodhi2/base/templates/production.ini.j2 +++ b/roles/bodhi2/base/templates/production.ini.j2 @@ -509,8 +509,8 @@ bugtracker = bugzilla bz_server = https://bugzilla.redhat.com/xmlrpc.cgi bz_server_rest = https://bugzilla.redhat.com/rest/ {% elif env == 'staging' %} -bz_server = https://partner-bugzilla.redhat.com/xmlrpc.cgi -bz_server_rest = https://partner-bugzilla.redhat.com/rest/ +bz_server = https://bugzilla.stage.redhat.com/xmlrpc.cgi +bz_server_rest = https://bugzilla.stage.redhat.com/rest/ {% endif %} # Bodhi will avoid touching bugs that are not against the following comma-separated products. @@ -527,7 +527,7 @@ bz_exclude_rels = ELN {% if env == 'production' %} buglink = https://bugzilla.redhat.com/show_bug.cgi?id=%%s {% elif env == 'staging' %} -buglink = https://partner-bugzilla.redhat.com/show_bug.cgi?id=%%s +buglink = https://bugzilla.stage.redhat.com/show_bug.cgi?id=%%s {% endif %} ## diff --git a/roles/bugzilla2fedmsg/templates/bugzilla2fedmsg.ini b/roles/bugzilla2fedmsg/templates/bugzilla2fedmsg.ini index e8f4dba288..e054546c2f 100644 --- a/roles/bugzilla2fedmsg/templates/bugzilla2fedmsg.ini +++ b/roles/bugzilla2fedmsg/templates/bugzilla2fedmsg.ini @@ -13,7 +13,7 @@ moksha.threadpool_size = 5 # These are credentials used to log in to bugzilla {% if env == 'staging' %} -bugzilla.url = https://partner-bugzilla.redhat.com +bugzilla.url = https://bugzilla.stage.redhat.com {% else %} bugzilla.url = https://bugzilla.redhat.com {% endif %} diff --git a/roles/distgit/pagure/templates/pagure-sync-bugzilla.py.j2 b/roles/distgit/pagure/templates/pagure-sync-bugzilla.py.j2 index 0a55a86992..e56b613de5 100644 --- a/roles/distgit/pagure/templates/pagure-sync-bugzilla.py.j2 +++ b/roles/distgit/pagure/templates/pagure-sync-bugzilla.py.j2 @@ -82,7 +82,7 @@ def retry_session(): {% if env == 'staging' %} -BZSERVER = 'https://partner-bugzilla.redhat.com' +BZSERVER = 'https://bugzilla.stage.redhat.com' {% else %} BZSERVER = 'https://bugzilla.redhat.com' {% endif %} diff --git a/roles/ipsilon/templates/saml2_data b/roles/ipsilon/templates/saml2_data index 8bfc9ad4bd..37becb6c96 100644 --- a/roles/ipsilon/templates/saml2_data +++ b/roles/ipsilon/templates/saml2_data @@ -37,11 +37,11 @@ partnerbz5 name = Partner Bugzilla partnerbz5 Allowed Attributes = ["email"] partnerbz5 metadata = MIIF8zCCBNugAwIBAgIED/8LBjANBgkqhkiG9w0BAQsFADBBMRAwDgYDVQQKDAdSZWQgSGF0MQ0wCwYDVQQLDARwcm9kMR4wHAYDVQQDDBVDZXJ0aWZpY2F0ZSBBdXRob3JpdHkwHhcNMTgwNzE4MDIxNDI3WhcNMjAwNzE3MDIxNDI3WjCBuTELMAkGA1UEBhMCVVMxFzAVBgNVBAgMDk5vcnRoIENhcm9saW5hMRAwDgYDVQQHDAdSYWxlaWdoMRYwFAYDVQQKDA1SZWQgSGF0LCBJbmMuMRMwEQYDVQQLDApQblQgRGV2T3BzMS4wLAYDVQQDDCVidWd6aWxsYS5hcHAuc3RhZ2UuYnoucGh4Mi5yZWRoYXQuY29tMSIwIAYJKoZIhvcNAQkBFhNoZWxwLW9wc0ByZWRoYXQuY29tMIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEAxPFZWR1mA6ITQXh2+ni1R1sd7++jNzJ6kTsZpPmusiuE4oQFmIKhrj63mrE4sZK+GIK3+2potM6qlOtxzH90iPEi1bElcroF+o+jrpHX+Cd2qS22f/6izfvSsFT2rzG8K0cNKWJZTZ/+p08bjU/SjPl+zQjTixwD/JOhIE0RX1i8G3RlsYYND8T0XTM/05fVDUd2fCjFocWDrpma4bvcNbLFQiFxW0ya/XocojwyvafP5geCkDwuTHmNNkUJ90yehOAJjjRJHOGx4OockBFYct/CINe1pX2BQmJMeYBA+8HVt4Wsxlmoml9zAzV26B0/dy8CmxOm235ZphRMxOjWmJvgXZHRaV7KNnOQrLoh22EsQYlhAYz1JMo183qXpPPF6JqyH63ggopj9iED71ICVjwc4aspmky0mjh50TFxiX+IYH9Kf3jxSpykKZ79kF1f9JDusFBkWMUQhoMTGvU8BLpD2SrzCKie3Xuefih9Pq37gqE2kUQbB4LK1pp9U0x3/FQ84oXEH+Ul42U9/k97BQxxgimYenIQaqnATjkPNpqvSZIMETQMwGuvQa6mDI71EkopweJmqX4L01l7K14WvSDzMlvK57LAPDErYehYEaCW9EsOKSm9RhsjX2WxOM4wdzZ77laCLymsWG6hGNg3Rfe7yTzMbPRVL8txkijeUxkCAwEAAaOCAXgwggF0MB8GA1UdIwQYMBaAFHvaCfVJXdnXXMk2+FXSG5eeES9+MIHkBgNVHREEgdwwgdmCJWJ1Z3ppbGxhLmFwcC5zdGFnZS5iei5waHgyLnJlZGhhdC5jb22CKWJ1Z3dlYi12bS0wMS5hcHAuc3RhZ2UuYnoucGh4Mi5yZWRoYXQuY29tgixzdmNiei1idWd3ZWItMDEuYXBwLnN0YWdlLmJ6LnBoeDIucmVkaGF0LmNvbYIpYnVnd2ViLXZtLTAyLmFwcC5zdGFnZS5iei5waHgyLnJlZGhhdC5jb22CLHN2Y2J6LWJ1Z3dlYi0wMi5hcHAuc3RhZ2UuYnoucGh4Mi5yZWRoYXQuY29tMDsGCCsGAQUFBwEBBC8wLTArBggrBgEFBQcwAYYfaHR0cDovL29jc3AucmVkaGF0LmNvbS9jYS9vY3NwLzAOBgNVHQ8BAf8EBAMCBPAwHQYDVR0lBBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMCMA0GCSqGSIb3DQEBCwUAA4IBAQDC3FCBSEw+RPesm7K98BVHUI5fbZwCJLpKL1BNTk4cMeNKGJ+49FCrnmtxciF9+HX5e4MuRnZsuAbLeWy8O5DqG6Oh0w9MrWrJ1HjjTDB8R0Z+yYrMpqd/t0Jajay07VcDqcqWSoPQGrKqKFlGtX63Q+Zz05xY0A+Slf29iEklYSvzdOSvZqqegi1XhN9fKCvH60WL7MNlF8wg3hup7VlgIUsWyjOwWKThKAY3M7Zr2BrlqprU6bjBupF+1zDLrF6M1IFCbdHd/IJwPcoxE5/TWf6glIr9qz+yMBbcWQJd/TtgXcyJQf1yt/sWiIT08o9/67p68C/3FltrfiR8XVZoMIIF8zCCBNugAwIBAgIED/8LBjANBgkqhkiG9w0BAQsFADBBMRAwDgYDVQQKDAdSZWQgSGF0MQ0wCwYDVQQLDARwcm9kMR4wHAYDVQQDDBVDZXJ0aWZpY2F0ZSBBdXRob3JpdHkwHhcNMTgwNzE4MDIxNDI3WhcNMjAwNzE3MDIxNDI3WjCBuTELMAkGA1UEBhMCVVMxFzAVBgNVBAgMDk5vcnRoIENhcm9saW5hMRAwDgYDVQQHDAdSYWxlaWdoMRYwFAYDVQQKDA1SZWQgSGF0LCBJbmMuMRMwEQYDVQQLDApQblQgRGV2T3BzMS4wLAYDVQQDDCVidWd6aWxsYS5hcHAuc3RhZ2UuYnoucGh4Mi5yZWRoYXQuY29tMSIwIAYJKoZIhvcNAQkBFhNoZWxwLW9wc0ByZWRoYXQuY29tMIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEAxPFZWR1mA6ITQXh2+ni1R1sd7++jNzJ6kTsZpPmusiuE4oQFmIKhrj63mrE4sZK+GIK3+2potM6qlOtxzH90iPEi1bElcroF+o+jrpHX+Cd2qS22f/6izfvSsFT2rzG8K0cNKWJZTZ/+p08bjU/SjPl+zQjTixwD/JOhIE0RX1i8G3RlsYYND8T0XTM/05fVDUd2fCjFocWDrpma4bvcNbLFQiFxW0ya/XocojwyvafP5geCkDwuTHmNNkUJ90yehOAJjjRJHOGx4OockBFYct/CINe1pX2BQmJMeYBA+8HVt4Wsxlmoml9zAzV26B0/dy8CmxOm235ZphRMxOjWmJvgXZHRaV7KNnOQrLoh22EsQYlhAYz1JMo183qXpPPF6JqyH63ggopj9iED71ICVjwc4aspmky0mjh50TFxiX+IYH9Kf3jxSpykKZ79kF1f9JDusFBkWMUQhoMTGvU8BLpD2SrzCKie3Xuefih9Pq37gqE2kUQbB4LK1pp9U0x3/FQ84oXEH+Ul42U9/k97BQxxgimYenIQaqnATjkPNpqvSZIMETQMwGuvQa6mDI71EkopweJmqX4L01l7K14WvSDzMlvK57LAPDErYehYEaCW9EsOKSm9RhsjX2WxOM4wdzZ77laCLymsWG6hGNg3Rfe7yTzMbPRVL8txkijeUxkCAwEAAaOCAXgwggF0MB8GA1UdIwQYMBaAFHvaCfVJXdnXXMk2+FXSG5eeES9+MIHkBgNVHREEgdwwgdmCJWJ1Z3ppbGxhLmFwcC5zdGFnZS5iei5waHgyLnJlZGhhdC5jb22CKWJ1Z3dlYi12bS0wMS5hcHAuc3RhZ2UuYnoucGh4Mi5yZWRoYXQuY29tgixzdmNiei1idWd3ZWItMDEuYXBwLnN0YWdlLmJ6LnBoeDIucmVkaGF0LmNvbYIpYnVnd2ViLXZtLTAyLmFwcC5zdGFnZS5iei5waHgyLnJlZGhhdC5jb22CLHN2Y2J6LWJ1Z3dlYi0wMi5hcHAuc3RhZ2UuYnoucGh4Mi5yZWRoYXQuY29tMDsGCCsGAQUFBwEBBC8wLTArBggrBgEFBQcwAYYfaHR0cDovL29jc3AucmVkaGF0LmNvbS9jYS9vY3NwLzAOBgNVHQ8BAf8EBAMCBPAwHQYDVR0lBBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMCMA0GCSqGSIb3DQEBCwUAA4IBAQDC3FCBSEw+RPesm7K98BVHUI5fbZwCJLpKL1BNTk4cMeNKGJ+49FCrnmtxciF9+HX5e4MuRnZsuAbLeWy8O5DqG6Oh0w9MrWrJ1HjjTDB8R0Z+yYrMpqd/t0Jajay07VcDqcqWSoPQGrKqKFlGtX63Q+Zz05xY0A+Slf29iEklYSvzdOSvZqqegi1XhN9fKCvH60WL7MNlF8wg3hup7VlgIUsWyjOwWKThKAY3M7Zr2BrlqprU6bjBupF+1zDLrF6M1IFCbdHd/IJwPcoxE5/TWf6glIr9qz+yMBbcWQJd/TtgXcyJQf1yt/sWiIT08o9/67p68C/3FltrfiR8XVZourn:oasis:names:tc:SAML:2.0:nameid-format:persistentAdministratorbugzilla-owner@redhat.com -partnerbz id = https://partner-bugzilla.redhat.com/saml2_metadata.cgi +partnerbz id = https://bugzilla.stage.redhat.com/saml2_metadata.cgi partnerbz type = SP partnerbz name = Partner Bugzilla partnerbz Allowed Attributes = ["email"] -partnerbz metadata = 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:oasis:names:tc:SAML:2.0:nameid-format:persistentAdministratorbugzilla-owner@redhat.com +partnerbz metadata = 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:oasis:names:tc:SAML:2.0:nameid-format:persistentAdministratorbugzilla-owner@redhat.com rhbz id = https://bugzilla.redhat.com/saml2_metadata.cgi rhbz type = SP diff --git a/roles/openshift-apps/review-stats/templates/config.cfg b/roles/openshift-apps/review-stats/templates/config.cfg index 6802dacf9b..1e47755de5 100644 --- a/roles/openshift-apps/review-stats/templates/config.cfg +++ b/roles/openshift-apps/review-stats/templates/config.cfg @@ -1,6 +1,6 @@ [review-stats] {% if env == "staging" %} -url = https://partner-bugzilla.redhat.com/xmlrpc.cgi +url = https://bugzilla.stage.redhat.com/xmlrpc.cgi {% else %} url = https://bugzilla.redhat.com/xmlrpc.cgi {% endif %} diff --git a/roles/openshift-apps/review-stats/templates/cron.yml b/roles/openshift-apps/review-stats/templates/cron.yml index 424c17fa41..dfd8ada0a1 100644 --- a/roles/openshift-apps/review-stats/templates/cron.yml +++ b/roles/openshift-apps/review-stats/templates/cron.yml @@ -18,7 +18,7 @@ spec: spec: hostAliases: - hostnames: - - partner-bugzilla.redhat.com + - bugzilla.stage.redhat.com ip: 209.132.183.72 containers: - name: build @@ -65,7 +65,7 @@ spec: spec: hostAliases: - hostnames: - - partner-bugzilla.redhat.com + - bugzilla.stage.redhat.com ip: 209.132.183.72 containers: - name: build diff --git a/roles/openshift-apps/the-new-hotness/files/deploymentconfig.yml b/roles/openshift-apps/the-new-hotness/files/deploymentconfig.yml index 038f805888..040610b5cc 100644 --- a/roles/openshift-apps/the-new-hotness/files/deploymentconfig.yml +++ b/roles/openshift-apps/the-new-hotness/files/deploymentconfig.yml @@ -25,7 +25,7 @@ items: spec: hostAliases: - hostnames: - - partner-bugzilla.redhat.com + - bugzilla.stage.redhat.com ip: 209.132.183.72 - hostnames: - apps.stg.fedoraproject.org diff --git a/roles/openshift-apps/the-new-hotness/templates/config.toml b/roles/openshift-apps/the-new-hotness/templates/config.toml index 2e5d4585e0..f1033e3b3c 100644 --- a/roles/openshift-apps/the-new-hotness/templates/config.toml +++ b/roles/openshift-apps/the-new-hotness/templates/config.toml @@ -104,7 +104,7 @@ enabled = true user = "{{ upstream_release_bugzilla_user }}" password = "{{ upstream_release_bugzilla_password }}" api_key = "" -url = "https://partner-bugzilla.redhat.com" +url = "https://bugzilla.stage.redhat.com" explanation_url = "https://stg.fedoraproject.org/wiki/Upstream_release_monitoring" {% else %} user = "" @@ -163,4 +163,4 @@ url = "https://release-monitoring.org" backend = "dogpile.cache.dbm" expiration_time = 300 arguments = {filename = "/var/tmp/the-new-hotness-cache.dbm"} -{% endif %} \ No newline at end of file +{% endif %} diff --git a/roles/packages3/web/templates/packages-app.ini.j2 b/roles/packages3/web/templates/packages-app.ini.j2 index 842c4aa6ca..f922ef4f9d 100644 --- a/roles/packages3/web/templates/packages-app.ini.j2 +++ b/roles/packages3/web/templates/packages-app.ini.j2 @@ -26,7 +26,7 @@ fedoracommunity.connector.mdapi.baseurl = https://apps{{env_suffix}}.fedoraproje fedoracommunity.connector.fas.baseurl = https://admin{{env_suffix}}.fedoraproject.org/accounts/ fedoracommunity.connector.icons.baseurl = http://dl-iad05.fedoraproject.org/pub/alt/screenshots {% if env == "staging" %} -fedoracommunity.connector.bugzilla.baseurl = https://partner-bugzilla.redhat.com/xmlrpc.cgi +fedoracommunity.connector.bugzilla.baseurl = https://bugzilla.stage.redhat.com/xmlrpc.cgi {% else %} fedoracommunity.connector.bugzilla.baseurl = https://bugzilla.redhat.com/xmlrpc.cgi {% endif %} diff --git a/roles/releng/templates/ftbfs.cfg.j2 b/roles/releng/templates/ftbfs.cfg.j2 index c7bfa3b5e5..73a2c320b6 100644 --- a/roles/releng/templates/ftbfs.cfg.j2 +++ b/roles/releng/templates/ftbfs.cfg.j2 @@ -3,7 +3,7 @@ bugzilla=https://bugzilla.redhat.com/ tracking=1927309 {% elif env == 'staging' %} -bugzilla=https://partner-bugzilla.redhat.com/ +bugzilla=https://bugzilla.stage.redhat.com/ tracking=1732434 {% endif %} username={{ ftbfs_bugzilla_account }}