[squash] [actions] combine test jobs and use LXC for systemd tests

1 files changed, 53 insertions, 74 deletions

diff --git a/.forgejo/workflows/forgejo-deb.yml b/.forgejo/workflows/forgejo-deb.yml
index 1c310e2..3662e9b 100644
--- a/.forgejo/workflows/forgejo-deb.yml
+++ b/.forgejo/workflows/forgejo-deb.yml
@@ -92,24 +92,8 @@ jobs:
             *.deb.sha256
             repo-deb/*.deb
 
-  installtest-bookworm-sqlite:
-    runs-on: bookworm
-    needs: [build-forgejo-deb]
-    steps:
-      - uses: actions/checkout@v4
-        
-      - name: "actions prep: installtest"
-        id: ciprep
-        run: ./.ci-make.sh actions-prep installtest
-
-      - uses: actions/download-artifact@v3
-        with:
-          name: forgejo-deb-${{ steps.ciprep.outputs.artifactlabel }}
-
-      - run: ./.ci-make.sh install-run-test ./forgejo-sqlite_*_amd64.deb
-
-  installtest-bullseye-sqlite:
-    runs-on: bullseye
+  multitest-bookworm-lxc:
+    runs-on: lxc-bookworm
     needs: [build-forgejo-deb]
     steps:
       - uses: actions/checkout@v4
@@ -117,67 +101,45 @@ jobs:
       - name: "actions prep: installtest"
         id: ciprep
         run: ./.ci-make.sh actions-prep installtest
-        
-      - uses: actions/download-artifact@v3
-        with:
-          name: forgejo-deb-${{ steps.ciprep.outputs.artifactlabel }}
-
-      - run: ./.ci-make.sh install-run-test ./forgejo-sqlite_*_amd64.deb
-
-  installtest-buster-sqlite:
-    runs-on: buster
-    needs: [build-forgejo-deb]
-    steps:
-      - uses: actions/checkout@v4
-        
-      - name: "actions prep: installtest"
-        id: ciprep
-        run: ./.ci-make.sh actions-prep installtest
 
       - uses: actions/download-artifact@v3
         with:
           name: forgejo-deb-${{ steps.ciprep.outputs.artifactlabel }}
 
       - run: ./.ci-make.sh install-run-test ./forgejo-sqlite_*_amd64.deb
-
-  installtest-bookworm-user:
-    runs-on: bookworm
-    needs: [build-forgejo-deb]
-    steps:
-      - uses: actions/checkout@v4
-
-      - name: "actions prep: installtest"
-        id: ciprep
-        run: ./.ci-make.sh actions-prep installtest
-
-      - uses: actions/download-artifact@v3
-        with:
-          name: forgejo-deb-${{ steps.ciprep.outputs.artifactlabel }}
-
+      - run: ./.ci-make.sh full-instance-clean
+      - run: ./.ci-make.sh install-run-test ./forgejo_*_amd64.deb
+      - run: ./.ci-make.sh full-instance-clean
+      - run: ./.ci-make.sh install-run-test ./forgejo-bin_*_amd64.deb
+      - run: ./.ci-make.sh full-instance-clean
+      - run: ./.ci-make.sh test-userinst-prep
+      - run: ./.ci-make.sh install-run-test ./forgejo-sqlite_*_amd64.deb
+      - run: ./.ci-make.sh full-instance-clean userinst
       - run: ./.ci-make.sh test-userinst-prep
       - run: ./.ci-make.sh install-run-test ./forgejo_*_amd64.deb
-
-  testsuite-repo-upgrade-sqlite:
-    runs-on: bookworm
-    needs: [build-forgejo-deb]
-    steps:
-      - uses: actions/checkout@v4
-
-      - name: "actions prep: installtest"
-        id: ciprep
-        run: ./.ci-make.sh actions-prep installtest
-
-      - uses: actions/download-artifact@v3
-        with:
-          name: forgejo-deb-${{ steps.ciprep.outputs.artifactlabel }}
-
+      - run: ./.ci-make.sh full-instance-clean userinst
+      - run: ./.ci-make.sh test-userinst-prep
+      - run: ./.ci-make.sh install-run-test ./forgejo-bin_*_amd64.deb
+      - run: ./.ci-make.sh full-instance-clean userinst
       - run: ./.ci-make.sh install-repo-test ./repo-deb/forgejo-deb-repo_0-0_all.deb forgejo-sqlite
-      - run: ./.ci-make.sh force-clean-forgejo
       - run: ./.ci-make.sh install-run-test ./forgejo-sqlite_*_amd64.deb
       - run: ./.ci-make.sh verify-data-dir-chmod
+      - run: ./.ci-make.sh full-instance-clean
+      - run: ./.ci-make.sh install-repo-test ./repo-deb/forgejo-deb-repo_0-0_all.deb forgejo
+      - run: ./.ci-make.sh install-run-test ./forgejo_*_amd64.deb
+      - run: ./.ci-make.sh verify-data-dir-chmod
+      - run: ./.ci-make.sh full-instance-clean
+      - run: ./.ci-make.sh install-repo-test ./repo-deb/forgejo-deb-repo_0-0_all.deb forgejo-bin
+      - run: ./.ci-make.sh install-run-test ./forgejo-bin_*_amd64.deb
+      - run: ./.ci-make.sh verify-data-dir-chmod
+      - run: ./.ci-make.sh full-instance-clean
+      - run: ./.ci-make.sh complex-test split-deb-upgrade -sqlite
+      - run: ./.ci-make.sh full-instance-clean
+      - run: ./.ci-make.sh complex-test split-deb-upgrade
+      - run: ./.ci-make.sh full-instance-clean
 
-  installtest-buster-bin:
-    runs-on: buster
+  multitest-bullseye-docker:
+    runs-on: bullseye
     needs: [build-forgejo-deb]
     steps:
       - uses: actions/checkout@v4
@@ -188,13 +150,24 @@ jobs:
 
       - uses: actions/download-artifact@v3
         with:
-          name: forgejo-deb-${{ steps.ciprep.outputs.artifactlabel }}
+          name: forgejo-deb-${{steps.ciprep.outputs.artifactlabel }}
 
+      - run: ./.ci-make.sh install-run-test ./forgejo-sqlite_*_amd64.deb
+      - run: ./.ci-make.sh force-clean-forgejo
+      - run: ./.ci-make.sh full-instance-clean
+      - run: ./.ci-make.sh install-run-test ./forgejo_*_amd64.deb
+      - run: ./.ci-make.sh force-clean-forgejo
+      - run: ./.ci-make.sh full-instance-clean
       - run: ./.ci-make.sh install-run-test ./forgejo-bin_*_amd64.deb
+      - run: ./.ci-make.sh force-clean-forgejo
+      - run: ./.ci-make.sh full-instance-clean
 
-  complextest-split-deb-upgrade:
-    runs-on: bookworm
+  multitest-buster-docker:
+    runs-on: buster
     needs: [build-forgejo-deb]
+    env:
+      TEST_DEBIAN_BUSTER: 1
+
     steps:
       - uses: actions/checkout@v4
 
@@ -204,15 +177,21 @@ jobs:
 
       - uses: actions/download-artifact@v3
         with:
-          name: forgejo-deb-${{ steps.ciprep.outputs.artifactlabel }}
+          name: forgejo-deb-${{steps.ciprep.outputs.artifactlabel }}
 
-      - run: ./.ci-make.sh complex-test split-deb-upgrade -sqlite
+      - run: ./.ci-make.sh install-run-test ./forgejo-sqlite_*_amd64.deb
+      - run: ./.ci-make.sh force-clean-forgejo
+      - run: ./.ci-make.sh full-instance-clean
+      - run: ./.ci-make.sh install-run-test ./forgejo_*_amd64.deb
+      - run: ./.ci-make.sh force-clean-forgejo
+      - run: ./.ci-make.sh full-instance-clean
+      - run: ./.ci-make.sh install-run-test ./forgejo-bin_*_amd64.deb
+      - run: ./.ci-make.sh force-clean-forgejo
       - run: ./.ci-make.sh full-instance-clean
-      - run: ./.ci-make.sh complex-test split-deb-upgrade
 
   publish-release-repo:
     runs-on: bookworm
-    needs: [installtest-bookworm-sqlite, installtest-bullseye-sqlite, installtest-buster-sqlite, installtest-bookworm-user, testsuite-repo-upgrade-sqlite, installtest-buster-bin, complextest-split-deb-upgrade]
+    needs: [multitest-bookworm-lxc, multitest-bullseye-docker, multitest-buster-docker]
     if: github.event_name == 'push' && contains(github.ref, 'refs/tags/') && github.repository == 'forgejo-contrib/forgejo-deb'
     steps:
       - uses: actions/checkout@v4