finalize multi-platform build

Co-authored-by: Shawn Smith <chezsmithy@me.com>
Co-authored-by: Daniel Fangl <daniel.fangl@localstack.cloud>

Author: 3 people

.circleci/config.yml

@@ -1,8 +1,5 @@
 version: 2.1
 
-#orbs:
-#  slack: circleci/slack@4.4.2
-
 jobs:
   install:
     machine:
@@ -109,7 +106,7 @@ jobs:
           root:
             /tmp/workspace
           paths:
-            - repo/target/coverage
+            - repo/target/coverage/
       - store_test_results:
           path: target/reports/
 
@@ -126,7 +123,7 @@ jobs:
             DEBUG: 1
             SQS_PROVIDER: "elasticmq"
             TEST_PATH: "tests/integration/test_sns.py -k test_publish_sqs_from_sns_with_xray_propagation"
-            PYTEST_ARGS: "--junitxml=target/reports/elasticmq.xml -o junit_suite_name='elasticmq'"
+            PYTEST_ARGS: "--reruns 3 --junitxml=target/reports/elasticmq.xml -o junit_suite_name='elasticmq'"
             COVERAGE_ARGS: "-p"
           command: make test-coverage
       - run:
@@ -136,117 +133,88 @@ jobs:
           root:
             /tmp/workspace
           paths:
-            - repo/target/coverage
-      - store_test_results:
-          path: target/reports/
-
-  docker-build-amd64:
-    machine:
-      image: ubuntu-2004:202107-02
-    working_directory: /tmp/workspace/repo
-    steps:
-      - attach_workspace:
-          at: /tmp/workspace
-      - run:
-          name: Initialize build environment
-          command: make init
-      - run:
-          name: Build localstack docker image
-          command: make docker-build-linux-amd64
-      - run:
-          name: Output the Image Stats
-          command: make docker-image-stats
-      - run:
-          name: Run the tests
-          command: |
-            PYTEST_ARGS='--junitxml=target/reports/test-report-amd64.xml' \
-            COVERAGE_FILE='target/coverage/.coverage.amd64' \
-            make docker-run-tests
-      - run:
-          name: Save docker image
-          command: |
-            test "$CIRCLE_BRANCH" = "master" \
-              && PLATFORM="amd64" make docker-save-image || true
-      - run:
-          name: Build light docker image
-          command: |
-            test "$CIRCLE_BRANCH" = "master" \
-              && make docker-build-linux-amd64-light || true
-      - run:
-          name: Save light docker image
-          command: |
-            test "$CIRCLE_BRANCH" = "master" \
-              && PLATFORM="amd64" make docker-save-image-light || true
-      - persist_to_workspace:
-          root:
-            /tmp/workspace
-          paths:
-            - repo
+            - repo/target/coverage/
       - store_test_results:
           path: target/reports/
 
-  docker-build-arm64:
+  docker-build:
+    parameters:
+      platform:
+        description: "Platform to build for"
+        default: "amd64"
+        type: string
+      machine_image:
+        description: "CircleCI machine type to run at"
+        default: "ubuntu-2004:202107-02"
+        type: string
+      resource_class:
+        description: "CircleCI machine type to run at"
+        default: "medium"
+        type: string
     machine:
-      # The latest version of ubuntu is not yet supported for ARM: https://circleci.com/docs/2.0/arm-resources/
-      image: ubuntu-2004:202101-01
-    resource_class: arm.medium
+      image: << parameters.machine_image >>
+      docker_layer_caching: true
+    resource_class: << parameters.resource_class >>
     working_directory: /tmp/workspace/repo
     steps:
       - attach_workspace:
           at: /tmp/workspace
