Fixes and logging

AztecProtocol · Sep 14, 2023 · a3346fd · a3346fd
1 parent c1a6f04
commit a3346fd
Show file tree

Hide file tree

Showing 3 changed files with 30 additions and 9 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -1515,8 +1515,7 @@ workflows:
             - integration-archiver-l1-to-l2
             - e2e-p2p
             - e2e-browser-sandbox
-            - e2e-canary-test-x86_64
-            - e2e-canary-test-arm64
+            - e2e-canary-test
             - e2e-card-game
             - aztec-rpc-sandbox
             - cli-docs-sandbox

diff --git a/build-system/scripts/create_dockerhub_manifest b/build-system/scripts/create_dockerhub_manifest
@@ -1,3 +1,4 @@
+#!/bin/bash
 # This script:
 # 1. Logs into DockerHub
 # 2. Creates 2 manifest lists, the first is version tagged, the second is 'latest' tagged
@@ -14,6 +15,12 @@ fi
 REPOSITORY=$1
 ARCH_LIST=$2
 
+echo "Repo: $REPOSITORY"
+echo "Arch list: $ARCH_LIST"
+
+ACCOUNT="aztecprotocol"
+USERNAME="aztecprotocolci"
+
 COMMIT_TAG_VERSION=$COMMIT_TAG # default unless repo-specific
 # Check if it's a repo-specific tag
 if [[ "$COMMIT_TAG" == *"/"* ]]; then
@@ -39,11 +46,11 @@ fi
 # We now have the tage for each image
 IMAGE_TAG=$COMMIT_TAG_VERSION
 
-MANIFEST_DEPLOY_URI=aztecprotocol/$REPOSITORY:$IMAGE_TAG
-MANIFEST_LATEST_URI=aztecprotocol/$REPOSITORY:latest
+MANIFEST_DEPLOY_URI=$ACCOUNT/$REPOSITORY:$IMAGE_TAG
+MANIFEST_LATEST_URI=$ACCOUNT/$REPOSITORY:latest
 
 # Login to dockerhub.
-echo "$DOCKERHUB_PASSWORD" | docker login -u aztecprotocolci --password-stdin
+echo "$DOCKERHUB_PASSWORD" | docker login -u $USERNAME --password-stdin
 
 export DOCKER_CLI_EXPERIMENTAL=enabled
 
@@ -53,7 +60,7 @@ IFS=','
 # For each arch, add the tagged image to 2 manifest lists. One tagged with the version, the other with 'latest'
 for A in $ARCH_LIST
 do
-  IMAGE_DEPLOY_URI=aztecprotocol/$REPOSITORY:$IMAGE_TAG-$A
+  IMAGE_DEPLOY_URI=$ACCOUNT/$REPOSITORY:$IMAGE_TAG-$A
   echo "Adding image $IMAGE_DEPLOY_URI to manifest list $MANIFEST_DEPLOY_URI"
   docker manifest create $MANIFEST_DEPLOY_URI \
   --amend $IMAGE_DEPLOY_URI
@@ -66,7 +73,10 @@ done
 IFS=$OLD_IFS
 unset OLD_IFS
 
+echo "Pushing manifest list $MANIFEST_DEPLOY_URI..."
 # Push the version tagged list
 docker manifest push --purge $MANIFEST_DEPLOY_URI
+
+echo "Pushing manifest list $MANIFEST_LATEST_URI..."
 # Push the latest tagged list
 docker manifest push --purge $MANIFEST_LATEST_URI
diff --git a/build-system/scripts/deploy_dockerhub b/build-system/scripts/deploy_dockerhub
@@ -8,8 +8,16 @@ fi
 
 REPOSITORY=$1
 ARCH=${2:-""}
+
+echo "Repo: $REPOSITORY"
+echo "Arch: $ARCH"
+
+ACCOUNT="aztecprotocol"
+USERNAME="aztecprotocolci"
+
 IMAGE_COMMIT_URI=$ECR_DEPLOY_URL/$REPOSITORY:$COMMIT_HASH
-IMAGE_LATEST_URI=aztecprotocol/$REPOSITORY:latest
+
+IMAGE_LATEST_URI=$ACCOUNT/$REPOSITORY:latest
 if [[ -n "$ARCH" ]]; then
   IMAGE_COMMIT_URI=$IMAGE_COMMIT_URI-$ARCH
   IMAGE_LATEST_URI=$IMAGE_LATEST_URI-$ARCH
@@ -30,7 +38,7 @@ if [[ "$COMMIT_TAG" == *"/"* ]]; then
   fi
 fi
 IMAGE_TAG=$COMMIT_TAG_VERSION
-IMAGE_DEPLOY_URI=aztecprotocol/$REPOSITORY:$IMAGE_TAG
+IMAGE_DEPLOY_URI=$ACCOUNT/$REPOSITORY:$IMAGE_TAG
 if [[ -n "$ARCH" ]]; then
   IMAGE_DEPLOY_URI=$IMAGE_DEPLOY_URI-$ARCH
 fi
@@ -48,13 +56,17 @@ echo "Deploying to dockerhub: $IMAGE_DEPLOY_URI"
 retry ensure_repo $REPOSITORY $ECR_DEPLOY_REGION
 
 # Login to dockerhub.
-echo "$DOCKERHUB_PASSWORD" | docker login -u aztecprotocolci --password-stdin
+echo "$DOCKERHUB_PASSWORD" | docker login -u $USERNAME --password-stdin
 
+echo "Pulling $IMAGE_COMMIT_URI"
 # Pull image.
 retry docker pull $IMAGE_COMMIT_URI
 
+echo "Tagging $IMAGE_COMMIT_URI as $IMAGE_DEPLOY_URI"
 # Tag with commit tag
 retry docker tag $IMAGE_COMMIT_URI $IMAGE_DEPLOY_URI
+
+echo "Tagging $IMAGE_COMMIT_URI as $IMAGE_LATEST_URI"
 # Tag with :latest
 retry docker tag $IMAGE_COMMIT_URI $IMAGE_LATEST_URI