Skip to content

Commit

Permalink
remove identity service from web-modeler file
Browse files Browse the repository at this point in the history
  • Loading branch information
aabouzaid committed Jan 9, 2025
1 parent 50cbd43 commit 95c9509
Show file tree
Hide file tree
Showing 8 changed files with 34 additions and 22 deletions.
30 changes: 23 additions & 7 deletions .github/workflows/docker-compose-test-e2e-full-setup.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -37,42 +37,56 @@ jobs:
matrix:
versions:
# Camunda 8.3
- name: Camunda 8.3
- name: Camunda 8.3
camunda-version: "8.3"
compose-args: "-f docker-compose.yaml"
e2e-test-enabled: false
- name: Camunda 8.3 - Core
camunda-version: "8.3"
compose-args: "-f docker-compose-core.yaml"
e2e-test-enabled: false
- name: Camunda 8.3 - Web Modeler
camunda-version: "8.3"
compose-args: "-f docker-compose-web-modeler.yaml"
e2e-test-enabled: false
# Camunda 8.4
- name: Camunda 8.4
- name: Camunda 8.4
camunda-version: "8.4"
compose-args: "-f docker-compose.yaml"
e2e-test-enabled: false
- name: Camunda 8.4 - Core
camunda-version: "8.4"
compose-args: "-f docker-compose-core.yaml"
e2e-test-enabled: false
- name: Camunda 8.4 - Web Modeler
camunda-version: "8.4"
compose-args: "-f docker-compose-web-modeler.yaml"
e2e-test-enabled: false
# Camunda 8.5
- name: Camunda 8.5
- name: Camunda 8.5
camunda-version: "8.5"
compose-args: "-f docker-compose.yaml"
e2e-test-enabled: false
- name: Camunda 8.5 - Core
camunda-version: "8.5"
compose-args: "-f docker-compose-core.yaml"
e2e-test-enabled: false
- name: Camunda 8.5 - Web Modeler
camunda-version: "8.5"
compose-args: "-f docker-compose-web-modeler.yaml"
e2e-test-enabled: false
# Camunda 8.6
- name: Camunda 8.6
- name: Camunda 8.6
camunda-version: "8.6"
- name: Camunda 8.6 - Core
camunda-version: "8.6"
compose-args: "-f docker-compose-core.yaml"
- name: Camunda 8.6 - Web Modeler
camunda-version: "8.6"
compose-args: "-f docker-compose-web-modeler.yaml"
e2e-test-enabled: false
# Camunda Alpha
- name: Camunda Alpha
camunda-version: "alpha"
- name: Camunda Alpha
- name: ⭐ Camunda Alpha ⭐
camunda-version: "alpha"
compose-args: "-f docker-compose.yaml"
- name: Camunda Alpha - Core
Expand All @@ -81,9 +95,11 @@ jobs:
- name: Camunda Alpha - Web Modeler
camunda-version: "alpha"
compose-args: "-f docker-compose-web-modeler.yaml"
e2e-test-enabled: false
exclude: ${{ fromJson(needs.init.outputs.unchanged-versions) }}
uses: ./.github/workflows/docker-compose-test-e2e-template.yaml
secrets: inherit
with:
camunda-version: ${{ matrix.versions.camunda-version }}
compose-args: ${{ matrix.versions.compose-args }}
e2e-test-enabled: ${{ matrix.versions.e2e-test-enabled }}
15 changes: 11 additions & 4 deletions .github/workflows/docker-compose-test-e2e-template.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -34,16 +34,23 @@ jobs:
name: Run
runs-on: ubuntu-latest
steps:
#
# Init.

- name: ℹ️ Print workflow inputs ℹ️
env:
GITHUB_CONTEXT: ${{ toJson(inputs) }}
run: |
echo "Workflow Inputs:"
echo "${GITHUB_CONTEXT}"
- name: disable and stop mono-xsp4.service
run: |
sudo systemctl stop mono-xsp4.service || true
sudo systemctl disable mono-xsp4.service || true
sudo killall mono || true
sudo killall xsp4 || true
- name: Checkout
uses: actions/checkout@v4

- name: Login to Docker registries
run: |
# DockerHub registry.
Expand Down Expand Up @@ -76,12 +83,12 @@ jobs:

- name: Install Playwright
uses: ./.github/actions/install-playwright
if: ${{ inputs.e2e-test-enabled }}
if: inputs.e2e-test-enabled
with:
working-directory: ${{ inputs.e2e-test-directory }}

- name: Run Playwright tests
if: ${{ inputs.e2e-test-enabled }}
if: inputs.e2e-test-enabled
id: test
working-directory: ${{ inputs.e2e-test-directory }}
run: |
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -66,8 +66,6 @@ services:
condition: service_healthy
mailpit:
condition: service_started
identity:
condition: service_healthy
healthcheck:
test: [ "CMD", "wget", "--no-verbose", "--tries=1", "--spider", "http://localhost:8091/health/readiness" ]
interval: 5s
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -68,8 +68,6 @@ services:
condition: service_healthy
mailpit:
condition: service_started
identity:
condition: service_healthy
healthcheck:
test: [ "CMD", "wget", "--no-verbose", "--tries=1", "--spider", "http://localhost:8091/health/readiness" ]
interval: 5s
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -68,8 +68,6 @@ services:
condition: service_healthy
mailpit:
condition: service_started
identity:
condition: service_healthy
healthcheck:
test: [ "CMD", "wget", "--no-verbose", "--tries=1", "--spider", "http://localhost:8091/health/readiness" ]
interval: 5s
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -68,8 +68,6 @@ services:
condition: service_healthy
mailpit:
condition: service_started
identity:
condition: service_healthy
healthcheck:
test: [ "CMD", "wget", "--no-verbose", "--tries=1", "--spider", "http://localhost:8091/health/readiness" ]
interval: 5s
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -68,8 +68,6 @@ services:
condition: service_healthy
mailpit:
condition: service_started
identity:
condition: service_healthy
healthcheck:
test: [ "CMD", "wget", "--no-verbose", "--tries=1", "--spider", "http://localhost:8091/health/readiness" ]
interval: 5s
Expand Down
1 change: 0 additions & 1 deletion docker-compose/versions/camunda-alpha/docker-compose.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -528,4 +528,3 @@ networks:
camunda-platform:
identity-network:
web-modeler:

0 comments on commit 95c9509

Please sign in to comment.