Fix/integration test

.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
+      - 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

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
+      - atos-net