See if git in end-to-end

AztecProtocol · Sep 4, 2023 · e9e42db · e9e42db
1 parent 0784b61
commit e9e42db
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 6 deletions.
diff --git a/build-system/scripts/remote_run_script b/build-system/scripts/remote_run_script
@@ -2,9 +2,8 @@
 set -eu
 
 IP=$1
-CONTENT_HASH=$2
-FULL_PATH=$3
-shift 3
+FULL_PATH=$2
+shift 2
 
 SSH_CONFIG_PATH=${SSH_CONFIG_PATH:-$BUILD_SYSTEM_PATH/remote/ssh_config}
 DIR_NAME=$(dirname $FULL_PATH)
@@ -15,4 +14,4 @@ scp -F $SSH_CONFIG_PATH $DIR_NAME/* $IP:.
 scp -rF $SSH_CONFIG_PATH $BUILD_SYSTEM_PATH $BUILD_SYSTEM_PATH/../.git $IP:.
 
 # Run script on remote instance, passing environment variables.
-ssh -A -F $SSH_CONFIG_PATH $IP "CONTENT_HASH=$CONTENT_HASH COMMIT_HASH=$COMMIT_HASH COMMIT_TAG=$COMMIT_TAG JOB_NAME=$JOB_NAME GIT_REPOSITORY_URL=$GIT_REPOSITORY_URL DOCKERHUB_PASSWORD=$DOCKERHUB_PASSWORD ECR_DEPLOY_URL=$ECR_DEPLOY_URL ECR_URL=$ECR_URL ./$SCRIPT_NAME $@"
+ssh -A -F $SSH_CONFIG_PATH $IP "COMMIT_HASH=$COMMIT_HASH COMMIT_TAG=$COMMIT_TAG JOB_NAME=$JOB_NAME GIT_REPOSITORY_URL=$GIT_REPOSITORY_URL DOCKERHUB_PASSWORD=$DOCKERHUB_PASSWORD ECR_DEPLOY_URL=$ECR_DEPLOY_URL ECR_URL=$ECR_URL ./$SCRIPT_NAME $@"
diff --git a/yarn-project/end-to-end/scripts/cond_run_script b/yarn-project/end-to-end/scripts/cond_run_script
@@ -29,6 +29,6 @@ echo "Content hash tag: cache-$CONTENT_HASH-$SUCCESS_TAG"
 echo "Script to run is $SCRIPT_TO_RUN $@"
 
 if ! check_rebuild cache-$CONTENT_HASH-$SUCCESS_TAG $REPOSITORY; then
-  CONTENT_HASH="$CONTENT_HASH" "$SCRIPT_TO_RUN" "$@"
+  "$SCRIPT_TO_RUN" "$@"
   tag_remote_image $REPOSITORY cache-$CONTENT_HASH cache-$CONTENT_HASH-$SUCCESS_TAG
 fi
diff --git a/yarn-project/end-to-end/scripts/run_tests b/yarn-project/end-to-end/scripts/run_tests
@@ -8,7 +8,6 @@ export COMPOSE_FILE=${2:-docker-compose.yml}
 
 $(aws ecr get-login --region us-east-2 --no-include-email) 2> /dev/null
 
-git show
 for REPO in aztec.js end-to-end aztec-sandbox; do
   docker pull 278380418400.dkr.ecr.us-east-2.amazonaws.com/$REPO:cache-$CONTENT_HASH
   docker tag 278380418400.dkr.ecr.us-east-2.amazonaws.com/$REPO:cache-$CONTENT_HASH aztecprotocol/$REPO:latest