-      - run:
-          # Since we are using an old version of ubuntu, we need to install the latest version of docker
-          name: Update docker engine to most current
-          command: |
-            # Remove old version
-            sudo apt-get remove --purge docker docker-engine docker.io containerd runc -y
-            # Install Docker deb package repo
-            curl -fsSL https://download.docker.com/linux/ubuntu/gpg | \
-              sudo gpg --dearmor -o /usr/share/keyrings/docker-archive-keyring.gpg
-            echo "deb [arch=arm64 signed-by=/usr/share/keyrings/docker-archive-keyring.gpg] https://download.docker.com/linux/ubuntu $(lsb_release -cs) stable" \
-              | sudo tee /etc/apt/sources.list.d/docker.list > /dev/null
-            sudo apt-get update
-            # Install the latest version of Docker and haveged
-            # (https://github.com/docker/compose/issues/6678#issuecomment-526831488)
-            sudo apt-get install docker-ce docker-ce-cli containerd.io haveged -y
-            sudo usermod -aG docker $USER
-      - run:
-          name: Build localstack docker image
-          command: make docker-build-linux-arm64
-      - run:
-          name: Output the Image Stats
-          command: make docker-image-stats
-      - run:
-          name: Install amd64 emulation support for lambda tests
-          command: |
-            docker run --rm --privileged tonistiigi/binfmt:latest --install all
-            docker buildx create --name multiarch-builder --use
-      - run:
-          name: Run the tests
+      - when:
+          condition:
+            equal: [ arm64, << parameters.platform >> ]
+          steps:
+            - run:
+                # Since we are using an old version of ubuntu, we need to install the latest version of docker
+                name: Update docker engine to most current
+                command: |
+                  # Remove old version
+                  sudo apt-get remove --purge docker docker-engine docker.io containerd runc -y
+                  # Install Docker deb package repo
+                  curl -fsSL https://download.docker.com/linux/ubuntu/gpg | \
+                    sudo gpg --dearmor -o /usr/share/keyrings/docker-archive-keyring.gpg
+                  echo "deb [arch=arm64 signed-by=/usr/share/keyrings/docker-archive-keyring.gpg] https://download.docker.com/linux/ubuntu $(lsb_release -cs) stable" \
+                    | sudo tee /etc/apt/sources.list.d/docker.list > /dev/null
+                  sudo apt-get update
+                  # Install the latest version of Docker and haveged
+                  # (https://github.com/docker/compose/issues/6678#issuecomment-526831488)
+                  sudo apt-get install docker-ce docker-ce-cli containerd.io haveged -y
+                  sudo usermod -aG docker $USER
+            - run:
+                # Install the emulation support before starting to build (resets the build cache)
+                name: Install amd64 emulation support for lambda tests
+                command: |
+                  docker run --rm --privileged tonistiigi/binfmt:latest --install all
+                  docker buildx create --name multiarch-builder --use
+      - run:
+          name: Build full docker image
+          command: make docker-build
+      - run:
+          name: Run tests
           command: |
-            PYTEST_ARGS='--junitxml=target/reports/test-report-arm64.xml' \
-            COVERAGE_FILE='target/coverage/.coverage.arm64' \
+            PYTEST_ARGS='--junitxml=target/reports/test-report-<< parameters.platform >>.xml' \
+            COVERAGE_FILE='target/coverage/.coverage.<< parameters.platform >>' \
             make docker-run-tests
-      - run:
-          name: Save docker image
-          command: |
-            test "$CIRCLE_BRANCH" = "master" \
-              && PLATFORM="arm64" make docker-save-image || true
-      - run:
-          name: Build light docker image
-          command: |
-            test "$CIRCLE_BRANCH" = "master" \
-              && make docker-build-linux-amd64-light || true
-      - run:
-          name: Save light docker image
-          command: |
-            test "$CIRCLE_BRANCH" = "master" \
-              && PLATFORM="arm64" make docker-save-image-light || true
+      - when:
+          condition:
+            equal: [ master, << pipeline.git.branch >> ]
+          steps:
+            - run:
+                name: Build light docker image
+                command: make docker-build-light
+            - run:
+                name: Run pre-release smoke tests
+                command: make ci-pro-smoke-tests
+            - run:
+                name: Save full docker image
+                command: PLATFORM="<< parameters.platform >>" make docker-save-image
+            - run:
+                name: Save light docker image
+                command: PLATFORM="<< parameters.platform >>" make docker-save-image-light
       - persist_to_workspace:
           root:
             /tmp/workspace
           paths:
