From 001d8c80fc9d8486a6343b487b40a4cd05464478 Mon Sep 17 00:00:00 2001 From: holger krekel Date: Sun, 12 Apr 2026 14:30:52 +0200 Subject: [PATCH] feat: re-use cmlxc workflow from chatmail/cmlxc to perform testing --- .github/workflows/ci.yaml | 32 +++++- .../workflows/test-and-deploy-ipv4only.yaml | 104 ------------------ .github/workflows/test-and-deploy.yaml | 97 ---------------- 3 files changed, 26 insertions(+), 207 deletions(-) delete mode 100644 .github/workflows/test-and-deploy-ipv4only.yaml delete mode 100644 .github/workflows/test-and-deploy.yaml diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 0c08a8d2..8b50e96c 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -1,15 +1,26 @@ -name: CI +name: Run unit-tests and container-based deploy+test verification on: - pull_request: + # Triggers when a PR is merged into main or a direct push occurs push: + branches: [ "main" ] + + # Triggers for any PR (and its subsequent commits) targeting the main branch + pull_request: + branches: [ "main" ] + +# Newest push wins: Prevents multiple runs from clashing and wasting runner efforts +concurrency: + group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }} + cancel-in-progress: true + jobs: tox: name: isolated chatmaild tests runs-on: ubuntu-latest steps: - - uses: actions/checkout@v4 + - uses: actions/checkout@v6 # Checkout pull request HEAD commit instead of merge commit # Otherwise `test_deployed_state` will be unhappy. with: @@ -24,7 +35,7 @@ jobs: name: deploy-chatmail tests runs-on: ubuntu-latest steps: - - uses: actions/checkout@v4 + - uses: actions/checkout@v6 - name: initenv run: scripts/initenv.sh @@ -38,5 +49,14 @@ jobs: - name: run deploy-chatmail offline tests run: pytest --pyargs cmdeploy - # all other cmdeploy commands require a staging server - # see https://github.com/deltachat/chatmail/issues/100 + lxc-test: + name: LXC deploy and test + uses: chatmail/cmlxc/.github/workflows/lxc-test.yml@v0.8.1 + with: + cmlxc_commands: | + cmlxc init + cmlxc deploy-cmdeploy --source ./repo -vv cm0 + cmlxc test-mini cm0 + cmlxc test-cmdeploy -vv cm0 + cmlxc deploy-cmdeploy --source ./repo -vv --ipv4-only cm1 + cmlxc test-cmdeploy -vv cm0 cm1 diff --git a/.github/workflows/test-and-deploy-ipv4only.yaml b/.github/workflows/test-and-deploy-ipv4only.yaml deleted file mode 100644 index 990963ec..00000000 --- a/.github/workflows/test-and-deploy-ipv4only.yaml +++ /dev/null @@ -1,104 +0,0 @@ -name: deploy on staging-ipv4.testrun.org, and run tests - -on: - push: - branches: - - main - pull_request: - paths-ignore: - - 'scripts/**' - - '**/README.md' - - 'CHANGELOG.md' - - 'LICENSE' - -jobs: - deploy: - name: deploy on staging-ipv4.testrun.org, and run tests - runs-on: ubuntu-latest - timeout-minutes: 30 - environment: - name: staging-ipv4.testrun.org - url: https://staging-ipv4.testrun.org/ - concurrency: staging-ipv4.testrun.org - steps: - - uses: actions/checkout@v4 - - - name: prepare SSH - run: | - mkdir ~/.ssh - echo "${{ secrets.STAGING_SSH_KEY }}" >> ~/.ssh/id_ed25519 - chmod 600 ~/.ssh/id_ed25519 - ssh-keyscan staging-ipv4.testrun.org > ~/.ssh/known_hosts - # save previous acme & dkim state - rsync -avz root@staging-ipv4.testrun.org:/var/lib/acme acme-ipv4 || true - rsync -avz root@staging-ipv4.testrun.org:/etc/dkimkeys dkimkeys-ipv4 || true - # store previous acme & dkim state on ns.testrun.org, if it contains useful certs - if [ -f dkimkeys-ipv4/dkimkeys/opendkim.private ]; then rsync -avz -e "ssh -o StrictHostKeyChecking=accept-new" dkimkeys-ipv4 root@ns.testrun.org:/tmp/ || true; fi - if [ "$(ls -A acme-ipv4/acme/certs)" ]; then rsync -avz -e "ssh -o StrictHostKeyChecking=accept-new" acme-ipv4 root@ns.testrun.org:/tmp/ || true; fi - # make sure CAA record isn't set - scp -o StrictHostKeyChecking=accept-new .github/workflows/staging-ipv4.testrun.org-default.zone root@ns.testrun.org:/etc/nsd/staging-ipv4.testrun.org.zone - ssh root@ns.testrun.org sed -i '/CAA/d' /etc/nsd/staging-ipv4.testrun.org.zone - ssh root@ns.testrun.org nsd-checkzone staging-ipv4.testrun.org /etc/nsd/staging-ipv4.testrun.org.zone - ssh root@ns.testrun.org systemctl reload nsd - - - name: rebuild staging-ipv4.testrun.org to have a clean VPS - run: | - curl -X POST \ - -H "Authorization: Bearer ${{ secrets.HETZNER_API_TOKEN }}" \ - -H "Content-Type: application/json" \ - -d '{"image":"debian-12"}' \ - "https://api.hetzner.cloud/v1/servers/${{ secrets.STAGING_IPV4_SERVER_ID }}/actions/rebuild" - - - run: scripts/initenv.sh - - - name: append venv/bin to PATH - run: echo venv/bin >>$GITHUB_PATH - - - name: upload TLS cert after rebuilding - run: | - echo " --- wait until staging-ipv4.testrun.org VPS is rebuilt --- " - rm ~/.ssh/known_hosts - while ! ssh -o ConnectTimeout=180 -o StrictHostKeyChecking=accept-new -v root@staging-ipv4.testrun.org id -u ; do sleep 1 ; done - ssh -o StrictHostKeyChecking=accept-new -v root@staging-ipv4.testrun.org id -u - # download acme & dkim state from ns.testrun.org - rsync -e "ssh -o StrictHostKeyChecking=accept-new" -avz root@ns.testrun.org:/tmp/acme-ipv4/acme acme-restore || true - rsync -avz root@ns.testrun.org:/tmp/dkimkeys-ipv4/dkimkeys dkimkeys-restore || true - # restore acme & dkim state to staging2.testrun.org - rsync -avz acme-restore/acme root@staging-ipv4.testrun.org:/var/lib/ || true - rsync -avz dkimkeys-restore/dkimkeys root@staging-ipv4.testrun.org:/etc/ || true - ssh -o StrictHostKeyChecking=accept-new -v root@staging-ipv4.testrun.org chown root:root -R /var/lib/acme || true - - - name: run deploy-chatmail offline tests - run: pytest --pyargs cmdeploy - - - name: setup dependencies - run: | - ssh root@staging-ipv4.testrun.org apt update - ssh root@staging-ipv4.testrun.org apt install -y git python3.11-venv python3-dev gcc - ssh root@staging-ipv4.testrun.org git clone https://github.com/chatmail/relay - ssh root@staging-ipv4.testrun.org "cd relay && git checkout " ${{ github.head_ref }} - ssh root@staging-ipv4.testrun.org "cd relay && scripts/initenv.sh" - - - name: initialize config - run: | - ssh root@staging-ipv4.testrun.org "cd relay && scripts/cmdeploy init staging-ipv4.testrun.org" - ssh root@staging-ipv4.testrun.org "sed -i 's#disable_ipv6 = False#disable_ipv6 = True#' relay/chatmail.ini" - ssh root@staging-ipv4.testrun.org "sed -i 's/#\s*mtail_address/mtail_address/' relay/chatmail.ini" - - - run: ssh root@staging-ipv4.testrun.org "cd relay && scripts/cmdeploy run --verbose --skip-dns-check --ssh-host localhost" - - - name: set DNS entries - run: | - ssh root@staging-ipv4.testrun.org "cd relay && scripts/cmdeploy dns --zonefile staging-generated.zone --ssh-host localhost" - ssh root@staging-ipv4.testrun.org cat relay/staging-generated.zone >> .github/workflows/staging-ipv4.testrun.org-default.zone - cat .github/workflows/staging-ipv4.testrun.org-default.zone - scp .github/workflows/staging-ipv4.testrun.org-default.zone root@ns.testrun.org:/etc/nsd/staging-ipv4.testrun.org.zone - ssh root@ns.testrun.org nsd-checkzone staging-ipv4.testrun.org /etc/nsd/staging-ipv4.testrun.org.zone - ssh root@ns.testrun.org systemctl reload nsd - - - name: cmdeploy test - run: ssh root@staging-ipv4.testrun.org "cd relay && CHATMAIL_DOMAIN2=ci-chatmail.testrun.org scripts/cmdeploy test --slow --ssh-host localhost" - - - name: cmdeploy dns - run: ssh root@staging-ipv4.testrun.org "cd relay && scripts/cmdeploy dns -v --ssh-host localhost" - diff --git a/.github/workflows/test-and-deploy.yaml b/.github/workflows/test-and-deploy.yaml deleted file mode 100644 index 2f744cb8..00000000 --- a/.github/workflows/test-and-deploy.yaml +++ /dev/null @@ -1,97 +0,0 @@ -name: deploy on staging2.testrun.org, and run tests - -on: - push: - branches: - - main - pull_request: - paths-ignore: - - 'scripts/**' - - '**/README.md' - - 'CHANGELOG.md' - - 'LICENSE' - -jobs: - deploy: - name: deploy on staging2.testrun.org, and run tests - runs-on: ubuntu-latest - timeout-minutes: 30 - environment: - name: staging2.testrun.org - url: https://staging2.testrun.org/ - concurrency: staging2.testrun.org - steps: - - uses: actions/checkout@v4 - - - name: prepare SSH - run: | - mkdir ~/.ssh - echo "${{ secrets.STAGING_SSH_KEY }}" >> ~/.ssh/id_ed25519 - chmod 600 ~/.ssh/id_ed25519 - ssh-keyscan staging2.testrun.org > ~/.ssh/known_hosts - # save previous acme & dkim state - rsync -avz root@staging2.testrun.org:/var/lib/acme . || true - rsync -avz root@staging2.testrun.org:/etc/dkimkeys . || true - # store previous acme & dkim state on ns.testrun.org, if it contains useful certs - if [ -f dkimkeys/opendkim.private ]; then rsync -avz -e "ssh -o StrictHostKeyChecking=accept-new" dkimkeys root@ns.testrun.org:/tmp/ || true; fi - if [ "$(ls -A acme/certs)" ]; then rsync -avz -e "ssh -o StrictHostKeyChecking=accept-new" acme root@ns.testrun.org:/tmp/ || true; fi - # make sure CAA record isn't set - scp -o StrictHostKeyChecking=accept-new .github/workflows/staging.testrun.org-default.zone root@ns.testrun.org:/etc/nsd/staging2.testrun.org.zone - ssh root@ns.testrun.org sed -i '/CAA/d' /etc/nsd/staging2.testrun.org.zone - ssh root@ns.testrun.org nsd-checkzone staging2.testrun.org /etc/nsd/staging2.testrun.org.zone - ssh root@ns.testrun.org systemctl reload nsd - - - name: rebuild staging2.testrun.org to have a clean VPS - run: | - curl -X POST \ - -H "Authorization: Bearer ${{ secrets.HETZNER_API_TOKEN }}" \ - -H "Content-Type: application/json" \ - -d '{"image":"debian-12"}' \ - "https://api.hetzner.cloud/v1/servers/${{ secrets.STAGING_SERVER_ID }}/actions/rebuild" - - - run: scripts/initenv.sh - - - name: append venv/bin to PATH - run: echo venv/bin >>$GITHUB_PATH - - - name: upload TLS cert after rebuilding - run: | - echo " --- wait until staging2.testrun.org VPS is rebuilt --- " - rm ~/.ssh/known_hosts - while ! ssh -o ConnectTimeout=180 -o StrictHostKeyChecking=accept-new -v root@staging2.testrun.org id -u ; do sleep 1 ; done - ssh -o StrictHostKeyChecking=accept-new -v root@staging2.testrun.org id -u - # download acme & dkim state from ns.testrun.org - rsync -e "ssh -o StrictHostKeyChecking=accept-new" -avz root@ns.testrun.org:/tmp/acme acme-restore || true - rsync -avz root@ns.testrun.org:/tmp/dkimkeys dkimkeys-restore || true - # restore acme & dkim state to staging2.testrun.org - rsync -avz acme-restore/acme root@staging2.testrun.org:/var/lib/ || true - rsync -avz dkimkeys-restore/dkimkeys root@staging2.testrun.org:/etc/ || true - ssh -o StrictHostKeyChecking=accept-new -v root@staging2.testrun.org chown root:root -R /var/lib/acme || true - - - name: add hpk42 key to staging server - run: ssh root@staging2.testrun.org 'curl -s https://github.com/hpk42.keys >> .ssh/authorized_keys' - - - name: run deploy-chatmail offline tests - run: pytest --pyargs cmdeploy - - - run: | - cmdeploy init staging2.testrun.org - sed -i 's/#\s*mtail_address/mtail_address/' chatmail.ini - - - run: cmdeploy run --verbose --skip-dns-check - - - name: set DNS entries - run: | - cmdeploy dns --zonefile staging-generated.zone --verbose - cat staging-generated.zone >> .github/workflows/staging.testrun.org-default.zone - cat .github/workflows/staging.testrun.org-default.zone - scp .github/workflows/staging.testrun.org-default.zone root@ns.testrun.org:/etc/nsd/staging2.testrun.org.zone - ssh root@ns.testrun.org nsd-checkzone staging2.testrun.org /etc/nsd/staging2.testrun.org.zone - ssh root@ns.testrun.org systemctl reload nsd - - - name: cmdeploy test - run: CHATMAIL_DOMAIN2=ci-chatmail.testrun.org cmdeploy test --slow - - - name: cmdeploy dns - run: cmdeploy dns -v -