Enable recovery-check step

technowledgy · Mar 28, 2024 · 818e507 · 818e507
1 parent cf82e5f
commit 818e507
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 16 deletions.
diff --git a/.github/workflows/run.yaml b/.github/workflows/run.yaml
@@ -61,8 +61,6 @@ jobs:
             buildfarm-client:alpine \
               --from-source /mnt/source \
               --config ${{ matrix.builder }}.conf \
-              --skip-steps=recovery-check \
-              --skip-suites=recovery \
               ${{ matrix.branch }}
       - uses: actions/upload-artifact@5d5d22a31266ced268874388b861e4b58bb5c2f3 # v4.3.1
         if: always()

diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml
@@ -51,9 +51,7 @@ jobs:
             buildfarm-client:alpine \
               --test \
               --from-source /mnt/source \
-              --config ${{ matrix.builder }}.conf \
-              --skip-steps=recovery-check \
-              --skip-suites=recovery
+              --config ${{ matrix.builder }}.conf
       - uses: actions/upload-artifact@5d5d22a31266ced268874388b861e4b58bb5c2f3 # v4.3.1
         if: always()
         with:
@@ -64,4 +62,3 @@ jobs:
         if: github.ref == 'refs/heads/main'
         with:
           path: build
-          key: ${{ steps.restore-cache.outputs.cache-primary-key }}
diff --git a/Dockerfile b/Dockerfile
@@ -33,6 +33,7 @@ RUN apk add \
         perl-lwp-protocol-https \
         perl-mozilla-ca \
         python3-dev \
+        tini \
         tcl-dev \
         zlib-dev \
         zstd-dev
@@ -51,11 +52,5 @@ RUN git apply client.patch
 COPY docker-entrypoint.sh /
 COPY *.conf /usr/src
 
-ENTRYPOINT ["/docker-entrypoint.sh"]
-CMD [ \
-  "--test", \
-  "--config", \
-  "autoconf.conf", \
-  "--skip-steps=recovery-check", \
-  "--skip-suites=recovery" \
-]
+ENTRYPOINT ["/sbin/tini", "--", "/docker-entrypoint.sh"]
+CMD ["--test", "--config", "autoconf.conf"]
diff --git a/test.sh b/test.sh
@@ -17,6 +17,4 @@ docker run --rm \
     --test \
     --from-source /mnt/source \
     --config autoconf.conf \
-    --skip-steps=recovery-check \
-    --skip-suites=recovery \
     "$@"