Switch to python-tools-scripts

Signed-off-by: Pedro Algarvio <palgarvio@vmware.com>
saltstack · Nov 24, 2023 · fc89bfe · fc89bfe
1 parent d536219
commit fc89bfe
Show file tree

Hide file tree

Showing 34 changed files with 564 additions and 120 deletions.
diff --git a/.github/workflows/.container.template.j2 b/.github/workflows/.container.template.j2
@@ -147,7 +147,7 @@ jobs:
         if: ${{ github.repository == 'saltstack/salt-ci-containers' && contains(fromJSON('["push", "schedule", "workflow_dispatch"]'), github.event_name) }}
         run: |
           mkdir -p /tmp/digests
-          touch /tmp/digests/$(echo ${{ steps.build.outputs.digest }} | cut -d ":" -f 2)
+          touch "/tmp/digests/$(echo ${{ steps.build.outputs.digest }} | cut -d ':' -f 2)"
           ls -lah /tmp/digests
 
       - name: Upload digest
@@ -184,12 +184,25 @@ jobs:
       statuses: read
 
     steps:
+
+      - name: "Fetching Repository Contents"
+        uses: actions/checkout@v4
+
       - name: Download digests
         uses: actions/download-artifact@v3
         with:
           name: digests-${{ needs.matrix-generator.outputs.name }}-${{ matrix.tag }}
           path: /tmp/digests
 
+      - name: Setup Python
+        uses: actions/setup-python@v4
+        with:
+          python-version: '3.11'
+
+      - name: Install Requirements
+        run: |
+          python -m pip install -r requirements.txt
+
       - name: Show digests
         run: |
           tree -a /tmp/digests
@@ -218,9 +231,8 @@ jobs:
 
       - name: Create manifest list and push
         working-directory: /tmp/digests
-        run: | # shellcheck disable=SC2046
-          docker buildx imagetools create $(jq -cr '.tags | map("-t " + .) | join(" ")' <<< "$DOCKER_METADATA_OUTPUT_JSON") \
-            $(printf 'ghcr.io/${{ github.repository }}/${{ needs.matrix-generator.outputs.name }}@sha256:%s ' *)
+        run:
+          tools ci create-manifest-list-and-push ghcr.io/${{ github.repository }}/${{ needs.matrix-generator.outputs.name }} /tmp/digests
 
       - name: Inspect image
         run: |

diff --git a/.github/workflows/almalinux-containers.yml b/.github/workflows/almalinux-containers.yml
@@ -147,7 +147,7 @@ jobs:
         if: ${{ github.repository == 'saltstack/salt-ci-containers' && contains(fromJSON('["push", "schedule", "workflow_dispatch"]'), github.event_name) }}
         run: |
           mkdir -p /tmp/digests
-          touch /tmp/digests/$(echo ${{ steps.build.outputs.digest }} | cut -d ":" -f 2)
+          touch "/tmp/digests/$(echo ${{ steps.build.outputs.digest }} | cut -d ':' -f 2)"
           ls -lah /tmp/digests
 
       - name: Upload digest
@@ -184,12 +184,25 @@ jobs:
       statuses: read
 
     steps:
+
+      - name: "Fetching Repository Contents"
+        uses: actions/checkout@v4
+
       - name: Download digests
         uses: actions/download-artifact@v3
         with:
           name: digests-${{ needs.matrix-generator.outputs.name }}-${{ matrix.tag }}
           path: /tmp/digests
 
+      - name: Setup Python
+        uses: actions/setup-python@v4
+        with:
+          python-version: '3.11'
+
+      - name: Install Requirements
+        run: |
+          python -m pip install -r requirements.txt
+
       - name: Show digests
         run: |
           tree -a /tmp/digests
@@ -218,9 +231,8 @@ jobs:
 
       - name: Create manifest list and push
         working-directory: /tmp/digests
-        run: | # shellcheck disable=SC2046
-          docker buildx imagetools create $(jq -cr '.tags | map("-t " + .) | join(" ")' <<< "$DOCKER_METADATA_OUTPUT_JSON") \
-            $(printf 'ghcr.io/${{ github.repository }}/${{ needs.matrix-generator.outputs.name }}@sha256:%s ' *)
+        run:
+          tools ci create-manifest-list-and-push ghcr.io/${{ github.repository }}/${{ needs.matrix-generator.outputs.name }} /tmp/digests
 
       - name: Inspect image
         run: |

