From 1f4004ee71bb46c9808a472928ce9d19566cf97c Mon Sep 17 00:00:00 2001 From: Shankari Date: Fri, 15 Nov 2024 00:26:15 -0800 Subject: [PATCH 1/3] Build the everest images as multiplatform as well Since we don't build the manager now anyway dec0ca2d2e520fcd4532f1aec14ff0a6c66e786e and the other images don't depend on the buildkit Signed-off-by: Shankari --- .env | 2 +- .github/workflows/cicd.yaml | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/.env b/.env index 4f342d99..9e50fcad 100644 --- a/.env +++ b/.env @@ -1,4 +1,4 @@ -TAG=0.0.18 +TAG=0.0.19 EVEREST_MANAGER_CPUS='1.0' EVEREST_MANAGER_MEMORY='1024mb' diff --git a/.github/workflows/cicd.yaml b/.github/workflows/cicd.yaml index 1a66ed87..d7d742ac 100644 --- a/.github/workflows/cicd.yaml +++ b/.github/workflows/cicd.yaml @@ -99,6 +99,7 @@ jobs: with: load: true context: ${{ matrix.context }} + platforms: linux/amd64,linux/arm64 push: false tags: ${{ steps.meta.outputs.tags }} labels: ${{ steps.meta.outputs.labels }} From 9e800ce11ede93f9c8d195eb231596bc1f19f4bc Mon Sep 17 00:00:00 2001 From: Shankari Date: Fri, 15 Nov 2024 00:53:03 -0800 Subject: [PATCH 2/3] Turn off load: true Similar to 3b438bf4c5218d29c5748f75b4e0f9dc2c6e6a2d Signed-off-by: Shankari --- .github/workflows/cicd.yaml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/cicd.yaml b/.github/workflows/cicd.yaml index d7d742ac..e8f671dd 100644 --- a/.github/workflows/cicd.yaml +++ b/.github/workflows/cicd.yaml @@ -97,7 +97,6 @@ jobs: - name: Build and export to Docker uses: docker/build-push-action@v6 with: - load: true context: ${{ matrix.context }} platforms: linux/amd64,linux/arm64 push: false From 13266a0c967e73134ede08b5c1ef379827c047d9 Mon Sep 17 00:00:00 2001 From: Shankari Date: Fri, 15 Nov 2024 00:59:35 -0800 Subject: [PATCH 3/3] Disable all the steps related to automated tests Since we don't build the manager anyway and docker save and load (for the mqtt server) break multiplatform builds Signed-off-by: Shankari --- .github/workflows/cicd.yaml | 84 ++++++++++++++++++------------------- 1 file changed, 42 insertions(+), 42 deletions(-) diff --git a/.github/workflows/cicd.yaml b/.github/workflows/cicd.yaml index e8f671dd..3f5edf60 100644 --- a/.github/workflows/cicd.yaml +++ b/.github/workflows/cicd.yaml @@ -110,48 +110,48 @@ jobs: # 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: 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@v6