Merge pull request #52 from YunoHost/incus

Cleanup incus too
This commit is contained in:
Salamandar 2024-03-06 23:34:22 +01:00 committed by GitHub
commit cfbb67cee5
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 8 additions and 7 deletions

View file

@ -36,17 +36,17 @@ echo_bold () {
# -----------------------------------------------------------------
function tweak_yunohost() {
#echo_bold "> Setting up Yunohost..."
#local DIST="bullseye"
#local INSTALL_SCRIPT="https://install.yunohost.org/$DIST"
#curl $INSTALL_SCRIPT | bash -s -- -a
#echo_bold "> Running yunohost postinstall"
#yunohost tools postinstall --domain $domain --password $yuno_pwd
# What is it used for :| ...
#echo_bold "> Create Yunohost CI user"
#local ynh_ci_user=ynhci
@ -65,8 +65,8 @@ function tweak_yunohost() {
function tweak_yunorunner() {
echo_bold "> Tweaking YunoRunner..."
#if ! yunohost app list --output-as json --quiet | jq -e '.apps[] | select(.id == "yunorunner")' >/dev/null
#then
# yunohost app install --force https://github.com/YunoHost-Apps/yunorunner_ynh -a "domain=$domain&path=/$ci_path"
@ -202,7 +202,7 @@ EOF
function add_cron_jobs() {
echo_bold "> Configuring the CI..."
# Cron tasks
cat >> "/etc/cron.d/yunorunner" << EOF
# self-upgrade every night

1
run.py
View file

@ -570,6 +570,7 @@ async def cleanup_old_package_check_if_lock_exists(worker, job, ignore_error=Fal
# Dirty hack to kill ~zombi processes adopted by init doing funky stuff -_-
os.system("for PID in $(ps -ef --forest | grep 'lxc exec' | grep ' 1 ' | awk '{print $2}'); do kill -9 $PID; done")
os.system("for PID in $(ps -ef --forest | grep 'incus exec' | grep ' 1 ' | awk '{print $2}'); do kill -9 $PID; done")
os.system("for PID in $(ps -ef --forest | grep 'script -qefc' | grep ' 1 ' | awk '{print $2}' ); do kill $PID; done")