diff --git a/.github/workflows/amazonlinux-containers.yml b/.github/workflows/amazonlinux-containers.yml
@@ -147,7 +147,7 @@ jobs:
         if: ${{ github.repository == 'saltstack/salt-ci-containers' && contains(fromJSON('["push", "schedule", "workflow_dispatch"]'), github.event_name) }}
         run: |
           mkdir -p /tmp/digests
-          touch /tmp/digests/$(echo ${{ steps.build.outputs.digest }} | cut -d ":" -f 2)
+          touch "/tmp/digests/$(echo ${{ steps.build.outputs.digest }} | cut -d ':' -f 2)"
           ls -lah /tmp/digests
 
       - name: Upload digest
@@ -184,12 +184,25 @@ jobs:
       statuses: read
 
     steps:
+
+      - name: "Fetching Repository Contents"
+        uses: actions/checkout@v4
+
       - name: Download digests
         uses: actions/download-artifact@v3
         with:
           name: digests-${{ needs.matrix-generator.outputs.name }}-${{ matrix.tag }}
           path: /tmp/digests
 
+      - name: Setup Python
+        uses: actions/setup-python@v4
+        with:
+          python-version: '3.11'
+
+      - name: Install Requirements
+        run: |
+          python -m pip install -r requirements.txt
+
       - name: Show digests
         run: |
           tree -a /tmp/digests
@@ -218,9 +231,8 @@ jobs:
 
       - name: Create manifest list and push
         working-directory: /tmp/digests
-        run: | # shellcheck disable=SC2046
-          docker buildx imagetools create $(jq -cr '.tags | map("-t " + .) | join(" ")' <<< "$DOCKER_METADATA_OUTPUT_JSON") \
-            $(printf 'ghcr.io/${{ github.repository }}/${{ needs.matrix-generator.outputs.name }}@sha256:%s ' *)
+        run:
+          tools ci create-manifest-list-and-push ghcr.io/${{ github.repository }}/${{ needs.matrix-generator.outputs.name }} /tmp/digests
 
       - name: Inspect image
         run: |

diff --git a/.github/workflows/archlinux-containers.yml b/.github/workflows/archlinux-containers.yml
@@ -147,7 +147,7 @@ jobs:
         if: ${{ github.repository == 'saltstack/salt-ci-containers' && contains(fromJSON('["push", "schedule", "workflow_dispatch"]'), github.event_name) }}
         run: |
           mkdir -p /tmp/digests
-          touch /tmp/digests/$(echo ${{ steps.build.outputs.digest }} | cut -d ":" -f 2)
+          touch "/tmp/digests/$(echo ${{ steps.build.outputs.digest }} | cut -d ':' -f 2)"
           ls -lah /tmp/digests
 
       - name: Upload digest
@@ -184,12 +184,25 @@ jobs:
       statuses: read
 
     steps:
+
+      - name: "Fetching Repository Contents"
+        uses: actions/checkout@v4
+
       - name: Download digests
         uses: actions/download-artifact@v3
         with:
           name: digests-${{ needs.matrix-generator.outputs.name }}-${{ matrix.tag }}
           path: /tmp/digests
 
+      - name: Setup Python
+        uses: actions/setup-python@v4
+        with:
+          python-version: '3.11'
+
+      - name: Install Requirements
+        run: |
+          python -m pip install -r requirements.txt
+
       - name: Show digests
         run: |
           tree -a /tmp/digests
@@ -218,9 +231,8 @@ jobs:
 
       - name: Create manifest list and push
         working-directory: /tmp/digests
-        run: | # shellcheck disable=SC2046
-          docker buildx imagetools create $(jq -cr '.tags | map("-t " + .) | join(" ")' <<< "$DOCKER_METADATA_OUTPUT_JSON") \
-            $(printf 'ghcr.io/${{ github.repository }}/${{ needs.matrix-generator.outputs.name }}@sha256:%s ' *)
+        run:
+          tools ci create-manifest-list-and-push ghcr.io/${{ github.repository }}/${{ needs.matrix-generator.outputs.name }} /tmp/digests
 
       - name: Inspect image
         run: |

