Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Repo url fix & remove xfail #677

Merged
merged 2 commits into from
Dec 2, 2024
Merged

Repo url fix & remove xfail #677

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4e2643b
Fix the url to the SLE_BCI repo
dcermak Nov 29, 2024
019fb20
Remove no longer valid xfail for zypper verify failing in SP7
dcermak Nov 29, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion bci_tester/data.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
7 changes: 0 additions & 7 deletions tests/test_all.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
Loading