From 5405556ee53f41fb682e1828f692c558c67d0640 Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Sat, 13 Aug 2022 12:14:27 +0200 Subject: [PATCH 1/3] Update to bullseye --- README.md | 4 ++-- lib/common.sh | 5 ++--- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/README.md b/README.md index 1260aae..5c922a9 100644 --- a/README.md +++ b/README.md @@ -101,13 +101,13 @@ Then test your packages : Install the package `qemu-user-static` and `binfmt-support`, then list of all available images : ``` -lxc image list images:debian/buster +lxc image list images:debian/bullseye ``` Export the image of the architecture you want to run (for example armhf): ``` -lxc image export images:debian/buster/armhf +lxc image export images:debian/bullseye/armhf ``` This command will create two files. diff --git a/lib/common.sh b/lib/common.sh index 9663a64..5663f21 100644 --- a/lib/common.sh +++ b/lib/common.sh @@ -9,7 +9,7 @@ TEST_USER="package_checker" [[ -e "./config" ]] && source "./config" ARCH=${ARCH:-amd64} -DIST=${DIST:-buster} +DIST=${DIST:-bullseye} # Yunohost version: stable, testing or unstable YNH_BRANCH=${YNH_BRANCH:-stable} @@ -20,8 +20,7 @@ LXC_NAME="ynh-appci-$DIST-$ARCH-$YNH_BRANCH-test-${WORKER_ID}" readonly lock_file="./pcheck-${WORKER_ID}.lock" -DEFAULT_PHP_VERSION="7.3" -[[ "$DIST" == "bullseye" ]] && DEFAULT_PHP_VERSION="7.4" +DEFAULT_PHP_VERSION="7.4" #================================================= # LXC helpers From d218bbf61d5782aafcc1ac26869a18c39d7fc41c Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Sat, 13 Aug 2022 12:24:49 +0200 Subject: [PATCH 2/3] Fix caps --- lib/analyze_test_results.py | 2 +- lib/common.sh | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/lib/analyze_test_results.py b/lib/analyze_test_results.py index 499b998..0da8c34 100644 --- a/lib/analyze_test_results.py +++ b/lib/analyze_test_results.py @@ -136,7 +136,7 @@ def level_5(tests): @level(6, "App is in a community-operated git org") def level_6(tests): """ - The app is in the Yunohost-Apps organization + The app is in the YunoHost-Apps organization (the linter will report a warning named "is_in_github_org" if it's not) """ diff --git a/lib/common.sh b/lib/common.sh index 5663f21..65b0b1a 100644 --- a/lib/common.sh +++ b/lib/common.sh @@ -1,6 +1,6 @@ #!/bin/bash -# Yunohost install parameters +# YunoHost install parameters YUNO_PWD="admin" DOMAIN="domain.tld" SUBDOMAIN="sub.$DOMAIN" @@ -11,7 +11,7 @@ TEST_USER="package_checker" ARCH=${ARCH:-amd64} DIST=${DIST:-bullseye} -# Yunohost version: stable, testing or unstable +# YunoHost version: stable, testing or unstable YNH_BRANCH=${YNH_BRANCH:-stable} WORKER_ID=${WORKER_ID:-0} From 9eb0643d653de1df376828b974df8343f51e7897 Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Sat, 13 Aug 2022 12:26:44 +0200 Subject: [PATCH 3/3] Update lxc.sh --- lib/lxc.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/lxc.sh b/lib/lxc.sh index f2123fd..1c68ea2 100644 --- a/lib/lxc.sh +++ b/lib/lxc.sh @@ -6,7 +6,7 @@ LXC_CREATE () { log_info "Launching new LXC $LXC_NAME ..." - # Check if we can launch container from yunohost remote image + # Check if we can launch container from YunoHost remote image if lxc remote list | grep -q "yunohost" && lxc image list yunohost:$LXC_BASE | grep -q -w $LXC_BASE; then lxc launch yunohost:$LXC_BASE $LXC_NAME \ -c security.nesting=true \