diff --git a/.github/workflows/busybox-containers.yml b/.github/workflows/busybox-containers.yml
@@ -147,7 +147,7 @@ jobs:
         if: ${{ github.repository == 'saltstack/salt-ci-containers' && contains(fromJSON('["push", "schedule", "workflow_dispatch"]'), github.event_name) }}
         run: |
           mkdir -p /tmp/digests
-          touch /tmp/digests/$(echo ${{ steps.build.outputs.digest }} | cut -d ":" -f 2)
+          touch "/tmp/digests/$(echo ${{ steps.build.outputs.digest }} | cut -d ':' -f 2)"
           ls -lah /tmp/digests
 
       - name: Upload digest
@@ -184,12 +184,25 @@ jobs:
       statuses: read
 
     steps:
+
+      - name: "Fetching Repository Contents"
+        uses: actions/checkout@v4
+
       - name: Download digests
         uses: actions/download-artifact@v3
         with:
           name: digests-${{ needs.matrix-generator.outputs.name }}-${{ matrix.tag }}
           path: /tmp/digests
 
+      - name: Setup Python
+        uses: actions/setup-python@v4
+        with:
+          python-version: '3.11'
+
+      - name: Install Requirements
+        run: |
+          python -m pip install -r requirements.txt
+
       - name: Show digests
         run: |
           tree -a /tmp/digests
@@ -218,9 +231,8 @@ jobs:
 
       - name: Create manifest list and push
         working-directory: /tmp/digests
-        run: | # shellcheck disable=SC2046
-          docker buildx imagetools create $(jq -cr '.tags | map("-t " + .) | join(" ")' <<< "$DOCKER_METADATA_OUTPUT_JSON") \
-            $(printf 'ghcr.io/${{ github.repository }}/${{ needs.matrix-generator.outputs.name }}@sha256:%s ' *)
+        run:
+          tools ci create-manifest-list-and-push ghcr.io/${{ github.repository }}/${{ needs.matrix-generator.outputs.name }} /tmp/digests
 
       - name: Inspect image
         run: |

diff --git a/.github/workflows/centos-containers.yml b/.github/workflows/centos-containers.yml
@@ -147,7 +147,7 @@ jobs:
         if: ${{ github.repository == 'saltstack/salt-ci-containers' && contains(fromJSON('["push", "schedule", "workflow_dispatch"]'), github.event_name) }}
         run: |
           mkdir -p /tmp/digests
-          touch /tmp/digests/$(echo ${{ steps.build.outputs.digest }} | cut -d ":" -f 2)
+          touch "/tmp/digests/$(echo ${{ steps.build.outputs.digest }} | cut -d ':' -f 2)"
           ls -lah /tmp/digests
 
       - name: Upload digest
@@ -184,12 +184,25 @@ jobs:
       statuses: read
 
     steps:
+
+      - name: "Fetching Repository Contents"
+        uses: actions/checkout@v4
+
       - name: Download digests
         uses: actions/download-artifact@v3
         with:
           name: digests-${{ needs.matrix-generator.outputs.name }}-${{ matrix.tag }}
           path: /tmp/digests
 
+      - name: Setup Python
+        uses: actions/setup-python@v4
+        with:
+          python-version: '3.11'
+
+      - name: Install Requirements
+        run: |
+          python -m pip install -r requirements.txt
+
       - name: Show digests
         run: |
           tree -a /tmp/digests
@@ -218,9 +231,8 @@ jobs:
 
       - name: Create manifest list and push
         working-directory: /tmp/digests
-        run: | # shellcheck disable=SC2046
-          docker buildx imagetools create $(jq -cr '.tags | map("-t " + .) | join(" ")' <<< "$DOCKER_METADATA_OUTPUT_JSON") \
-            $(printf 'ghcr.io/${{ github.repository }}/${{ needs.matrix-generator.outputs.name }}@sha256:%s ' *)
+        run:
+          tools ci create-manifest-list-and-push ghcr.io/${{ github.repository }}/${{ needs.matrix-generator.outputs.name }} /tmp/digests
 
       - name: Inspect image
         run: |

