From e87b11ac388ef72524e248804902e56b66da061b Mon Sep 17 00:00:00 2001 From: ludamad Date: Fri, 10 Jan 2025 18:55:37 -0500 Subject: [PATCH] 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 | 3 +-- Dockerfile.boxes | 4 ++-- build-images/Earthfile | 10 +++++++--- ci3/aws/ami_update.sh | 6 +++--- ci3/bootstrap_ec2 | 2 +- ci3/bootstrap_local | 2 +- ci3/bootstrap_local_noninteractive | 2 +- 7 files changed, 16 insertions(+), 13 deletions(-) diff --git a/.github/workflows/ci-arm.yml b/.github/workflows/ci-arm.yml index d763bfbf395..77b4c150bdf 100644 --- a/.github/workflows/ci-arm.yml +++ b/.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 diff --git a/Dockerfile.boxes b/Dockerfile.boxes index e370080d1fa..1949c745dee 100644 --- a/Dockerfile.boxes +++ b/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 \ No newline at end of file +RUN /usr/local/share/docker-init.sh &> /dev/null && ./bootstrap.sh test diff --git a/build-images/Earthfile b/build-images/Earthfile index c31d7227855..bed625beafc 100644 --- a/build-images/Earthfile +++ b/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 diff --git a/ci3/aws/ami_update.sh b/ci3/aws/ami_update.sh index 8cf531d7414..b523ca8a903 100755 --- a/ci3/aws/ami_update.sh +++ b/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 \ No newline at end of file +fi diff --git a/ci3/bootstrap_ec2 b/ci3/bootstrap_ec2 index a73f00a4728..4427a0b3ee1 100755 --- a/ci3/bootstrap_ec2 +++ b/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 diff --git a/ci3/bootstrap_local b/ci3/bootstrap_local index 3f225c96670..d0aac19febe 100755 --- a/ci3/bootstrap_local +++ b/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 diff --git a/ci3/bootstrap_local_noninteractive b/ci3/bootstrap_local_noninteractive index 4d3eedfef8d..e0a489a46b7 100755 --- a/ci3/bootstrap_local_noninteractive +++ b/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