-            - repo
+            - repo/target/
       - store_test_results:
           path: target/reports/
 
@@ -272,66 +240,41 @@ jobs:
             coverage report || true
             coverage html || true
             coveralls || true
-#      - slack/notify:
-#          event: pass
-#          template: basic_success_1
       - store_artifacts:
           path: htmlcov/
 
-  docker-push-amd64:
+  docker-push:
     machine:
       image: ubuntu-2004:202107-02
     working_directory: /tmp/workspace/repo
     steps:
       - attach_workspace:
           at: /tmp/workspace
       - run:
-          name: Load docker image
+          name: Load docker image - amd64/full
           command: docker load -i target/localstack-docker-image-amd64.tar
       - run:
-          name: Load docker image light
+          name: Load docker image - amd64/light
           command: docker load -i target/localstack-docker-image-light-amd64.tar
       - run:
-          name: Run pre-release smoke tests
-          command: make ci-pro-smoke-tests
-      - run:
-          name: Push docker image
+          name: Push docker images - amd64
           command: PLATFORM="amd64" make docker-push-master
-
-  docker-push-arm64:
-    machine:
-      image: ubuntu-2004:202101-01
-    resource_class: arm.medium
-    working_directory: /tmp/workspace/repo
-    steps:
-      - attach_workspace:
-          at: /tmp/workspace
+      # Load and push per architecture (load overwrites the previous ones)
       - run:
-          name: Load docker image
+          name: Load docker image - arm64/full
           command: docker load -i target/localstack-docker-image-arm64.tar
       - run:
-          name: Load docker image light
+          name: Load docker image - arm64/light
           command: docker load -i target/localstack-docker-image-light-arm64.tar
       - run:
-          name: Run pre-release smoke tests
-          command: make ci-pro-smoke-tests
-      - run:
-          name: Push docker image
+          name: Push docker images - arm64
           command: PLATFORM="arm64" make docker-push-master
-
-  docker-create-manifests:
-    machine:
-      image: ubuntu-2004:202107-02
-    working_directory: /tmp/workspace/repo
-    steps:
-      - attach_workspace:
-          at: /tmp/workspace
       - run:
-          name: create multi-platform manifests
-          command: make docker-create-manifests
+          name: Create multi-platform manifests - full
+          command: make docker-create-push-manifests
       - run:
-          name: create multi-platform manifests light
-          command: make docker-create-manifests-light
+          name: Create multi-platform manifests - light
+          command: make docker-create-push-manifests-light
 
 workflows:
   main:
@@ -346,27 +289,29 @@ workflows:
       - itest-elasticmq:
           requires:
             - preflight
-      - docker-build-amd64:
+      - docker-build:
+          name: docker-build-amd64
+          platform: amd64
+          machine_image: ubuntu-2004:202107-02
+          resource_class: medium
           requires:
             - preflight
-      - docker-build-arm64:
+      - docker-build:
+          name: docker-build-arm64
+          platform: arm64
+          # The latest version of ubuntu is not yet supported for ARM:
+          # https://circleci.com/docs/2.0/arm-resources/
+          machine_image: ubuntu-2004:202101-01
+          resource_class: arm.medium
           requires:
             - preflight
       - report:
           requires:
             - itest-lambda-docker
             - itest-elasticmq
             - docker-build-amd64
-      - docker-push-amd64:
-          filters:
-            branches:
-              only: master
-          requires:
-            - itest-lambda-docker
-            - itest-elasticmq
-            - docker-build-amd64
             - docker-build-arm64
-      - docker-push-arm64:
+      - docker-push:
           filters:
             branches:
               only: master
@@ -375,10 +320,3 @@ workflows:
             - itest-elasticmq
             - docker-build-amd64
             - docker-build-arm64
-      - docker-create-manifests:
-          filters:
-            branches:
-              only: master
-          requires:
-            - docker-push-amd64
-            - docker-push-arm64