ci: Support multiple docker-compose tests.

Author: alexmv

.github/workflows/dockerfile.yaml

@@ -156,13 +156,30 @@ jobs:
           kubectl -n "$namespace" logs "$pod"
           kubectl -n "$namespace" exec "$pod" -c zulip -- cat /var/log/zulip/errors.log
 
+  docker-compose-collect:
+    runs-on: ubuntu-latest
+    outputs:
+      dirs: ${{ steps.dirs.outputs.dirs }}
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v5
+
+      - id: dirs
+        run: |
+          echo -n "dirs=" >> ${GITHUB_OUTPUT}
+          ls -d ci/*/ | jq --raw-input --slurp --compact-output 'split("\n")[:-1]' >> ${GITHUB_OUTPUT}
+
   docker-compose-test:
     runs-on: ubuntu-latest
     timeout-minutes: 10
     needs:
       - build
+      - docker-compose-collect
     env:
       GITHUB_CI_IMAGE: ghcr.io/${{ github.repository }}:pr-${{ github.event.pull_request.number }}
+    strategy:
+      matrix:
+        dir: ${{ fromJson(needs.docker-compose-collect.outputs.dirs) }}
     steps:
       - name: Checkout code
         uses: actions/checkout@v5
@@ -174,8 +191,8 @@ jobs:
         run: |
           docker compose \
             -f compose.yaml \
-            -f ci/compose.override.yaml \
-            --env-file ci/env \
+            -f ${{ matrix.dir }}/compose.override.yaml \
+            --env-file ${{ matrix.dir }}/env \
             config
 
       - name: Log in to GHCR
@@ -189,8 +206,8 @@ jobs:
         run: |
           docker compose \
             -f compose.yaml \
-            -f ci/compose.override.yaml \
-            --env-file ci/env \
+            -f ${{ matrix.dir }}/compose.override.yaml \
+            --env-file ${{ matrix.dir }}/env \
             up -d --no-build
 
       - name: Wait for services to be healthy
@@ -207,6 +224,10 @@ jobs:
             exit 1
           fi
 
+      - name: Run tests
+        run: |
+          ${{ matrix.dir }}/test.sh localhost docker compose exec -u zulip zulip \
+             /home/zulip/deployments/current/manage.py
       - name: Check service logs for critical errors
         if: success() || failure()
         continue-on-error: true

ci/compose.override.yaml renamed to ci/basic/compose.override.yaml

@@ -0,0 +1,44 @@
+#!/bin/bash
+
+set -eux
+set -o pipefail
+
+hostname="$1"
+shift
+manage=("$@")
+
+"${manage[@]}" create_realm 'Testing Realm' [email protected] 'Test Admin' --password very-secret
+
+url="https://$hostname"
+curl --insecure -si "$url"
+
+curl -si "http://$hostname" 2>&1 | grep -i "location: $url"
+curl --insecure -si "$url" 2>&1 | grep -i "location: /login/"
+curl --insecure -sL "$url" | grep "Testing Realm"
+
+api_key=$(curl --insecure -sSX POST "$url/api/v1/fetch_api_key" \
+    --data-urlencode [email protected] \
+    --data-urlencode password=very-secret | jq -r .api_key)
+
+registered=$(curl --insecure -sSX POST "$url/api/v1/register" \
+    -u "[email protected]:$api_key" \
+    --data-urlencode 'event_types=["message"]')
+
+queue_id=$(echo "$registered" | jq -r .queue_id)
+last_event_id=$(echo "$registered" | jq -r .last_event_id)
+
+curl --insecure -sSX POST "$url/api/v1/messages" \
+    -u "[email protected]:$api_key" \
+    --data-urlencode type=stream \
+    --data-urlencode 'to="general"' \
+    --data-urlencode topic=end-to-end \
+    --data-urlencode 'content=This is a piping hot test message.'
+
+queue=$(curl --insecure -sSX GET -G "$url/api/v1/events" \
+    -u "[email protected]:$api_key" \
+    --data-urlencode "queue_id=$queue_id" \
+    --data-urlencode "last_event_id=$last_event_id")
+
+echo "$queue" | jq -r '.events[] | .message.content' | grep "This is a piping hot test message."
+
+exit 0

ci/env renamed to ci/basic/env

@@ -0,0 +1,22 @@
+---
+secrets:
+  zulip__postgres_password:
+    environment: "ZULIP__POSTGRES_PASSWORD"
+  zulip__memcached_password:
+    environment: "ZULIP__MEMCACHED_PASSWORD"
+  zulip__rabbitmq_password:
+    environment: "ZULIP__RABBITMQ_PASSWORD"
+  zulip__redis_password:
+    environment: "ZULIP__REDIS_PASSWORD"
+  zulip__secret_key:
+    environment: "ZULIP__SECRET_KEY"
+  zulip__email_password:
+    environment: "ZULIP__EMAIL_PASSWORD"
+
+services:
+  zulip:
+    image: "${GITHUB_CI_IMAGE:?error}"
+    environment:
+      SETTING_EXTERNAL_HOST: "zulip.example.net"
+      SETTING_ZULIP_ADMINISTRATOR: "[email protected]"
+      DISABLE_HTTPS: True

ci/basic/test.sh

@@ -0,0 +1 @@
+../basic/env

ci/http-only/compose.override.yaml

@@ -0,0 +1,17 @@
+#!/bin/bash
+
+set -eux
+set -o pipefail
+
+hostname="$1"
+shift
+manage=("$@")
+
+"${manage[@]}" create_realm 'Testing Realm' [email protected] 'Test Admin' --password very-secret
+
+url="http://$hostname"
+curl -si "$url"
+curl -si "$url" 2>&1 | grep -i "location: /login/"
+curl --insecure -sL "$url" | grep "Testing Realm"
+
+exit 0