Merge pull request #60 from canonical/housekeeping/CI

Fixed publish and cleanup workflows
canonical · Aug 8, 2024 · 1484afc · 1484afc
2 parents 93391b3 + 4a05746
commit 1484afc
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 13 deletions.
diff --git a/.github/workflows/publish_edge.yaml b/.github/workflows/publish_edge.yaml
@@ -27,6 +27,7 @@ jobs:
 
       - name: Install deps and clean legacy rules.
         run: |
+          ./scripts/deploy-helper.sh install_custom_runner_dependencies
           sudo snap install rockcraft --classic --channel latest/stable
           for ipt in iptables iptables-legacy ip6tables ip6tables-legacy; do sudo $ipt --flush; sudo $ipt --flush -t nat; sudo $ipt --delete-chain; sudo $ipt --delete-chain -t nat; sudo $ipt -P FORWARD ACCEPT; sudo $ipt -P INPUT ACCEPT; sudo $ipt -P OUTPUT ACCEPT; done
           sudo systemctl reload snap.lxd.daemon

diff --git a/.github/workflows/publish_hotfix.yaml b/.github/workflows/publish_hotfix.yaml
@@ -38,6 +38,7 @@ jobs:
 
       - name: Install deps and clean legacy rules.
         run: |
+          ./scripts/deploy-helper.sh install_custom_runner_dependencies
           sudo snap install rockcraft --classic --channel latest/stable
           for ipt in iptables iptables-legacy ip6tables ip6tables-legacy; do sudo $ipt --flush; sudo $ipt --flush -t nat; sudo $ipt --delete-chain; sudo $ipt --delete-chain -t nat; sudo $ipt -P FORWARD ACCEPT; sudo $ipt -P INPUT ACCEPT; sudo $ipt -P OUTPUT ACCEPT; done
           sudo systemctl reload snap.lxd.daemon

diff --git a/.github/workflows/publish_release.yaml b/.github/workflows/publish_release.yaml
@@ -26,6 +26,7 @@ jobs:
 
       - name: Install deps and clean legacy rules.
         run: |
+          ./scripts/deploy-helper.sh install_custom_runner_dependencies
           sudo snap install rockcraft --classic --channel latest/stable
           for ipt in iptables iptables-legacy ip6tables ip6tables-legacy; do sudo $ipt --flush; sudo $ipt --flush -t nat; sudo $ipt --delete-chain; sudo $ipt --delete-chain -t nat; sudo $ipt -P FORWARD ACCEPT; sudo $ipt -P INPUT ACCEPT; sudo $ipt -P OUTPUT ACCEPT; done
           sudo systemctl reload snap.lxd.daemon

diff --git a/.github/workflows/registry_housekeeping.yaml b/.github/workflows/registry_housekeeping.yaml
@@ -10,25 +10,16 @@ jobs:
     name: GHCR cleanup
     runs-on: ubuntu-22.04
     steps:
-      - name: Delete all untagged Hotfixes.
+      - name: Delete all untagged Hotfixes older than 6 months
         uses: snok/container-retention-policy@v2
         with:
-          image-names: hotfix-*
-          cut-off: one month ago UTC
+          image-names: ceph
+          image-tags: hotfix-*
+          cut-off: 6months
           timestamp-to-use: updated_at
           untagged-only: true
           account-type: org
           org-name: canonical
           token: ${{ secrets.GITHUB_TOKEN }}
           token-type: github-token
 
-      - name: Delete all tagged Hotfixes older than 6 months.
-        uses: snok/container-retention-policy@v2
-        with:
-          image-names: hotfix-*
-          cut-off: six months ago UTC
-          timestamp-to-use: updated_at
-          account-type: org
-          org-name: canonical
-          token: ${{ secrets.GITHUB_TOKEN }}
-          token-type: github-token