diff --git a/.github/workflows/analysis-coverage.yml b/.github/workflows/analysis-coverage.yml index 874c1f18..53aedb7e 100644 --- a/.github/workflows/analysis-coverage.yml +++ b/.github/workflows/analysis-coverage.yml @@ -102,8 +102,8 @@ jobs: tar -xjf nextcloud-${{ matrix.nextcloud }}.tar.bz2 --strip-components 1 mkdir data php occ maintenance:install --verbose --database=mysql --database-name=nextcloud \ - --database-host=127.0.0.1 --database-user=root --database-pass=rootpassword \ - --admin-user admin --admin-pass ${{ env.NC_AUTH_PASS }} + --database-host=127.0.0.1 --database-user=root --database-pass=rootpassword \ + --admin-user admin --admin-pass ${{ env.NC_AUTH_PASS }} php occ config:system:set loglevel --value=1 --type=integer php occ config:system:set debug --value=true --type=boolean php occ config:system:set allow_local_remote_servers --value true @@ -133,10 +133,10 @@ jobs: echo $! > /tmp/_install.pid cd .. sleep 5s - php occ app_ecosystem_v2:daemon:register simulate_docker Docker docker-install unix-socket 0 0 - php occ app_ecosystem_v2:app:register \ - "{\"appid\":\"$APP_ID\",\"name\":\"$APP_ID\",\"daemon_config_name\":\"simulate_docker\",\"version\":\"$APP_VERSION\",\"secret\":\"$APP_SECRET\",\"host\":\"localhost\",\"port\":$APP_PORT,\"system_app\":1}" \ - -e --force-scopes + php occ app_ecosystem_v2:daemon:register manual_install "Manual Install" manual-install 0 0 0 + php occ app_ecosystem_v2:app:register $APP_ID manual_install --json-info \ + "{\"appid\":\"$APP_ID\",\"name\":\"$APP_ID\",\"daemon_config_name\":\"manual_install\",\"version\":\"$APP_VERSION\",\"secret\":\"$APP_SECRET\",\"host\":\"localhost\",\"port\":$APP_PORT,\"protocol\":\"http\",\"system_app\":1}" \ + -e --force-scopes kill -15 $(cat /tmp/_install.pid) timeout 3m tail --pid=$(cat /tmp/_install.pid) -f /dev/null @@ -226,8 +226,8 @@ jobs: tar -xjf nextcloud-${{ matrix.nextcloud }}.tar.bz2 --strip-components 1 mkdir data php occ maintenance:install --verbose --database=pgsql --database-name=${{ env.NC_dbname }} \ - --database-host=127.0.0.1 --database-user=root --database-pass=rootpassword \ - --admin-user admin --admin-pass ${{ env.NC_AUTH_PASS }} + --database-host=127.0.0.1 --database-user=root --database-pass=rootpassword \ + --admin-user admin --admin-pass ${{ env.NC_AUTH_PASS }} php occ config:system:set loglevel --value=1 php occ config:system:set debug --value=true --type=boolean php occ config:system:set allow_local_remote_servers --value true @@ -259,10 +259,10 @@ jobs: echo $! > /tmp/_install.pid cd .. sleep 5s - php occ app_ecosystem_v2:daemon:register simulate_docker Docker docker-install unix-socket 0 0 - php occ app_ecosystem_v2:app:register \ - "{\"appid\":\"$APP_ID\",\"name\":\"$APP_ID\",\"daemon_config_name\":\"simulate_docker\",\"version\":\"$APP_VERSION\",\"secret\":\"$APP_SECRET\",\"host\":\"localhost\",\"port\":$APP_PORT,\"system_app\":1}" \ - -e --force-scopes + php occ app_ecosystem_v2:daemon:register manual_install "Manual Install" manual-install 0 0 0 + php occ app_ecosystem_v2:app:register $APP_ID manual_install --json-info \ + "{\"appid\":\"$APP_ID\",\"name\":\"$APP_ID\",\"daemon_config_name\":\"manual_install\",\"version\":\"$APP_VERSION\",\"secret\":\"$APP_SECRET\",\"host\":\"localhost\",\"port\":$APP_PORT,\"protocol\":\"http\",\"system_app\":1}" \ + -e --force-scopes kill -15 $(cat /tmp/_install.pid) timeout 3m tail --pid=$(cat /tmp/_install.pid) -f /dev/null @@ -347,8 +347,8 @@ jobs: tar -xjf nextcloud-${{ matrix.nextcloud }}.tar.bz2 --strip-components 1 mkdir data php occ maintenance:install --verbose --database=oci --database-name=XE \ - --database-host=127.0.0.1 --database-port=1521 --database-user=useroracle --database-pass=userpassword \ - --admin-user admin --admin-pass ${{ env.NC_AUTH_PASS }} + --database-host=127.0.0.1 --database-port=1521 --database-user=useroracle --database-pass=userpassword \ + --admin-user admin --admin-pass ${{ env.NC_AUTH_PASS }} php occ config:system:set loglevel --value=1 --type=integer php occ config:system:set debug --value=true --type=boolean php occ config:system:set allow_local_remote_servers --value true @@ -378,10 +378,10 @@ jobs: echo $! > /tmp/_install.pid cd .. sleep 5s - php occ app_ecosystem_v2:daemon:register simulate_docker Docker docker-install unix-socket 0 0 - php occ app_ecosystem_v2:app:register \ - "{\"appid\":\"$APP_ID\",\"name\":\"$APP_ID\",\"daemon_config_name\":\"simulate_docker\",\"version\":\"$APP_VERSION\",\"secret\":\"$APP_SECRET\",\"host\":\"localhost\",\"port\":$APP_PORT,\"system_app\":1}" \ - -e --force-scopes + php occ app_ecosystem_v2:daemon:register manual_install "Manual Install" manual-install 0 0 0 + php occ app_ecosystem_v2:app:register $APP_ID manual_install --json-info \ + "{\"appid\":\"$APP_ID\",\"name\":\"$APP_ID\",\"daemon_config_name\":\"manual_install\",\"version\":\"$APP_VERSION\",\"secret\":\"$APP_SECRET\",\"host\":\"localhost\",\"port\":$APP_PORT,\"protocol\":\"http\",\"system_app\":1}" \ + -e --force-scopes kill -15 $(cat /tmp/_install.pid) timeout 3m tail --pid=$(cat /tmp/_install.pid) -f /dev/null @@ -457,8 +457,8 @@ jobs: run: | mkdir data ./occ maintenance:install --verbose --database=mysql --database-name=nextcloud \ - --database-host=127.0.0.1 --database-user=root --database-pass=rootpassword \ - --admin-user admin --admin-pass ${{ env.NC_AUTH_PASS }} + --database-host=127.0.0.1 --database-user=root --database-pass=rootpassword \ + --admin-user admin --admin-pass ${{ env.NC_AUTH_PASS }} ./occ config:system:set loglevel --value=0 --type=integer ./occ config:system:set debug --value=true --type=boolean ./occ config:system:set allow_local_remote_servers --value true @@ -488,10 +488,10 @@ jobs: echo $! > /tmp/_install.pid cd .. sleep 5s - php occ app_ecosystem_v2:daemon:register simulate_docker Docker docker-install unix-socket 0 0 - php occ app_ecosystem_v2:app:register \ - "{\"appid\":\"$APP_ID\",\"name\":\"$APP_ID\",\"daemon_config_name\":\"simulate_docker\",\"version\":\"$APP_VERSION\",\"secret\":\"$APP_SECRET\",\"host\":\"localhost\",\"port\":$APP_PORT,\"system_app\":1}" \ - -e --force-scopes + php occ app_ecosystem_v2:daemon:register manual_install "Manual Install" manual-install 0 0 0 + php occ app_ecosystem_v2:app:register $APP_ID manual_install --json-info \ + "{\"appid\":\"$APP_ID\",\"name\":\"$APP_ID\",\"daemon_config_name\":\"manual_install\",\"version\":\"$APP_VERSION\",\"secret\":\"$APP_SECRET\",\"host\":\"localhost\",\"port\":$APP_PORT,\"protocol\":\"http\",\"system_app\":1}" \ + -e --force-scopes kill -15 $(cat /tmp/_install.pid) timeout 3m tail --pid=$(cat /tmp/_install.pid) -f /dev/null @@ -588,10 +588,10 @@ jobs: echo $! > /tmp/_install.pid cd .. sleep 5s - php occ app_ecosystem_v2:daemon:register simulate_docker Docker docker-install unix-socket 0 0 - php occ app_ecosystem_v2:app:register \ - "{\"appid\":\"$APP_ID\",\"name\":\"$APP_ID\",\"daemon_config_name\":\"simulate_docker\",\"version\":\"$APP_VERSION\",\"secret\":\"$APP_SECRET\",\"host\":\"localhost\",\"port\":$APP_PORT,\"system_app\":1}" \ - -e --force-scopes + php occ app_ecosystem_v2:daemon:register manual_install "Manual Install" manual-install 0 0 0 + php occ app_ecosystem_v2:app:register $APP_ID manual_install --json-info \ + "{\"appid\":\"$APP_ID\",\"name\":\"$APP_ID\",\"daemon_config_name\":\"manual_install\",\"version\":\"$APP_VERSION\",\"secret\":\"$APP_SECRET\",\"host\":\"localhost\",\"protocol\":\"http\",\"port\":$APP_PORT,\"system_app\":1}" \ + -e --force-scopes kill -15 $(cat /tmp/_install.pid) timeout 3m tail --pid=$(cat /tmp/_install.pid) -f /dev/null diff --git a/scripts/dev_register.sh b/scripts/dev_register.sh index 5300b0b7..8f21de1f 100644 --- a/scripts/dev_register.sh +++ b/scripts/dev_register.sh @@ -1,17 +1,20 @@ #!/bin/bash -echo "creating fake deploy daemon for nextcloud 28 container" -docker exec master-nextcloud-1 sudo -u www-data php occ app_ecosystem_v2:daemon:unregister simulate_docker || true +echo "removing 'manual_install' deploy daemon for nextcloud 28 container" +docker exec master-nextcloud-1 sudo -u www-data php occ app_ecosystem_v2:daemon:unregister manual_install || true +echo "creating 'manual_install' deploy daemon for nextcloud 28 container" docker exec master-nextcloud-1 sudo -u www-data php occ app_ecosystem_v2:daemon:register \ - simulate_docker FakeDocker docker-install unix-socket 0 0 -echo "registering nc_py_api as an app for nextcloud 28 container" + manual_install "Manual Install" manual-install 0 0 0 +echo "unregistering nc_py_api as an app for nextcloud 28 container" docker exec master-nextcloud-1 sudo -u www-data php occ app_ecosystem_v2:app:unregister nc_py_api --silent || true +echo "registering nc_py_api as an app for nextcloud 28 container" NEXTCLOUD_URL="http://nextcloud.local" APP_PORT=9009 APP_ID="nc_py_api" APP_SECRET="12345" APP_VERSION="1.0.0" \ - python3 tests/_install.py & + python3 tests/_install.py > /dev/null 2>&1 & echo $! > /tmp/_install.pid sleep 7 -docker exec master-nextcloud-1 sudo -u www-data php occ app_ecosystem_v2:app:register \ - "{\"appid\":\"nc_py_api\",\"name\":\"NC_Py_API\",\"daemon_config_name\":\"simulate_docker\",\"version\":\"1.0.0\",\"secret\":\"12345\",\"host\":\"host.docker.internal\",\"port\":9009,\"system_app\":1}" \ +docker exec master-nextcloud-1 sudo -u www-data php occ app_ecosystem_v2:app:register nc_py_api manual_install --json-info \ + "{\"appid\":\"nc_py_api\",\"name\":\"NC_Py_API\",\"daemon_config_name\":\"manual_install\",\"version\":\"1.0.0\",\"secret\":\"12345\",\"host\":\"host.docker.internal\",\"port\":9009,\"protocol\":\"http\",\"system_app\":1}" \ -e --force-scopes cat /tmp/_install.pid kill -15 "$(cat /tmp/_install.pid)" +echo "nc_py_api - ready"