diff --git a/openqabot/__init__.py b/openqabot/__init__.py index 531b638..d816b65 100644 --- a/openqabot/__init__.py +++ b/openqabot/__init__.py @@ -7,7 +7,7 @@ OBS_MAINT_PRJ = "SUSE:Maintenance" OBS_GROUP = "qam-openqa" DEVELOPMENT_PARENT_GROUP_ID = 9 -DOWNLOAD_BASE = "http://download.suse.de/ibs/SUSE:/Maintenance:/" +DOWNLOAD_BASE = "http://mirror.nue2.suse.org/ibs/SUSE:/Maintenance:/" AMQP_URL = "amqps://suse:suse@rabbit.suse.de" OLDEST_APPROVAL_JOB_DAYS = 6 diff --git a/openqabot/loader/repohash.py b/openqabot/loader/repohash.py index e4e69d4..d392ea1 100644 --- a/openqabot/loader/repohash.py +++ b/openqabot/loader/repohash.py @@ -21,7 +21,7 @@ def get_max_revision( ) -> int: max_rev = 0 - url_base = f"http://download.suse.de/ibs/{project.replace(':',':/')}" + url_base = f"http://mirror.nue2.suse.org/ibs/{project.replace(':',':/')}" for repo in repos: # openSUSE and SLE incidents have different handling of architecture diff --git a/openqabot/types/incidents.py b/openqabot/types/incidents.py index 7bbe7d4..bcfef50 100644 --- a/openqabot/types/incidents.py +++ b/openqabot/types/incidents.py @@ -86,7 +86,7 @@ def _handle_incident( # pylint: disable=too-many-return-statements ci_url: Optional[str], ignore_onetime: bool, ) -> Dict[str, Any]: - DOWNLOAD_BASE = "http://download.suse.de/ibs/SUSE:/Maintenance:/" + DOWNLOAD_BASE = "http://mirror.nue2.suse.org/ibs/SUSE:/Maintenance:/" BASE_PRIO = 50 if self.filter_embargoed(flavor) and inc.embargoed: log.info( diff --git a/tests/test_approve.py b/tests/test_approve.py index 951e20e..34b979f 100644 --- a/tests/test_approve.py +++ b/tests/test_approve.py @@ -58,7 +58,7 @@ def fake_responses_for_unblocking_incidents_via_older_ok_result(request): json={ "job": { "settings": { - "BASE_TEST_REPOS": "http://download.suse.de/ibs/SUSE:/Maintenance:/1111/SUSE_Updates_SLE-Module-Basesystem_15-SP5_x86_64/,http://download.suse.de/ibs/SUSE:/Maintenance:/%s/SUSE_Updates_SLE-Module-Basesystem_15-SP5_x86_64/" + "BASE_TEST_REPOS": "http://mirror.nue2.suse.org/ibs/SUSE:/Maintenance:/1111/SUSE_Updates_SLE-Module-Basesystem_15-SP5_x86_64/,http://mirror.nue2.suse.org/ibs/SUSE:/Maintenance:/%s/SUSE_Updates_SLE-Module-Basesystem_15-SP5_x86_64/" % request.param } } diff --git a/tests/test_repohash.py b/tests/test_repohash.py index caeaf5b..f12db95 100644 --- a/tests/test_repohash.py +++ b/tests/test_repohash.py @@ -29,7 +29,7 @@ def test_get_max_revison_opensuse(): responses.add( responses.GET, - url="http://download.suse.de/ibs/SUSE:/Maintenance:/12345/SUSE_Updates_openSUSE-SLE_4.1/repodata/repomd.xml", + url="http://mirror.nue2.suse.org/ibs/SUSE:/Maintenance:/12345/SUSE_Updates_openSUSE-SLE_4.1/repodata/repomd.xml", body=opensuse, ) ret = rp.get_max_revision(repos, arch, PROJECT) @@ -43,12 +43,12 @@ def test_get_max_revison_opensuse(): def add_sles_sled_response(sled_body): responses.add( responses.GET, - url="http://download.suse.de/ibs/SUSE:/Maintenance:/12345/SUSE_Updates_SLES_15SP3_x86_64/repodata/repomd.xml", + url="http://mirror.nue2.suse.org/ibs/SUSE:/Maintenance:/12345/SUSE_Updates_SLES_15SP3_x86_64/repodata/repomd.xml", body=SLES, ) responses.add( responses.GET, - url="http://download.suse.de/ibs/SUSE:/Maintenance:/12345/SUSE_Updates_SLED_15SP3_x86_64/repodata/repomd.xml", + url="http://mirror.nue2.suse.org/ibs/SUSE:/Maintenance:/12345/SUSE_Updates_SLED_15SP3_x86_64/repodata/repomd.xml", body=sled_body, ) @@ -70,7 +70,7 @@ def test_get_max_revison_connectionerror(caplog): assert ( caplog.records[0].msg - == "http://download.suse.de/ibs/SUSE:/Maintenance:/12345/SUSE_Updates_SLED_15SP3_x86_64/repodata/repomd.xml not found -- skipping incident" + == "http://mirror.nue2.suse.org/ibs/SUSE:/Maintenance:/12345/SUSE_Updates_SLED_15SP3_x86_64/repodata/repomd.xml not found -- skipping incident" ) @@ -84,7 +84,7 @@ def test_get_max_revison_httperror(caplog): assert ( caplog.records[0].msg - == "http://download.suse.de/ibs/SUSE:/Maintenance:/12345/SUSE_Updates_SLED_15SP3_x86_64/repodata/repomd.xml not found -- skipping incident" + == "http://mirror.nue2.suse.org/ibs/SUSE:/Maintenance:/12345/SUSE_Updates_SLED_15SP3_x86_64/repodata/repomd.xml not found -- skipping incident" ) @@ -98,7 +98,7 @@ def test_get_max_revison_xmlerror(caplog): assert ( caplog.records[0].msg - == "http://download.suse.de/ibs/SUSE:/Maintenance:/12345/SUSE_Updates_SLED_15SP3_x86_64/repodata/repomd.xml not found -- skipping incident" + == "http://mirror.nue2.suse.org/ibs/SUSE:/Maintenance:/12345/SUSE_Updates_SLED_15SP3_x86_64/repodata/repomd.xml not found -- skipping incident" )