diff --git a/.github/workflows/centos-stream-containers.yml b/.github/workflows/centos-stream-containers.yml
@@ -147,7 +147,7 @@ jobs:
         if: ${{ github.repository == 'saltstack/salt-ci-containers' && contains(fromJSON('["push", "schedule", "workflow_dispatch"]'), github.event_name) }}
         run: |
           mkdir -p /tmp/digests
-          touch /tmp/digests/$(echo ${{ steps.build.outputs.digest }} | cut -d ":" -f 2)
+          touch "/tmp/digests/$(echo ${{ steps.build.outputs.digest }} | cut -d ':' -f 2)"
           ls -lah /tmp/digests
 
       - name: Upload digest
@@ -184,12 +184,25 @@ jobs:
       statuses: read
 
     steps:
+
+      - name: "Fetching Repository Contents"
+        uses: actions/checkout@v4
+
       - name: Download digests
         uses: actions/download-artifact@v3
         with:
           name: digests-${{ needs.matrix-generator.outputs.name }}-${{ matrix.tag }}
           path: /tmp/digests
 
+      - name: Setup Python
+        uses: actions/setup-python@v4
+        with:
+          python-version: '3.11'
+
+      - name: Install Requirements
+        run: |
+          python -m pip install -r requirements.txt
+
       - name: Show digests
         run: |
           tree -a /tmp/digests
@@ -218,9 +231,8 @@ jobs:
 
       - name: Create manifest list and push
         working-directory: /tmp/digests
-        run: | # shellcheck disable=SC2046
-          docker buildx imagetools create $(jq -cr '.tags | map("-t " + .) | join(" ")' <<< "$DOCKER_METADATA_OUTPUT_JSON") \
-            $(printf 'ghcr.io/${{ github.repository }}/${{ needs.matrix-generator.outputs.name }}@sha256:%s ' *)
+        run:
+          tools ci create-manifest-list-and-push ghcr.io/${{ github.repository }}/${{ needs.matrix-generator.outputs.name }} /tmp/digests
 
       - name: Inspect image
         run: |

diff --git a/.github/workflows/consul-containers.yml b/.github/workflows/consul-containers.yml
@@ -147,7 +147,7 @@ jobs:
         if: ${{ github.repository == 'saltstack/salt-ci-containers' && contains(fromJSON('["push", "schedule", "workflow_dispatch"]'), github.event_name) }}
         run: |
           mkdir -p /tmp/digests
-          touch /tmp/digests/$(echo ${{ steps.build.outputs.digest }} | cut -d ":" -f 2)
+          touch "/tmp/digests/$(echo ${{ steps.build.outputs.digest }} | cut -d ':' -f 2)"
           ls -lah /tmp/digests
 
       - name: Upload digest
@@ -184,12 +184,25 @@ jobs:
       statuses: read
 
     steps:
+
+      - name: "Fetching Repository Contents"
+        uses: actions/checkout@v4
+
       - name: Download digests
         uses: actions/download-artifact@v3
         with:
           name: digests-${{ needs.matrix-generator.outputs.name }}-${{ matrix.tag }}
           path: /tmp/digests
 
+      - name: Setup Python
+        uses: actions/setup-python@v4
+        with:
+          python-version: '3.11'
+
+      - name: Install Requirements
+        run: |
+          python -m pip install -r requirements.txt
+
       - name: Show digests
         run: |
           tree -a /tmp/digests
@@ -218,9 +231,8 @@ jobs:
 
       - name: Create manifest list and push
         working-directory: /tmp/digests
-        run: | # shellcheck disable=SC2046
-          docker buildx imagetools create $(jq -cr '.tags | map("-t " + .) | join(" ")' <<< "$DOCKER_METADATA_OUTPUT_JSON") \
-            $(printf 'ghcr.io/${{ github.repository }}/${{ needs.matrix-generator.outputs.name }}@sha256:%s ' *)
+        run:
+          tools ci create-manifest-list-and-push ghcr.io/${{ github.repository }}/${{ needs.matrix-generator.outputs.name }} /tmp/digests
 
       - name: Inspect image
         run: |