|
18 | 18 | description: "Custom Playwright --grep expression (used when suite=custom)" |
19 | 19 | required: false |
20 | 20 | setupMethod: |
21 | | - description: "Setup method override passed to test run and preview deploy" |
| 21 | + description: "Setup method" |
22 | 22 | required: true |
23 | 23 | default: sso-external |
24 | 24 | type: choice |
|
31 | 31 | required: true |
32 | 32 | default: false |
33 | 33 | type: boolean |
34 | | - integration_repo: |
35 | | - description: "Repository that owns PullPreview deployment" |
36 | | - required: true |
37 | | - default: opf/integration-qa-helmfile |
38 | | - type: string |
39 | | - integration_workflow: |
40 | | - description: "Dispatchable workflow filename in integration repo" |
41 | | - required: true |
42 | | - default: pullpreview-dispatch.yml |
43 | | - type: string |
44 | 34 | integration_ref: |
45 | 35 | description: "Branch/ref in integration repo to execute workflow from" |
46 | 36 | required: true |
47 | 37 | default: main |
48 | 38 | type: string |
49 | | - preview_name: |
50 | | - description: "Optional custom preview name" |
51 | | - required: false |
52 | | - type: string |
53 | 39 | openproject_version: |
54 | | - description: "Optional OpenProject docker tag override" |
| 40 | + description: "OpenProject image tag" |
55 | 41 | required: false |
56 | 42 | type: string |
57 | 43 | nextcloud_version: |
58 | | - description: "Optional Nextcloud image tag override" |
| 44 | + description: "Nextcloud image tag" |
59 | 45 | required: false |
60 | 46 | type: string |
61 | 47 | keycloak_version: |
62 | | - description: "Optional Keycloak image tag override" |
| 48 | + description: "Keycloak image tag" |
63 | 49 | required: false |
64 | 50 | type: string |
65 | 51 | integration_app_version: |
66 | | - description: "Optional integration_openproject app version (alias if integration_openproject_version is empty)" |
| 52 | + description: "integration_openproject app version (alias if integration_openproject_version is empty)" |
67 | 53 | required: false |
68 | 54 | type: string |
69 | 55 | integration_openproject_version: |
|
99 | 85 | - name: Checkout |
100 | 86 | uses: actions/checkout@v4 |
101 | 87 |
|
| 88 | + - name: Log refs and inputs |
| 89 | + shell: bash |
| 90 | + run: | |
| 91 | + set -euo pipefail |
| 92 | + echo "E2E repo ref: ${GITHUB_REF_NAME:-} sha: ${GITHUB_SHA:-}" |
| 93 | + echo "Integration repo: ${{ github.event.inputs.integration_repo }}" |
| 94 | + echo "Integration workflow: ${{ github.event.inputs.integration_workflow }}" |
| 95 | + echo "Integration ref: ${{ github.event.inputs.integration_ref }}" |
| 96 | + echo "Setup method: ${{ github.event.inputs.setupMethod }}" |
| 97 | + echo "Requested versions: OP='${{ github.event.inputs.openproject_version }}' NC='${{ github.event.inputs.nextcloud_version }}' KC='${{ github.event.inputs.keycloak_version }}'" |
| 98 | + echo "Requested integration app: legacy='${{ github.event.inputs.integration_app_version }}' io_ver='${{ github.event.inputs.integration_openproject_version }}' io_git='${{ github.event.inputs.integration_openproject_git_branch }}'" |
| 99 | + echo "Requested branches: OP='${{ github.event.inputs.openproject_branch }}' NC='${{ github.event.inputs.nextcloud_branch }}'" |
| 100 | +
|
102 | 101 | - name: Resolve grep and preview name |
103 | 102 | id: resolve |
104 | 103 | shell: bash |
@@ -239,9 +238,14 @@ jobs: |
239 | 238 | if [ -n "${run_match}" ]; then |
240 | 239 | run_json="$(echo "${run_match}" | base64 --decode)" |
241 | 240 | run_id="$(echo "${run_json}" | jq -r '.id')" |
| 241 | + head_sha="$(echo "${run_json}" | jq -r '.head_sha // empty')" |
242 | 242 | status="$(echo "${run_json}" | jq -r '.status')" |
243 | 243 | conclusion="$(echo "${run_json}" | jq -r '.conclusion // ""')" |
244 | | - echo "Deploy run ${run_id}: status=${status}, conclusion=${conclusion}" |
| 244 | + if [ -n "${head_sha}" ]; then |
| 245 | + echo "Deploy run ${run_id}: sha=${head_sha} status=${status}, conclusion=${conclusion}" |
| 246 | + else |
| 247 | + echo "Deploy run ${run_id}: status=${status}, conclusion=${conclusion}" |
| 248 | + fi |
245 | 249 |
|
246 | 250 | if [ "${status}" = "completed" ]; then |
247 | 251 | break |
|
0 commit comments