fix(boxes): fix attempt 2 (#11175)

Boxes continues to be cursed, my fault for not realizing ARM would
overwrite the ci image

.github/workflows/ci-arm.yml

@@ -85,9 +85,8 @@ jobs:
           ./bootstrap.sh image-e2e
       - name: "Test"
         timeout-minutes: 40
-        continue-on-error: true
         run: |
-          ./bootstrap.sh e2e-test uniswap_trade_on_l1_from_l2
+          ./bootstrap.sh test-e2e uniswap_trade_on_l1_from_l2
 
   rerun-check:
     runs-on: ubuntu-20.04

Dockerfile.boxes

@@ -1,5 +1,5 @@
-FROM aztecprotocol/ci:2.1
+FROM aztecprotocol/ci:2.2
 COPY /usr/src /usr/src
 WORKDIR /usr/src/boxes
 RUN ls /usr/src/boxes
-RUN /usr/local/share/docker-init.sh &> /dev/null && ./bootstrap.sh test
+RUN /usr/local/share/docker-init.sh &> /dev/null && ./bootstrap.sh test

build-images/Earthfile

@@ -234,8 +234,8 @@ ci:
   ENV CI=1
 
   ARG TARGETARCH
-  SAVE IMAGE --push aztecprotocol/ci:2.1-$TARGETARCH
-  SAVE IMAGE --push aztecprotocol/ci:2.1
+  SAVE IMAGE --push aztecprotocol/ci:2.2-$TARGETARCH
+  SAVE IMAGE --push aztecprotocol/ci:2.2
 
 ########################################################################################################################
 # We want to produce downstream images: devbox and sysbox. This image is the base image for each.
@@ -500,11 +500,15 @@ end-to-end-base:
   SAVE IMAGE --push aztecprotocol/end-to-end-base:v1.0-$TARGETARCH
 
 all-ci:
+  LOCALLY
+  ARG TARGETARCH
   # Build all images needed by ci, pushing them to the registry.
   BUILD +base-build
   BUILD +wasi-sdk
   BUILD +foundry
   BUILD +build
-  BUILD +ci
+  IF [ $TARGETARCH = amd64 ]
+    BUILD +ci
+  END
   BUILD +aztec-base
   BUILD +end-to-end-base

ci3/aws/ami_update.sh

@@ -36,9 +36,9 @@ scp -F build_instance_ssh_config $HOME/.aws/build_instance_credentials ubuntu@$i
 # Download crs onto machine.
 ssh -t -F build_instance_ssh_config ubuntu@$ip < ../../barretenberg/scripts/download_bb_crs.sh
 
-# Pull ci:2.1 onto host, and build:2.0 into docker-in-docker volume.
+# Pull ci:2.2 onto host, and build:2.0 into docker-in-docker volume.
 ssh -t -F build_instance_ssh_config ubuntu@$ip '
-  docker run --privileged -ti --rm -v boostrap_ci_local_docker:/var/lib/docker aztecprotocol/ci:2.1 bash -c "
+  docker run --privileged -ti --rm -v boostrap_ci_local_docker:/var/lib/docker aztecprotocol/ci:2.2 bash -c "
     /usr/local/share/docker-init.sh &> /dev/null
     sleep 5
     docker pull aztecprotocol/build:2.0
@@ -51,4 +51,4 @@ if [ "${NO_AMI:-0}" -eq 0 ]; then
   echo "Waiting for AMI to be created: $ami_id"
   while ! aws ec2 wait image-available --image-ids "$ami_id"; do true; done
   echo "Done."
-fi
+fi

ci3/bootstrap_ec2

@@ -66,7 +66,7 @@ ssh -t -F $ci3/aws/build_instance_ssh_config ubuntu@$ip "
     -v boostrap_ci_local_docker:/var/lib/docker \
     -v \$HOME:/root \
     -v /tmp:/tmp \
-    aztecprotocol/ci:2.1 bash -c '
+    aztecprotocol/ci:2.2 bash -c '
       [ -n \"$GITHUB_LOG\" ] && echo "::endgroup::"
       [ -n \"$GITHUB_LOG\" ] && echo "::group::Clone Repository"
       set -e

ci3/bootstrap_local

@@ -21,7 +21,7 @@ docker run --name aztec_build -ti --rm \
   -v $root:/aztec-packages-host:ro \
   -v $HOME/.aws:/root/.aws:ro \
   -v $HOME/.bb-crs:/root/.bb-crs:ro \
-  aztecprotocol/ci:2.1 bash -c "
+  aztecprotocol/ci:2.2 bash -c "
   set -e
   /usr/local/share/docker-init.sh &> /dev/null
   git config --global --add safe.directory /aztec-packages-host/.git

ci3/bootstrap_local_noninteractive

@@ -17,7 +17,7 @@ docker run --rm \
   -v bootstrap_ci_local_docker:/var/lib/docker \
   -v $root:/aztec-packages-host:ro \
   -v $HOME/.aws:/root/.aws \
-  aztecprotocol/ci:2.1 bash -c "
+  aztecprotocol/ci:2.2 bash -c "
   /usr/local/share/docker-init.sh &> /dev/null
   git config --global --add safe.directory /aztec-packages-host/.git
   mkdir -p /root/aztec-packages && cd /root/aztec-packages