From ff66ae511876ffd375d10dce73ee48fe7f648273 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Samuel=20Thor=C3=A9n?= <samuel.thoren@astazero.com>
Date: Tue, 21 Apr 2026 14:35:21 +0200
Subject: [PATCH 1/2] Fix for integration test

---
 docker-compose-test.yml | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/docker-compose-test.yml b/docker-compose-test.yml
index b679567c1..254ece545 100644
--- a/docker-compose-test.yml
+++ b/docker-compose-test.yml
@@ -4,6 +4,9 @@ networks:
     driver: bridge
 services:
   atos:
+    depends_on:
+      isoObject:
+        condition: service_started
     image: astazero/atos_docker_env:test
     networks:
       - atos-net
@@ -16,4 +19,4 @@ services:
   isoObject:
     image: astazero/iso_object_demo:latest
     networks:
-      - atos-net
\ No newline at end of file
+      - atos-net

From ddca168e95de16d6efdad3982249ab0fd6cbbd53 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Samuel=20Thor=C3=A9n?= <samuel.thoren@astazero.com>
Date: Tue, 21 Apr 2026 14:40:16 +0200
Subject: [PATCH 2/2] Add support for manually starting workflow

---
 .github/workflows/build_and_test.yaml | 59 ++++++++++++++-------------
 1 file changed, 30 insertions(+), 29 deletions(-)

diff --git a/.github/workflows/build_and_test.yaml b/.github/workflows/build_and_test.yaml
index f260b32ad..48be0cdd9 100644
--- a/.github/workflows/build_and_test.yaml
+++ b/.github/workflows/build_and_test.yaml
@@ -1,14 +1,15 @@
 name: Docker Image CI
 
 on:
+  workflow_dispatch:
   push:
-    branches: [ "dev*", "master" ]
+    branches: ["dev*", "master"]
   pull_request:
-    branches: [ "dev" ]
+    branches: ["dev"]
 
 concurrency:
-    group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
-    cancel-in-progress: true
+  group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
+  cancel-in-progress: true
 
 env:
   TEST_TAG: astazero/atos_docker_env:test
@@ -17,28 +18,28 @@ jobs:
   build_and_test_docker_image:
     runs-on: ubuntu-latest
     steps:
-    - name: Set up Docker Buildx
-      uses: docker/setup-buildx-action@v3
-
-    - name: Checkout 
-      uses: actions/checkout@v4
-      with:
-        submodules: recursive
-
-    - name: Build Docker image
-      uses: docker/build-push-action@v5
-      with:
-        context: .
-        file: Dockerfile
-        load: true
-        tags: ${{ env.TEST_TAG }}
-        cache-from: type=gha
-        cache-to: type=gha,mode=max
-
-    - name: Run colcon test on docker image
-      run: |
-        docker run --rm ${{ env.TEST_TAG }} bash -c "colcon test --return-code-on-test-failure --event-handlers console_cohesion+"
-
-    - name: Run scenario integration test
-      run: |
-        docker compose -f docker-compose-test.yml up --abort-on-container-exit
\ No newline at end of file
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v3
+
+      - name: Checkout
+        uses: actions/checkout@v4
+        with:
+          submodules: recursive
+
+      - name: Build Docker image
+        uses: docker/build-push-action@v5
+        with:
+          context: .
+          file: Dockerfile
+          load: true
+          tags: ${{ env.TEST_TAG }}
+          cache-from: type=gha
+          cache-to: type=gha,mode=max
+
+      - name: Run colcon test on docker image
+        run: |
+          docker run --rm ${{ env.TEST_TAG }} bash -c "colcon test --return-code-on-test-failure --event-handlers console_cohesion+"
+
+      - name: Run scenario integration test
+        run: |
+          docker compose -f docker-compose-test.yml up --abort-on-container-exit