From 30017952b33ee29a017bc40548e2a7aea78c8218 Mon Sep 17 00:00:00 2001 From: Jake Briggs Date: Thu, 2 Jan 2025 19:29:56 -0600 Subject: [PATCH] test 6 --- .github/workflows/image-pull-and-tag.yaml | 8 ++++---- .original-images.yaml | 3 +-- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/.github/workflows/image-pull-and-tag.yaml b/.github/workflows/image-pull-and-tag.yaml index d1934aab..21cb99cb 100644 --- a/.github/workflows/image-pull-and-tag.yaml +++ b/.github/workflows/image-pull-and-tag.yaml @@ -24,13 +24,13 @@ jobs: - name: Read images from .original-images.yaml id: parse_images run: | - IMAGES=$(yq '.images | join(",")' .original-images.yaml) - echo "matrix=$(echo $IMAGES | jq -R -s -c 'split(",")')" >> $GITHUB_ENV + IMAGES=$(yq '.images' .original-images.yaml | jq -R -s -c 'split("\n") | map(select(. != ""))') + echo "matrix=$IMAGES" >> $GITHUB_ENV + echo "::set-output name=matrix::$IMAGES" - name: Create matrix id: create_matrix - run: | - echo "::set-output name=matrix::$(echo $IMAGES | jq -R -s -c 'split(",")')" + run: echo "::set-output name=matrix::$(echo $IMAGES)" migrate-images: needs: setup-matrix diff --git a/.original-images.yaml b/.original-images.yaml index d4b457a6..025e3fef 100644 --- a/.original-images.yaml +++ b/.original-images.yaml @@ -1,5 +1,4 @@ ---- images: - docker.io/openstackhelm/heat:2024.1-ubuntu_jammy - docker.io/openstackhelm/glance:2024.1-ubuntu_jammy -# - docker.io/openstackhelm/ceph-config-helper:latest-ubuntu_jammy + - docker.io/openstackhelm/ceph-config-helper:latest-ubuntu_jammy