diff options
| author | thecalcaholic <6317548+theCalcaholic@users.noreply.github.com> | 2022-09-28 23:02:28 +0300 |
|---|---|---|
| committer | thecalcaholic <6317548+theCalcaholic@users.noreply.github.com> | 2022-09-28 23:02:28 +0300 |
| commit | f3292624eb6fb8954de8e9f233bf277ec88238ae (patch) | |
| tree | 766611392f46b173198ba96db5a8f7a93305e8b9 | |
| parent | 270fc64d0c5b51d91f6d6f5bedd367cbbc1a0a0f (diff) | |
run-parts.sh: Create backup before shutting down services
Signed-off-by: thecalcaholic <6317548+theCalcaholic@users.noreply.github.com>
| -rw-r--r-- | .github/workflows/build-docker.yml | 5 | ||||
| -rwxr-xr-x | build/docker/debian-ncp/run-parts.sh | 7 |
2 files changed, 7 insertions, 5 deletions
diff --git a/.github/workflows/build-docker.yml b/.github/workflows/build-docker.yml index a7c4d9bf..3d96f996 100644 --- a/.github/workflows/build-docker.yml +++ b/.github/workflows/build-docker.yml @@ -129,8 +129,7 @@ jobs: echo 'CONTAINER:: ==========' docker logs -f nextcloudpi |& awk '{ print "CONTAINER::" $0 }' & docker exec nextcloudpi bash -c 'tail -f /var/log/ncp.log' |& awk '{ print "NCP::" $0 }' & - cmd=(python activation_tests.py --no-gui localhost 8443 4443) - [[ "${ARCH?}" == "x86" ]] || cmd+=(--timeout 300) + [[ "${ARCH?}" == "x86" ]] || sleep 30 sleep 20 @@ -239,6 +238,7 @@ jobs: echo ":: System Tests (attempt $attempt/3) ::" python system_tests.py --no-ping --non-interactive || { echo "CI:: System test (attempt $attempt) failed!" + sleep 5 continue } success=true @@ -257,6 +257,7 @@ jobs: python nextcloud_tests.py --no-gui localhost 8443 4443 || { tail -n 20 geckodriver.log >&2 || true echo "CI:: Nextcloud test (attempt $attempt/3) failed!" + sleep 5 continue } success=true diff --git a/build/docker/debian-ncp/run-parts.sh b/build/docker/debian-ncp/run-parts.sh index 15516e7e..f87cf271 100755 --- a/build/docker/debian-ncp/run-parts.sh +++ b/build/docker/debian-ncp/run-parts.sh @@ -2,9 +2,6 @@ cleanup() { - for file in $( ls -1rv /etc/services-enabled.d ); do - /etc/services-enabled.d/"$file" stop "$1" - done if [[ -z "$NOBACKUP" ]] || [[ "$NOBACKUP" != "true" ]] then BKPDIR=/data/docker-shutdown-backups/ @@ -31,6 +28,10 @@ cleanup() echo 'WARN: Backup creation failed' fi fi + + for file in $( ls -1rv /etc/services-enabled.d ); do + /etc/services-enabled.d/"$file" stop "$1" + done exit } |