Skip to content

Commit 32a995c

Browse files
committed
ci: deploy with ssh_host=localhost on staging-ipv4
1 parent 09a6885 commit 32a995c

2 files changed

Lines changed: 13 additions & 7 deletions

File tree

.github/workflows/test-and-deploy-ipv4only.yaml

Lines changed: 12 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -72,15 +72,20 @@ jobs:
7272
run: pytest --pyargs cmdeploy
7373

7474
- run: |
75-
cmdeploy init staging-ipv4.testrun.org
76-
sed -i 's#disable_ipv6 = False#disable_ipv6 = True#' chatmail.ini
77-
sed -i 's/#\s*mtail_address/mtail_address/' chatmail.ini
75+
ssh -v root@staging-ipv4.testrun.org apt install -y git python3.11-venv
76+
ssh -v root@staging-ipv4.testrun.org git clone https://github.com/chatmail/relay
77+
ssh -v root@staging-ipv4.testrun.org "cd relay && git checkout " ${{ github.head_ref }}
78+
ssh -v root@staging-ipv4.testrun.org "cd relay && scripts/initenv.sh"
79+
ssh -v root@staging-ipv4.testrun.org "cd relay && scripts/cmdeploy init staging-ipv4.testrun.org"
80+
ssh -v root@staging-ipv4.testrun.org sed -i 's#disable_ipv6 = False#disable_ipv6 = True#' relay/chatmail.ini
81+
ssh -v root@staging-ipv4.testrun.org sed -i 's/#\s*mtail_address/mtail_address/' relay/chatmail.ini
7882
79-
- run: cmdeploy run --verbose --skip-dns-check
83+
- run: |
84+
ssh -v root@staging-ipv4.testrun.org "cd relay && cmdeploy run --verbose --skip-dns-check"
8085
8186
- name: set DNS entries
8287
run: |
83-
ssh -o StrictHostKeyChecking=accept-new -v root@staging-ipv4.testrun.org chown opendkim:opendkim -R /etc/dkimkeys
88+
ssh -v root@staging-ipv4.testrun.org chown opendkim:opendkim -R /etc/dkimkeys
8489
cmdeploy dns --zonefile staging-generated.zone
8590
cat staging-generated.zone >> .github/workflows/staging-ipv4.testrun.org-default.zone
8691
cat .github/workflows/staging-ipv4.testrun.org-default.zone
@@ -89,8 +94,8 @@ jobs:
8994
ssh root@ns.testrun.org systemctl reload nsd
9095
9196
- name: cmdeploy test
92-
run: CHATMAIL_DOMAIN2=ci-chatmail.testrun.org cmdeploy test --slow
97+
run: ssh -v root@staging-ipv4.testrun.org "cd relay && CHATMAIL_DOMAIN2=ci-chatmail.testrun.org cmdeploy test --slow"
9398

9499
- name: cmdeploy dns
95-
run: cmdeploy dns -v
100+
run: ssh -v root@staging-ipv4.testrun.org "cd relay && cmdeploy dns -v"
96101

.github/workflows/test-and-deploy.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -76,6 +76,7 @@ jobs:
7676

7777
- run: |
7878
cmdeploy init staging2.testrun.org
79+
sed -i 's#ssh_host = "localhost"#ssh_host = staging2.testrun.org#' chatmail.ini
7980
sed -i 's/#\s*mtail_address/mtail_address/' chatmail.ini
8081
8182
- run: cmdeploy run --verbose --skip-dns-check

0 commit comments

Comments
 (0)