fix: adjust DefaultImageName

Signed-off-by: Niccolò Fei <[email protected]>

Author: NiccoloFei

.github/workflows/build-commitfest.yml

@@ -79,7 +79,12 @@ jobs:
     - name: Generated images
       id: images
       run: |
-        echo "IMAGES=$(echo '${{ steps.build.outputs.metadata }}' | jq -c '.[]."image.name"')" >> $GITHUB_ENV
+        IMAGES="$(echo '${{ steps.build.outputs.metadata }}' | jq -r '.[]."image.name"')"
+        {
+          echo 'IMAGES<<EOF'
+          echo "${IMAGES}"
+          echo EOF
+        } >> $GITHUB_ENV
 
   generate-summary:
     name: Commitfest Image Build summary
@@ -91,9 +96,9 @@ jobs:
         run: |
           commitFestPatchID=${{ github.event.inputs.patch_id }}
           commitFestURL="https://commitfest.postgresql.org/patch/${commitFestPatchID}"
-          image="${{ needs.build-pg.outputs.images }}"
-          images_list="$(echo $images | jq -r | tr ' ' '\n' | sed 's/^/https:\/\//')"
-          standardImage="$(echo $images | jq -r | grep standard)"
+          images="${{ needs.build-pg.outputs.images }}"
+          images_list="$(echo $images | tr ' ' '\n' | sed 's/^/https:\/\//')"
+          standardImage="$(echo $images | tr ' ' '\n' | grep standard)"
 
           echo "# Commitfest Image Build summary" >> $GITHUB_STEP_SUMMARY
           echo "**Commitfest Patch URL**: [$commitFestPatchID]($commitFestURL)" >> $GITHUB_STEP_SUMMARY

.github/workflows/build.yml

@@ -78,7 +78,12 @@ jobs:
     - name: Generated images
       id: images
       run: |
-        echo "IMAGES=$(echo '${{ steps.build.outputs.metadata }}' | jq -c '.[]."image.name"')" >> $GITHUB_ENV
+        IMAGES="$(echo '${{ steps.build.outputs.metadata }}' | jq -r '.[]."image.name"')"
+        {
+          echo 'IMAGES<<EOF'
+          echo "${IMAGES}"
+          echo EOF
+        } >> $GITHUB_ENV
 
   generate-summary:
     name: PostgreSQL Image Build summary
@@ -90,8 +95,8 @@ jobs:
         run: |
           pg_major="${{ needs.build-pg.outputs.pg_major }}"
           images="${{ needs.build-pg.outputs.images }}"
-          images_list="$(echo $images | jq -r | tr ' ' '\n' | sed 's/^/https:\/\//')"
-          standardImage="$(echo $images | jq -r | grep standard)"
+          images_list="$(echo $images | tr ' ' '\n' | sed 's/^/https:\/\//')"
+          standardImage="$(echo $images | tr ' ' '\n' | grep standard)"
 
           echo "# PostgreSQL Image Build summary" >> $GITHUB_STEP_SUMMARY
           echo "Here's the list of Container Images that have been built:" >> $GITHUB_STEP_SUMMARY

.github/workflows/continuous-delivery.yml

@@ -80,7 +80,7 @@ jobs:
     - name: Generated images
       id: images
       run: |
-        echo "PG_IMAGE=$(echo '${{ steps.build.outputs.metadata }}' | jq -c '.["standard"].["image.name"]' | grep -oP '[^,]*\d{12}[^,]*')" >> $GITHUB_ENV
+        echo "PG_IMAGE=$(echo '${{ steps.build.outputs.metadata }}' | jq -r '.["standard"].["image.name"]' | grep -oP '[^,]*\d{12}[^,]*')" >> $GITHUB_ENV
 
   call-reusable-e2e:
     if: github.event_name == 'schedule'

.github/workflows/reusable-e2e.yml

@@ -127,6 +127,11 @@ jobs:
           docker push $E2E_PRE_ROLLING_UPDATE_IMG
           echo "E2E_PRE_ROLLING_UPDATE_IMG=$E2E_PRE_ROLLING_UPDATE_IMG" >> $GITHUB_ENV
 
+      - name: Setting up default versions
+        run: |
+          # Update pkg/versions/versions.go
+          sed -i '/DefaultImageName *=/s@".*"@"'"${{ inputs.postgres_img }}"'"@' pkg/versions/versions.go
+
       - name: Run Kind End-to-End tests
         run: make e2e-test-kind