diff --git a/README.md b/README.md index ffb5e6b..ebc5ae6 100644 --- a/README.md +++ b/README.md @@ -51,7 +51,7 @@ You can select the architecture, the debian version and/or the Yunohost Branch b ````bash ARCH=amd64 -DIST=bullseye +DIST=bookworm YNH_BRANCH=stable ```` @@ -103,13 +103,13 @@ The app is expected to contain a `tests.toml` file (see below) to tell package_c Install the package `qemu-user-static` and `binfmt-support`, then list of all available images : ```bash -lxc image list images:debian/bullseye +lxc image list images:debian/bookworm ``` Export the image of the architecture you want to run (for example armhf): ```bash -lxc image export images:debian/bullseye/armhf +lxc image export images:debian/bookworm/armhf ``` This command will create two files. diff --git a/lib/curl_tests.py b/lib/curl_tests.py index 9ec4da5..a4bbf88 100644 --- a/lib/curl_tests.py +++ b/lib/curl_tests.py @@ -135,25 +135,14 @@ def test( if logged_on_sso: cookies = tempfile.NamedTemporaryFile().name - if DIST == "bullseye": - code, content, log_url = curl( - f"https://{DOMAIN}/yunohost/sso/", - save_cookies=cookies, - post={"user": USER, "password": PASSWORD}, - referer=f"https://{DOMAIN}/yunohost/sso/", - ) - assert ( - code == 200 and os.system(f"grep -q '{DOMAIN}' {cookies}") == 0 - ), f"Failed to log in: got code {code} or cookie file was empty?" - else: - code, content, _ = curl( - f"https://{domain}/yunohost/portalapi/login", - save_cookies=cookies, - post={"credentials": f"{USER}:{PASSWORD}"}, - ) - assert ( - code == 200 and content == "Logged in" - ), f"Failed to log in: got code {code} and content: {content}" + code, content, _ = curl( + f"https://{domain}/yunohost/portalapi/login", + save_cookies=cookies, + post={"credentials": f"{USER}:{PASSWORD}"}, + ) + assert ( + code == 200 and content == "Logged in" + ), f"Failed to log in: got code {code} and content: {content}" else: cookies = None diff --git a/lib/parse_tests_toml.py b/lib/parse_tests_toml.py index 9060aee..4055a3b 100755 --- a/lib/parse_tests_toml.py +++ b/lib/parse_tests_toml.py @@ -54,14 +54,6 @@ def generate_test_list_base( else: yield test_suite_id, "install.nourl", default_meta - if ( - os.environ.get("DIST") == "bullseye" - and is_webapp - and ("is_public" in install_args or "init_main_permission" in install_args) - ): - # Testing private vs. public install doesnt make that much sense, remote it for bookworm etc... - yield test_suite_id, "install.private", default_meta - if is_multi_instance: yield test_suite_id, "install.multi", default_meta diff --git a/package_check.sh b/package_check.sh index bc0d247..fdef595 100755 --- a/package_check.sh +++ b/package_check.sh @@ -22,7 +22,7 @@ print_help() { -h, --help Display this help Pass YNHDEV_BACKEND=incus|lxd to use a specific LXD-compatible backend. - Pass DIST=bullseye|bookworm to use a specific distribution version + Pass DIST=bookworm|trixie to use a specific distribution version Pass YNH_BRANCH=stable|unstable to use a specific Yunohost branch EOF