Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
6 changes: 3 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
````

Expand Down Expand Up @@ -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.
Expand Down
27 changes: 8 additions & 19 deletions lib/curl_tests.py
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
8 changes: 0 additions & 8 deletions lib/parse_tests_toml.py
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
2 changes: 1 addition & 1 deletion package_check.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down