Merge pull request #677 from SUSE/repo_url_fix

Repo url fix & remove xfail

bci_tester/data.py

@@ -214,7 +214,9 @@ def create_container_version_mark(
 
 
 if BCI_DEVEL_REPO is None:
-    BCI_DEVEL_REPO = f"https://updates.suse.com/SUSE/Products/SLE-BCI/{OS_MAJOR_VERSION}-SP{OS_SP_VERSION}/{LOCALHOST.system_info.arch}/product/"
+    # from SLE 15 SP6 onward we use the unauthenticated CDN
+    cdn_prefix = "installer-updates" if OS_SP_VERSION >= 6 else "updates"
+    BCI_DEVEL_REPO = f"https://{cdn_prefix}.suse.com/SUSE/Products/SLE-BCI/{OS_MAJOR_VERSION}-SP{OS_SP_VERSION}/{LOCALHOST.system_info.arch}/product/"
     _BCI_REPLACE_REPO_CONTAINERFILE = ""
 else:
     bci_repo_path = f"/etc/zypp/repos.d/{BCI_REPO_NAME}.repo"

tests/test_all.py

@@ -380,13 +380,6 @@ def test_no_orphaned_packages(container_per_test: ContainerData) -> None:
 @pytest.mark.parametrize(
     "container", CONTAINERS_WITH_ZYPPER_AS_ROOT, indirect=True
 )
-@pytest.mark.xfail(
-    OS_VERSION in ("15.7",),
-    reason=(
-        "zypper verify fails for invalid repo URLs, "
-        "but not if no repositories are defined"
-    ),
-)
 def test_zypper_verify_passes(container: ContainerData) -> None:
     """Check that there are no packages missing according to zypper verify so that
     users of the container would not get excessive dependencies installed.