From a1e68e430251cba7332007f8e954a4db3a37499d Mon Sep 17 00:00:00 2001
From: Felipe Morato <felipe.morato@csc.fi>
Date: Thu, 8 Aug 2024 10:19:26 +0300
Subject: [PATCH] bump clean-containers to v3.0.0

---
 .github/workflows/clean-containers.yaml | 16 +++++++---------
 scripts/keystone-swift.http             |  6 +++---
 2 files changed, 10 insertions(+), 12 deletions(-)

diff --git a/.github/workflows/clean-containers.yaml b/.github/workflows/clean-containers.yaml
index 451efff..b1a7bbb 100644
--- a/.github/workflows/clean-containers.yaml
+++ b/.github/workflows/clean-containers.yaml
@@ -20,14 +20,12 @@ jobs:
         run: |
           echo "REPO=${GITHUB_REPOSITORY,,}" >>${GITHUB_ENV}
       - name: Delete 'PR' containers older than a week
-        uses: snok/container-retention-policy@v2.2.1
+        uses: snok/container-retention-policy@v3.0.0
         with:
-          image-names: ${{ env.REGISTRY }}/${{ env.REPO }}
-          filter-tags: sha-*,sha256:*
-          skip-tags: latest
-          cut-off: A week ago UTC
-          account-type: org
-          org-name: ${{ github.repository_owner }}
-          keep-at-least: 1
-          token: ${{ secrets.GH_REPO_TOKEN }}
+          image-names: ${{ env.REPO }}
+          image-tags: "sha-* sha256:* !latest"
+          cut-off: 1w
+          account: ${{ github.repository_owner }}
+          keep-n-most-recent: 1
+          token: ${{ secrets.GITHUB_TOKEN }}
           timestamp-to-use: updated_at
diff --git a/scripts/keystone-swift.http b/scripts/keystone-swift.http
index 3068ee4..b7f8de6 100644
--- a/scripts/keystone-swift.http
+++ b/scripts/keystone-swift.http
@@ -7,7 +7,7 @@
 @keystone = http://localhost:5000
 @username = swift
 @password = veryfast
-@project = service
+@project = b769b1918c8e4eabaf2198ccda2eda13
 
 @authToken = {{unscopedToken.response.headers.X-Subject-Token}}
 @authTokenScoped = {{tokenScoped.response.headers.X-Subject-Token}}
@@ -52,7 +52,7 @@ content-type: application/json
     },
     "scope": {
       "project": {
-        "name": "{{project}}",
+        "id": "{{project}}",
         "domain": { "id": "default" }
       }
     }
@@ -74,7 +74,7 @@ content-type: application/json
     },
     "scope": {
       "project": {
-        "name": "{{project}}",
+        "id": "{{project}}",
         "domain": { "id": "default" }
       }
     }