New branch to investigate why CI/CD failing in PR

.github/workflows/cicd.yaml

@@ -2,8 +2,8 @@ name: cicd
 
 on:
   pull_request:
-    branches:
-      - main
+    branches: [ main, merge-check ]
+      # - main
   push:
     branches:
       - main
@@ -21,17 +21,20 @@ jobs:
     strategy:
       matrix:
         include:
-          - host_namespace: ghcr.io/everest/everest-demo
-            image_name: manager
-            context: ./manager
           - host_namespace: ghcr.io/everest/everest-demo
             image_name: mqtt-server
             context: ./mosquitto
           - host_namespace: ghcr.io/everest/everest-demo
             image_name: nodered
             context: ./nodered
+          - host_namespace: ghcr.io/everest/everest-demo
+            image_name: manager
+            context: ./manager
 
     steps:
+      - name: Delete huge unnecessary tools folder
+        run: rm -rf /opt/hostedtoolcache
+
       - name: Checkout
         uses: actions/checkout@v4
         with:
@@ -93,9 +96,68 @@ jobs:
           registry: ghcr.io
           username: ${{ github.actor }}
           password: ${{ secrets.GITHUB_TOKEN }}
+
+      - name: Build and export to Docker
+        uses: docker/build-push-action@v6
+        with:
+          load: true
+          context: ${{ matrix.context }}
+          push: false
+          tags: ${{ steps.meta.outputs.tags }}
+          labels: ${{ steps.meta.outputs.labels }}
+          cache-from: type=gha,scope=${{ matrix.image_name }}
+          cache-to: type=gha,mode=max,scope=${{ matrix.image_name }}
+
+      # Following four steps are specifically for running automated tests which includes loading the 
+      # mqtt-server image from the GitHub Actions Cache so that the docker compose automated tests can 
+      # use this already built image instead of pulling it from GitHub Container Registry
+      # Note: These steps are only for the mqtt-server and the manager images and not for the nodered image.
+      # This is because, currently, docker-compose.automated-tests.yml uses only these two images for running automated tests.
+      - name: Save Docker image
+        if: ${{ matrix.image_name == 'mqtt-server' }}
+        id: save-mqtt-image
+        shell: bash
+        run: |
+          echo "TAG=${{ steps.docker-image-version-check.outputs.TAG }}"
+          docker save --output /tmp/mqtt-server_${{ steps.docker-image-version-check.outputs.TAG }}.tar ghcr.io/everest/everest-demo/mqtt-server:${{ steps.docker-image-version-check.outputs.TAG }}
+
+      - name: Upload mqtt-server image as Artifact
+        if: ${{ matrix.image_name == 'mqtt-server' }}
+        uses: actions/upload-artifact@v4
+        with:
+          name: mqtt_server_image_${{ steps.docker-image-version-check.outputs.TAG }}
+          path: /tmp/mqtt-server_${{ steps.docker-image-version-check.outputs.TAG }}.tar
+          overwrite: true
+
+      - name: Download mqtt-server image as Artifact
+        if: ${{ matrix.image_name == 'manager' }}
+        uses: actions/download-artifact@v4
+        with:
+          name: mqtt_server_image_${{ steps.docker-image-version-check.outputs.TAG }}
+          path: /tmp
+
+      - name: Load Docker image
+        if: ${{ matrix.image_name == 'manager' }}
+        id: load-mqtt-image
+        shell: bash
+        run: |
+          docker load --input /tmp/mqtt-server_${{ steps.docker-image-version-check.outputs.TAG }}.tar     
+
+      - name: Run automated tests using docker-compose.automated-tests.yml
+        if: ${{ matrix.image_name == 'manager' }}
+        run: |
+          docker images
+          echo "Running docker compose up..."
+          docker compose --project-name everest-ac-automated-testing \
+                  --file "docker-compose.automated-tests.yml" up \
+                    --abort-on-container-exit \
+                    --exit-code-from manager
 
+          exit_code=$?            
+          echo "Docker-compose up exit code from manager service: $exit_code"
+
       - name: Build and push
-        uses: docker/build-push-action@v5
+        uses: docker/build-push-action@v6
         with:
           context: ${{ matrix.context }}
           push: ${{ github.event_name != 'pull_request' }}

docker-compose.automated-tests.yml

@@ -14,5 +14,6 @@ services:
       - MQTT_SERVER_ADDRESS=mqtt-server
     working_dir: /ext/source/tests
     entrypoint: "sh ./run-test.sh"
+    # entrypoint: "sh ./test-exit-code.sh failure"
     sysctls:
       - net.ipv6.conf.all.disable_ipv6=0

manager/Dockerfile

@@ -1,6 +1,7 @@
-FROM --platform=linux/x86_64 ghcr.io/everest/build-kit-alpine:latest
+ARG BUILDKIT_VERSION=sha256:c0fe4236506c085687f58bdfe4865d973060185d33c270ab076fad320d4421b0
+FROM --platform=linux/x86_64 ghcr.io/everest/build-kit-alpine@${BUILDKIT_VERSION}
 
-ARG EVEREST_VERSION=2024.3.0
+ARG EVEREST_VERSION=2024.9.0-rc1
 ENV EVEREST_VERSION=${EVEREST_VERSION}
 
 COPY install.sh ./
@@ -22,5 +23,6 @@ COPY config.json ./dist/share/everest/modules/OCPP201/config.json
 COPY device_model_storage_maeve_sp1.db ./dist/share/everest/modules/OCPP201/device_model_storage.db
 
 COPY run-test.sh /ext/source/tests/run-test.sh
+COPY test-exit-code.sh /ext/source/tests/test-exit-code.sh
 
 LABEL org.opencontainers.image.source=https://github.com/everest/everest-demo

manager/test-exit-code.sh

@@ -0,0 +1,11 @@
+#!/bin/bash
+TEST_TYPE=$1
+exit_code=0
+if [ "$TEST_TYPE" == "success" ]; then
+    exit_code=0
+elif [ "$TEST_TYPE" == "failure" ]; then
+    exit_code=1
+fi
+
+echo "Exit Code from test-exit-code.sh: $exit_code"
+exit $exit_code