From cbdade151ab12181eee07fa50518c5c27f9ddc3b Mon Sep 17 00:00:00 2001 From: ishaansehgal99 Date: Mon, 29 Jan 2024 20:25:44 -0800 Subject: [PATCH] fix: prevent image not found error --- .github/workflows/e2e-preset-test.yml | 38 ++++++++++++++++++--------- 1 file changed, 25 insertions(+), 13 deletions(-) diff --git a/.github/workflows/e2e-preset-test.yml b/.github/workflows/e2e-preset-test.yml index 5a0c85675..56979cb63 100644 --- a/.github/workflows/e2e-preset-test.yml +++ b/.github/workflows/e2e-preset-test.yml @@ -100,14 +100,20 @@ jobs: ACR_NAME=${{ secrets.ACR_AMRT_USERNAME }} IMAGE_NAME=${{ matrix.model.name }} TAG=${{ matrix.model.tag }} - - TAGS=$(az acr repository show-tags -n $ACR_NAME --repository $IMAGE_NAME --output tsv) - - if echo "$TAGS" | grep -q "^$TAG$"; then - echo "IMAGE_EXISTS=true" >> $GITHUB_OUTPUT - else + + # Use '|| true' to prevent script from exiting with an error if the repository is not found + TAGS=$(az acr repository show-tags -n $ACR_NAME --repository $IMAGE_NAME --output tsv || true) + + if [[ -z "$TAGS" ]]; then + echo "Image $IMAGE_NAME:$TAG or repository not found in $ACR_NAME." echo "IMAGE_EXISTS=false" >> $GITHUB_OUTPUT - echo "Image $IMAGE_NAME:$TAG not found in $ACR_NAME." + else + if echo "$TAGS" | grep -q "^$TAG$"; then + echo "IMAGE_EXISTS=true" >> $GITHUB_OUTPUT + else + echo "IMAGE_EXISTS=false" >> $GITHUB_OUTPUT + echo "Image $IMAGE_NAME:$TAG not found in $ACR_NAME." + fi fi - name: 'Check if Image exists in Prod ACR' @@ -117,13 +123,19 @@ jobs: IMAGE_NAME=${{ matrix.model.name }} TAG=${{ matrix.model.tag }} - TAGS=$(az acr repository show-tags -n $ACR_NAME --repository $IMAGE_NAME --output tsv) - - if echo "$TAGS" | grep -q "^$TAG$"; then - echo "IMAGE_EXISTS=true" >> $GITHUB_OUTPUT - else + # Use '|| true' to prevent script from exiting with an error if the repository is not found + TAGS=$(az acr repository show-tags -n $ACR_NAME --repository $IMAGE_NAME --output tsv || true) + + if [[ -z "$TAGS" ]]; then + echo "Image $IMAGE_NAME:$TAG or repository not found in $ACR_NAME." echo "IMAGE_EXISTS=false" >> $GITHUB_OUTPUT - echo "Image $IMAGE_NAME:$TAG not found in $ACR_NAME." + else + if echo "$TAGS" | grep -q "^$TAG$"; then + echo "IMAGE_EXISTS=true" >> $GITHUB_OUTPUT + else + echo "IMAGE_EXISTS=false" >> $GITHUB_OUTPUT + echo "Image $IMAGE_NAME:$TAG not found in $ACR_NAME." + fi fi - name: Check if Image is Test and Prod ACRs