simplify: start Collabora/OnlyOffice early; drop redundant cs3-wopi discovery wait; declare wopi-url output

Author: mklos-kw

ocis-setup/action.yml

@@ -112,6 +112,9 @@ outputs:
   ocis-url:
     description: oCIS instance URL
     value: ${{ inputs.ocis-url }}
+  wopi-url:
+    description: WOPI source base URL (http://localhost:PORT); only set when collaboration-apps is non-empty
+    value: ${{ steps.wopi-url.outputs.wopi-url }}
 
 runs:
   using: composite
@@ -330,9 +333,13 @@ runs:
         echo "WEB_UI_CONFIG_FILE=${CONFIG_DIR}/web-ui-config.json" >> "$GITHUB_ENV"
 
     # -------------------------------------------------------------------------
-    # 8b. cs3-wopi: start FakeOffice before oCIS (app-provider probes discovery at startup)
+    # 8b. Pre-start WOPI apps that require discovery before oCIS boots
+    #     cs3-wopi: app-provider probes FakeOffice discovery at startup, so
+    #     FakeOffice must be healthy before oCIS launches.
+    #     Collabora/OnlyOffice don't depend on oCIS, so start them early too
+    #     to overlap their container pull+boot with oCIS startup time.
     # -------------------------------------------------------------------------
-    - name: Start FakeOffice (cs3-wopi early start)
+    - name: Start FakeOffice (cs3-wopi — must be ready before oCIS)
       if: contains(inputs.collaboration-apps, 'cs3-wopi')
       shell: bash
       working-directory: ${{ github.workspace }}
@@ -345,6 +352,32 @@ runs:
         timeout 120 bash -c 'until curl -sf http://localhost:8080/hosting/discovery; do sleep 2; done'
         echo "FakeOffice ready."
 
+    - name: Start Collabora (early — overlaps with oCIS boot)
+      if: contains(inputs.collaboration-apps, 'collabora')
+      shell: bash
+      run: |
+        docker run -d --name collabora --network host \
+          -e DONT_GEN_SSL_CERT=set \
+          -e "extra_params=--o:ssl.enable=true --o:ssl.termination=true --o:welcome.enable=false --o:net.frame_ancestors=${{ inputs.ocis-url }}" \
+          --entrypoint /bin/sh \
+          ${{ inputs.collabora-image }} \
+          -c "set -e; coolconfig generate-proof-key; bash /start-collabora-online.sh"
+
+    - name: Start OnlyOffice (early — overlaps with oCIS boot)
+      if: contains(inputs.collaboration-apps, 'onlyoffice')
+      shell: bash
+      working-directory: ${{ github.workspace }}
+      run: |
+        sudo systemctl stop postgresql || true
+        docker run -d --name onlyoffice --network host \
+          -e WOPI_ENABLED=true \
+          -e USE_UNAUTHORIZED_STORAGE=true \
+          -v "$(pwd)/tests/config/ci/only-office.json:/tmp/only-office.json:ro" \
+          -v "$(pwd)/tests/config/ci/onlyoffice-entrypoint.sh:/entrypoint.sh:ro" \
+          --entrypoint /bin/sh \
+          ${{ inputs.onlyoffice-image }} \
+          /entrypoint.sh
+
     # -------------------------------------------------------------------------
     # 9. Start oCIS via ociswrapper (or directly when wrapper: false)
     # -------------------------------------------------------------------------
@@ -415,7 +448,7 @@ runs:
         echo "OCIS_CERT=$CERT" >> "$GITHUB_ENV"
 
     # -------------------------------------------------------------------------
-    # 12. Optional WOPI collaboration apps
+    # 12. Start fakeoffice (non-cs3-wopi path) + wait for all discovery endpoints
     # -------------------------------------------------------------------------
     - name: Start FakeOffice
       if: contains(inputs.collaboration-apps, 'fakeoffice')
@@ -427,40 +460,15 @@ runs:
           python:3-alpine \
           python3 /ocis/tests/config/ci/fakeoffice-server.py
 
-    - name: Start Collabora
-      if: contains(inputs.collaboration-apps, 'collabora')
-      shell: bash
-      run: |
-        docker run -d --name collabora --network host \
-          -e DONT_GEN_SSL_CERT=set \
-          -e "extra_params=--o:ssl.enable=true --o:ssl.termination=true --o:welcome.enable=false --o:net.frame_ancestors=${{ inputs.ocis-url }}" \
-          --entrypoint /bin/sh \
-          ${{ inputs.collabora-image }} \
-          -c "set -e; coolconfig generate-proof-key; bash /start-collabora-online.sh"
-
-    - name: Start OnlyOffice
-      if: contains(inputs.collaboration-apps, 'onlyoffice')
-      shell: bash
-      working-directory: ${{ github.workspace }}
-      run: |
-        sudo systemctl stop postgresql || true
-        docker run -d --name onlyoffice --network host \
-          -e WOPI_ENABLED=true \
-          -e USE_UNAUTHORIZED_STORAGE=true \
-          -v "$(pwd)/tests/config/ci/only-office.json:/tmp/only-office.json:ro" \
-          -v "$(pwd)/tests/config/ci/onlyoffice-entrypoint.sh:/entrypoint.sh:ro" \
-          --entrypoint /bin/sh \
-          ${{ inputs.onlyoffice-image }} \
-          /entrypoint.sh
-
     - name: Wait for WOPI app discovery endpoints
       if: inputs.collaboration-apps != ''
       shell: bash
       env:
         COLLAB_APPS: ${{ inputs.collaboration-apps }}
       run: |
         PIDS=()
-        [[ "$COLLAB_APPS" == *fakeoffice* || "$COLLAB_APPS" == *cs3-wopi* ]] && {
+        # cs3-wopi FakeOffice was already confirmed healthy in step 8b; skip re-check
+        [[ "$COLLAB_APPS" == *fakeoffice* ]] && {
           ( timeout 300 bash -c 'until curl -sf http://localhost:8080/hosting/discovery; do sleep 2; done'
             echo "fakeoffice ready." ) &
           PIDS+=($!)
@@ -549,3 +557,16 @@ runs:
         timeout 120 bash -c 'until curl -sf http://localhost:9300/wopi/cbox/endpoints 2>/dev/null || nc -z localhost 9300 2>/dev/null; do sleep 2; done'
         echo "cs3 wopi server ready."
         echo "WOPI_PORT=9300" >> "$GITHUB_ENV"
+
+    # -------------------------------------------------------------------------
+    # 14. Declare wopi-url output so callers can wire it explicitly
+    # -------------------------------------------------------------------------
+    - name: Set wopi-url output
+      id: wopi-url
+      if: inputs.collaboration-apps != ''
+      shell: bash
+      env:
+        WOPI_PORT: ${{ env.WOPI_PORT }}
+      run: |
+        PORT="${WOPI_PORT:-9320}"
+        echo "wopi-url=http://localhost:${PORT}" >> "$GITHUB_OUTPUT"