Test/CV2-6381: Check ci is failing

.github/workflows/ci-test.yaml

@@ -32,19 +32,21 @@ jobs:
 
     - name: Set up Docker Buildx
       uses: docker/setup-buildx-action@v3
-    
+
     - name: Before script
       env:
         GITHUB_BRANCH: ${{ github.head_ref || github.ref_name }}
         GITHUB_JOB_NAME: ${{ github.job }}
       run: |
         sed -i 's/[email protected]:/https:\/\/github.com\//' .gitmodules
+        git submodule foreach --recursive bash -c 'git checkout .'
+        git submodule sync
         git submodule update --init --recursive
         sed -i '/git submodule/d' bin/first-build.sh
         sed -i 's/--abort-on-container-exit/-d/' bin/first-build.sh
         TAB=$'\t'
         export FALLBACK_BRANCH=$([ "$GITHUB_BRANCH" == "master" ] && echo "main" && echo "master" || echo "develop")
-        git submodule foreach 'bash -c "git checkout master ; git checkout develop ; git checkout $FALLBACK_BRANCH ; git checkout $GITHUB_BRANCH ; exit 0"'
+        git submodule foreach bash -c '(git checkout "${GITHUB_BRANCH}" || git checkout main || git checkout develop || git checkout master || git checkout "${FALLBACK_BRANCH}") && git pull'
         git submodule foreach git rev-parse --abbrev-ref HEAD 
 
     - name: Run Script

bin/first-build.sh

@@ -1,7 +1,7 @@
 #!/bin/bash
 
 # Go to the develop branch of each repository
-git submodule foreach bash -c 'git checkout develop || git checkout master'
+git submodule foreach bash -c '(git checkout develop || git checkout master || git checkout main) && git pull'
 
 # Copy the example files
 find . -name '*.example' -not -path '*apollo*' | while read f; do cp "$f" "${f%%.example}"; done

docker-compose.yml

@@ -217,53 +217,53 @@ services:
     depends_on:
       elasticmq:
         condition: service_healthy
-  presto-image:
-    build: presto
-    platform: linux/amd64
-    volumes:
-      - "./presto:/app"
-    env_file:
-      - presto/.env_file
-    environment:
-      ROLE: worker
-      MODEL_NAME: image.Model
-    networks:
-      - dev
-    depends_on:
-      elasticmq:
-        condition: service_healthy
-  presto-audio:
-    build: presto
-    platform: linux/amd64
-    volumes:
-      - "./presto:/app"
-    env_file:
-      - presto/.env_file
-    environment:
-      ROLE: worker
-      MODEL_NAME: audio.Model
-    networks:
-      - dev
-    depends_on:
-      elasticmq:
-        condition: service_healthy
-  presto-video:
-    build: presto
-    platform: linux/amd64
-    volumes:
-      - "./presto:/app"
-    env_file:
-      - presto/.env_file
-    environment:
-      ROLE: worker
-      MODEL_NAME: video.Model
-    networks:
-      - dev
-    depends_on:
-      elasticmq:
-        condition: service_healthy
-      minio:
-        condition: service_healthy
+  # presto-image:
+  #   build: presto
+  #   platform: linux/amd64
+  #   volumes:
+  #     - "./presto:/app"
+  #   env_file:
+  #     - presto/.env_file
+  #   environment:
+  #     ROLE: worker
+  #     MODEL_NAME: image.Model
+  #   networks:
+  #     - dev
+  #   depends_on:
+  #     elasticmq:
+  #       condition: service_healthy
+  # presto-audio:
+  #   build: presto
+  #   platform: linux/amd64
+  #   volumes:
+  #     - "./presto:/app"
+  #   env_file:
+  #     - presto/.env_file
+  #   environment:
+  #     ROLE: worker
+  #     MODEL_NAME: audio.Model
+  #   networks:
+  #     - dev
+  #   depends_on:
+  #     elasticmq:
+  #       condition: service_healthy
+  # presto-video:
+  #   build: presto
+  #   platform: linux/amd64
+  #   volumes:
+  #     - "./presto:/app"
+  #   env_file:
+  #     - presto/.env_file
+  #   environment:
+  #     ROLE: worker
+  #     MODEL_NAME: video.Model
+  #   networks:
+  #     - dev
+  #   depends_on:
+  #     elasticmq:
+  #       condition: service_healthy
+  #     minio:
+  #       condition: service_healthy
   # presto-mean-tokens:
   #   build: presto
   #   platform: linux/amd64
@@ -307,9 +307,9 @@ services:
       - redis
       - elasticsearch
       - presto-server
-      - presto-image
-      - presto-audio
-      - presto-video
+      # - presto-image
+      # - presto-audio
+      # - presto-video
     env_file:
       - alegre/.env_file
     networks:

docker-test.yml

@@ -57,15 +57,15 @@ services:
       BOILERPLATE_ENV: test
       PRESTO_PORT: 8000
       REDIS_DATABASE: 3
-  presto-audio:
-    environment:
-      BOILERPLATE_ENV: test
-  presto-image:
-    environment:
-      BOILERPLATE_ENV: test
-  presto-video:
-    environment:
-      BOILERPLATE_ENV: test
+  # presto-audio:
+  #   environment:
+  #     BOILERPLATE_ENV: test
+  # presto-image:
+  #   environment:
+  #     BOILERPLATE_ENV: test
+  # presto-video:
+  #   environment:
+  #     BOILERPLATE_ENV: test
   # presto-mean-tokens:
   #   environment:
   #     BOILERPLATE_ENV: test

test/image_names.txt

@@ -8,10 +8,7 @@ check-narcissus
 check-pender
 check-pender-background
 check-postgres
-check-presto-audio
-check-presto-image
 check-presto-server
-check-presto-video
 check-queue_worker
 check-web
 docker.elastic.co/kibana/kibana:7.9.2