Merge pull request #3957 from ethereum-optimism/zhwrd/fix-checkout-docker-tag-job

fixes a few bugs and better error handling for docker-tag job

.circleci/config.yml

@@ -171,18 +171,17 @@ jobs:
         type: string
         default: "bedrock-goerli-development/images"
     docker:
-      - image: google/cloud-sdk:latest
+      - image: cimg/python:3.7
     resource_class: small
     steps:
-      - run:
-          command: mkdir -p /home/circleci
+      - gcp-cli/install
       - gcp-oidc-authenticate
       - checkout
       - run:
           name: Tag
           command: |
             gcloud auth configure-docker <<parameters.registry>>
-            ./ops/ci-docker-tag-op-stack-release.sh <<parameters.registry>>/<<parameters.repo>> $CIRCLE_TAG $CIRCLE_SHA1
+            ./ops/scripts/ci-docker-tag-op-stack-release.sh <<parameters.registry>>/<<parameters.repo>> $CIRCLE_TAG $CIRCLE_SHA1
 
   contracts-bedrock-tests:
     docker:

ops/scripts/ci-docker-tag-op-stack-release.sh

@@ -6,8 +6,16 @@ DOCKER_REPO=$1
 GIT_TAG=$2
 GIT_SHA=$3
 
-IMAGE_NAME=$(echo "$GIT_TAG" | grep -Eow '^op-[a-z0-9\-]*')
-IMAGE_TAG=$(echo "$GIT_TAG" | grep -Eow 'v.*')
+IMAGE_NAME=$(echo "$GIT_TAG" | grep -Eow '^op-[a-z0-9\-]*' || true)
+if [ -z "$IMAGE_NAME" ]; then
+  echo "image name could not be parsed from git tag '$GIT_TAG'"
+  exit 1
+fi
+IMAGE_TAG=$(echo "$GIT_TAG" | grep -Eow 'v.*' || true)
+if [ -z "$IMAGE_TAG" ]; then
+  echo "image tag could not be parsed from git tag '$GIT_TAG'"
+  exit 1
+fi
 
 SOURCE_IMAGE_TAG="$DOCKER_REPO/$IMAGE_NAME:$GIT_SHA"
 TARGET_IMAGE_TAG="$DOCKER_REPO/$IMAGE_NAME:$IMAGE_TAG"