Switch to python-tools-scripts

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

Hide file tree

Showing 40 changed files with 969 additions and 1,096 deletions.
diff --git a/.github/workflows/.container.template.j2 b/.github/workflows/.container.template.j2
@@ -45,23 +45,16 @@ jobs:
       - name: Setup Python
         uses: actions/setup-python@v4
         with:
-          python-version: '3.9'
+          python-version: '3.11'
 
       - name: Install Requirements
         run: |
           python -m pip install -r requirements.txt
 
-      - name: "Docker QEMU"
-        uses: docker/setup-qemu-action@v3
-
-      - name: "Docker BuildX"
-        id: buildx
-        uses: docker/setup-buildx-action@v3
-
       - name: "Generate Matrix Data"
         id: set-matrix
         run: |
-          inv containers.matrix --from-workflow ${{ env.PATH_IN_REPO }}
+          tools ci matrix ${{ env.PATH_IN_REPO }}
 
   build:
     runs-on: ubuntu-latest
@@ -86,15 +79,6 @@ jobs:
       - name: "Fetching Repository Contents"
         uses: actions/checkout@v4
 
-      - name: Setup Python
-        uses: actions/setup-python@v4
-        with:
-          python-version: '3.9'
-
-      - name: Install Requirements
-        run: |
-          python -m pip install -r requirements.txt
-
       - name: "Throttle concurrent pushes"
         run: |
           t="$(shuf -i 5-30 -n 1)"; echo "Sleeping $t seconds"; sleep "$t"
@@ -147,7 +131,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 +168,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 +215,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
@@ -45,23 +45,16 @@ jobs:
       - name: Setup Python
         uses: actions/setup-python@v4
         with:
-          python-version: '3.9'
+          python-version: '3.11'
 
       - name: Install Requirements
         run: |
           python -m pip install -r requirements.txt
 
-      - name: "Docker QEMU"
-        uses: docker/setup-qemu-action@v3
-
-      - name: "Docker BuildX"
-        id: buildx
-        uses: docker/setup-buildx-action@v3
-
       - name: "Generate Matrix Data"
         id: set-matrix
         run: |
-          inv containers.matrix --from-workflow ${{ env.PATH_IN_REPO }}
+          tools ci matrix ${{ env.PATH_IN_REPO }}
 
   build:
     runs-on: ubuntu-latest
@@ -86,15 +79,6 @@ jobs:
       - name: "Fetching Repository Contents"
         uses: actions/checkout@v4
 
-      - name: Setup Python
-        uses: actions/setup-python@v4
-        with:
-          python-version: '3.9'
-
-      - name: Install Requirements
-        run: |
-          python -m pip install -r requirements.txt
-
       - name: "Throttle concurrent pushes"
         run: |
           t="$(shuf -i 5-30 -n 1)"; echo "Sleeping $t seconds"; sleep "$t"
@@ -147,7 +131,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 +168,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 +215,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
@@ -45,23 +45,16 @@ jobs:
       - name: Setup Python
         uses: actions/setup-python@v4
         with:
-          python-version: '3.9'
+          python-version: '3.11'
 
       - name: Install Requirements
         run: |
           python -m pip install -r requirements.txt
 
-      - name: "Docker QEMU"
-        uses: docker/setup-qemu-action@v3
-
-      - name: "Docker BuildX"
-        id: buildx
-        uses: docker/setup-buildx-action@v3
-
       - name: "Generate Matrix Data"
         id: set-matrix
         run: |
-          inv containers.matrix --from-workflow ${{ env.PATH_IN_REPO }}
+          tools ci matrix ${{ env.PATH_IN_REPO }}
 
   build:
     runs-on: ubuntu-latest
@@ -86,15 +79,6 @@ jobs:
       - name: "Fetching Repository Contents"
         uses: actions/checkout@v4
 
-      - name: Setup Python
-        uses: actions/setup-python@v4
-        with:
-          python-version: '3.9'
-
-      - name: Install Requirements
-        run: |
-          python -m pip install -r requirements.txt
-
       - name: "Throttle concurrent pushes"
         run: |
           t="$(shuf -i 5-30 -n 1)"; echo "Sleeping $t seconds"; sleep "$t"
@@ -147,7 +131,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 +168,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 +215,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
@@ -45,23 +45,16 @@ jobs:
       - name: Setup Python
         uses: actions/setup-python@v4
         with:
-          python-version: '3.9'
+          python-version: '3.11'
 
       - name: Install Requirements
         run: |
           python -m pip install -r requirements.txt
 
-      - name: "Docker QEMU"
-        uses: docker/setup-qemu-action@v3
-
-      - name: "Docker BuildX"
-        id: buildx
-        uses: docker/setup-buildx-action@v3
-
       - name: "Generate Matrix Data"
         id: set-matrix
         run: |
-          inv containers.matrix --from-workflow ${{ env.PATH_IN_REPO }}
+          tools ci matrix ${{ env.PATH_IN_REPO }}
 
   build:
     runs-on: ubuntu-latest
@@ -86,15 +79,6 @@ jobs:
       - name: "Fetching Repository Contents"
         uses: actions/checkout@v4
 
-      - name: Setup Python
-        uses: actions/setup-python@v4
-        with:
-          python-version: '3.9'
-
-      - name: Install Requirements
-        run: |
-          python -m pip install -r requirements.txt
-
       - name: "Throttle concurrent pushes"
         run: |
           t="$(shuf -i 5-30 -n 1)"; echo "Sleeping $t seconds"; sleep "$t"
@@ -147,7 +131,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 +168,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 +215,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: |