From b53adb7ae9f8067ebaeb4c6fc70be173ba9801e7 Mon Sep 17 00:00:00 2001
From: Jonathan Gramain <jonathan.gramain@scality.com>
Date: Thu, 29 May 2025 10:23:40 -0700
Subject: [PATCH 1/7] CLDSRV-654 bump bucketclient

(cherry picked from commit e76611071d89e7ae8214f5e4dbd2aec4767551b3)
---
 package.json | 2 +-
 yarn.lock    | 8 ++++++++
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/package.json b/package.json
index d35a06fb54..0d7950481e 100644
--- a/package.json
+++ b/package.json
@@ -24,7 +24,7 @@
     "async": "~2.5.0",
     "aws-sdk": "2.905.0",
     "azure-storage": "^2.1.0",
-    "bucketclient": "scality/bucketclient#7.10.6",
+    "bucketclient": "scality/bucketclient#7.10.21",
     "commander": "^2.9.0",
     "cron-parser": "^2.11.0",
     "diskusage": "1.1.3",
diff --git a/yarn.lock b/yarn.lock
index 64f87d2601..23307698d8 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -904,6 +904,14 @@ bson@^1.1.4:
   resolved "https://registry.yarnpkg.com/bson/-/bson-1.1.6.tgz#fb819be9a60cd677e0853aee4ca712a785d6618a"
   integrity sha512-EvVNVeGo4tHxwi8L6bPj3y3itEvStdwvvlojVxxbyYfoaxJ6keLgrTuKdyfEAszFK+H3olzBuafE0yoh0D1gdg==
 
+bucketclient@scality/bucketclient#7.10.21:
+  version "7.10.21"
+  resolved "https://codeload.github.com/scality/bucketclient/tar.gz/95fb3d4c48ed51c68a048cb01021c7a1eb339922"
+  dependencies:
+    agentkeepalive "^4.1.4"
+    arsenal "git+https://github.com/scality/Arsenal#7.10.46"
+    werelogs scality/werelogs#8.1.0
+
 bucketclient@scality/bucketclient#7.10.6:
   version "7.10.6"
   resolved "https://codeload.github.com/scality/bucketclient/tar.gz/115ab1ae974781aafaba455cf83228b1732191af"

From f4999e96099b3467990a94ccdff675171ba9843a Mon Sep 17 00:00:00 2001
From: Francois Ferrand <francois.ferrand@scality.com>
Date: Tue, 9 Apr 2024 19:19:12 +0200
Subject: [PATCH 2/7] Migrate to ghcr

Issue: CLDSRV-524
(cherry picked from commit 227d6edd0944499baffd901798fd39eb7e318d9e)
(cherry picked from commit 98531b54543a095adec994a25756b0634c58e708)
---
 .github/docker/docker-compose.yaml |  2 +-
 .github/workflows/release.yaml     | 16 ++++++++--------
 .github/workflows/tests.yaml       | 25 +++++++++----------------
 images/svc-base/Dockerfile         |  2 +-
 4 files changed, 19 insertions(+), 26 deletions(-)

diff --git a/.github/docker/docker-compose.yaml b/.github/docker/docker-compose.yaml
index 362ad917a0..bec9a7c5f2 100644
--- a/.github/docker/docker-compose.yaml
+++ b/.github/docker/docker-compose.yaml
@@ -62,6 +62,6 @@ services:
   pykmip:
     network_mode: "host"
     profiles: ['pykmip']
-    image: registry.scality.com/cloudserver-dev/pykmip
+    image: ghcr.io/cloudserver/pykmip
     volumes:
       - /tmp/artifacts/${JOB_NAME}:/artifacts
diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml
index 4cd46eea8d..0f5e26afdc 100644
--- a/.github/workflows/release.yaml
+++ b/.github/workflows/release.yaml
@@ -11,24 +11,24 @@ on:
 
 jobs:
   build-federation-image:
-    uses: scality/workflows/.github/workflows/docker-build.yaml@v1
+    uses: scality/workflows/.github/workflows/docker-build.yaml@v2
     secrets: inherit
     with:
       push: true
-      registry: registry.scality.com
-      namespace: ${{ github.event.repository.name }}
+      registry: ghcr.io
+      namespace: scality
       name: ${{ github.event.repository.name }}
       context: .
       file: images/svc-base/Dockerfile
       tag: ${{ github.event.inputs.tag }}-svc-base
 
   build-image:
-    uses: scality/workflows/.github/workflows/docker-build.yaml@v1
+    uses: scality/workflows/.github/workflows/docker-build.yaml@v2
     secrets: inherit
     with:
       push: true
-      registry: registry.scality.com
-      namespace: ${{ github.event.repository.name }}
+      registry: ghcr.io
+      namespace: scality
       name: ${{ github.event.repository.name }}
       context: .
       file: Dockerfile
@@ -38,9 +38,9 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Create Release
-        uses: softprops/action-gh-release@v1
+        uses: softprops/action-gh-release@v2
         env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          GITHUB_TOKEN: ${{ github.token }}
         with:
           name: Release ${{ github.event.inputs.tag }}
           tag_name: ${{ github.event.inputs.tag }}
diff --git a/.github/workflows/tests.yaml b/.github/workflows/tests.yaml
index 5185c7c83a..b3d31dfed5 100644
--- a/.github/workflows/tests.yaml
+++ b/.github/workflows/tests.yaml
@@ -135,13 +135,7 @@ jobs:
         with:
           registry: ghcr.io
           username: ${{ github.repository_owner }}
-          password: ${{ secrets.GITHUB_TOKEN }}
-      - name: Login to Registry
-        uses: docker/login-action@v1
-        with:
-          registry: registry.scality.com
-          username: ${{ secrets.REGISTRY_LOGIN }}
-          password: ${{ secrets.REGISTRY_PASSWORD }}
+          password: ${{ github.token }}
       - name: Build and push cloudserver image
         uses: docker/build-push-action@v3
         with:
@@ -149,18 +143,17 @@ jobs:
           context: .
           provenance: false
           tags: |
-            ghcr.io/${{ github.repository }}/cloudserver:${{ github.sha }}
-            registry.scality.com/cloudserver-dev/cloudserver:${{ github.sha }}
+            ghcr.io/${{ github.repository }}:${{ github.sha }}
           cache-from: type=gha,scope=cloudserver
           cache-to: type=gha,mode=max,scope=cloudserver
 
   build-federation-image:
-    uses: scality/workflows/.github/workflows/docker-build.yaml@v1
+    uses: scality/workflows/.github/workflows/docker-build.yaml@v2
     secrets: inherit
     with:
       push: true
-      registry: registry.scality.com
-      namespace: cloudserver-dev
+      registry: ghcr.io
+      namespace: scality
       name: cloudserver
       context: .
       file: images/svc-base/Dockerfile
@@ -170,7 +163,7 @@ jobs:
     runs-on: ubuntu-latest
     needs: build
     env:
-      CLOUDSERVER_IMAGE: ghcr.io/${{ github.repository }}/cloudserver:${{ github.sha }}
+      CLOUDSERVER_IMAGE: ghcr.io/${{ github.repository }}:${{ github.sha }}
       S3BACKEND: mem
       S3_LOCATION_FILE: /usr/src/app/tests/locationConfig/locationConfigTests.json
       S3DATA: multiple
@@ -217,7 +210,7 @@ jobs:
     env:
       S3BACKEND: file
       S3VAULT: mem
-      CLOUDSERVER_IMAGE: ghcr.io/${{ github.repository }}/cloudserver:${{ github.sha }}
+      CLOUDSERVER_IMAGE: ghcr.io/${{ github.repository }}:${{ github.sha }}
       MPU_TESTING: "yes"
       ENABLE_NULL_VERSION_COMPAT_MODE: "${{ matrix.enable-null-compat }}"
       JOB_NAME: ${{ matrix.job-name }}
@@ -263,7 +256,7 @@ jobs:
       ENABLE_UTAPI_V2: t
       S3BACKEND: mem 
       BUCKET_DENY_FILTER: utapi-event-filter-deny-bucket
-      CLOUDSERVER_IMAGE: ghcr.io/${{ github.repository }}/cloudserver:${{ github.sha }}
+      CLOUDSERVER_IMAGE: ghcr.io/${{ github.repository }}:${{ github.sha }}
       JOB_NAME: ${{ github.job }}
     steps:
     - name: Checkout
@@ -298,7 +291,7 @@ jobs:
       S3BACKEND: file
       S3VAULT: mem
       MPU_TESTING: true
-      CLOUDSERVER_IMAGE: ghcr.io/${{ github.repository }}/cloudserver:${{ github.sha }}
+      CLOUDSERVER_IMAGE: ghcr.io/${{ github.repository }}:${{ github.sha }}
       JOB_NAME: ${{ github.job }}
     steps:
     - name: Checkout
diff --git a/images/svc-base/Dockerfile b/images/svc-base/Dockerfile
index 68eb4ad87b..c571a32e3d 100644
--- a/images/svc-base/Dockerfile
+++ b/images/svc-base/Dockerfile
@@ -1,4 +1,4 @@
-FROM registry.scality.com/federation/nodesvc-base:7.10.6.0
+FROM ghcr.io/scality/federation/nodesvc-base:7.10.6.0
 
 ENV S3_CONFIG_FILE=${CONF_DIR}/config.json
 ENV S3_LOCATION_FILE=${CONF_DIR}/locationConfig.json

From e30c7c0701d923f51e7f0f104ac4b33899a4da9f Mon Sep 17 00:00:00 2001
From: Francois Ferrand <francois.ferrand@scality.com>
Date: Tue, 9 Apr 2024 19:27:55 +0200
Subject: [PATCH 3/7] Upgrade actions

- artifacts@v4
- cache@v4
- checkout@v4
- codeql@v3
- dependency-review@v4
- login@v3
- setup-buildx@v3
- setup-node@v4
- setup-python@v5

Issue: CLDSRV-524
(cherry picked from commit c1060853dd760b7e58835413f5584ae9fb2b1f1e)
(cherry picked from commit 778c29ec89628d254e58e31b0570168a15df7cff)
---
 .github/actions/setup-ci/action.yaml     |  2 +-
 .github/workflows/codeql.yaml            |  6 ++--
 .github/workflows/dependency-review.yaml |  4 +--
 .github/workflows/tests.yaml             | 42 ++++++++++++------------
 4 files changed, 27 insertions(+), 27 deletions(-)

diff --git a/.github/actions/setup-ci/action.yaml b/.github/actions/setup-ci/action.yaml
index ca51e9441f..bdd486d674 100644
--- a/.github/actions/setup-ci/action.yaml
+++ b/.github/actions/setup-ci/action.yaml
@@ -16,7 +16,7 @@ runs:
       run: |-
         set -exu;
         mkdir -p /tmp/artifacts/${{ github.job }}/;
-    - uses: actions/setup-node@v2
+    - uses: actions/setup-node@v4
       with:
         node-version: '16'
         cache: 'yarn'
diff --git a/.github/workflows/codeql.yaml b/.github/workflows/codeql.yaml
index e9db9373c6..b414ee4330 100644
--- a/.github/workflows/codeql.yaml
+++ b/.github/workflows/codeql.yaml
@@ -14,12 +14,12 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout code
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Initialize CodeQL
-        uses: github/codeql-action/init@v2
+        uses: github/codeql-action/init@v3
         with:
           languages: javascript, python, ruby
 
       - name: Build and analyze
-        uses: github/codeql-action/analyze@v2
+        uses: github/codeql-action/analyze@v3
diff --git a/.github/workflows/dependency-review.yaml b/.github/workflows/dependency-review.yaml
index 4716cdfd1f..91f040631a 100644
--- a/.github/workflows/dependency-review.yaml
+++ b/.github/workflows/dependency-review.yaml
@@ -10,7 +10,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: 'Checkout Repository'
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: 'Dependency Review'
-        uses: actions/dependency-review-action@v3
+        uses: actions/dependency-review-action@v4
diff --git a/.github/workflows/tests.yaml b/.github/workflows/tests.yaml
index b3d31dfed5..cc991cd19a 100644
--- a/.github/workflows/tests.yaml
+++ b/.github/workflows/tests.yaml
@@ -71,17 +71,17 @@ jobs:
     runs-on: ubuntu-latest
     steps:
     - name: Checkout
-      uses: actions/checkout@v2
-    - uses: actions/setup-node@v2
+      uses: actions/checkout@v4
+    - uses: actions/setup-node@v4
       with:
         node-version: '16'
         cache: yarn
     - name: install dependencies
       run: yarn install --frozen-lockfile --network-concurrency 1
-    - uses: actions/setup-python@v4
+    - uses: actions/setup-python@v5
       with:
         python-version: '3.9'
-    - uses: actions/cache@v2
+    - uses: actions/cache@v4
       with:
         path: ~/.cache/pip
         key: ${{ runner.os }}-pip
@@ -114,7 +114,7 @@ jobs:
         find . -name "*junit*.xml" -exec cp {} artifacts/junit/ ";"
       if: always()
     - name: Upload files to artifacts
-      uses: scality/action-artifacts@v2
+      uses: scality/action-artifacts@v4
       with:
         method: upload
         url: https://artifacts.scality.net
@@ -127,17 +127,17 @@ jobs:
     runs-on: ubuntu-20.04
     steps:
       - name: Checkout
-        uses: actions/checkout@v2
+        uses: actions/checkout@v4
       - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v1.6.0
+        uses: docker/setup-buildx-action@v3
       - name: Login to GitHub Registry
-        uses: docker/login-action@v1.10.0
+        uses: docker/login-action@v3
         with:
           registry: ghcr.io
           username: ${{ github.repository_owner }}
           password: ${{ github.token }}
       - name: Build and push cloudserver image
-        uses: docker/build-push-action@v3
+        uses: docker/build-push-action@v5
         with:
           push: true
           context: .
@@ -170,8 +170,8 @@ jobs:
       JOB_NAME: ${{ github.job }}
     steps:
     - name: Checkout
-      uses: actions/checkout@v3
-    - uses: actions/setup-python@v4
+      uses: actions/checkout@v4
+    - uses: actions/setup-python@v5
       with:
         python-version: 3.9
     - name: Setup CI environment
@@ -187,7 +187,7 @@ jobs:
       env:
         S3_LOCATION_FILE: tests/locationConfig/locationConfigTests.json
     - name: Upload logs to artifacts
-      uses: scality/action-artifacts@v3
+      uses: scality/action-artifacts@v4
       with:
         method: upload
         url: https://artifacts.scality.net
@@ -216,8 +216,8 @@ jobs:
       JOB_NAME: ${{ matrix.job-name }}
     steps:
     - name: Checkout
-      uses: actions/checkout@v3
-    - uses: actions/setup-python@v4
+      uses: actions/checkout@v4
+    - uses: actions/setup-python@v5
       with:
         python-version: 3.9
     - name: Setup CI environment
@@ -240,7 +240,7 @@ jobs:
         bash wait_for_local_port.bash 8000 40
         yarn run ft_test | tee /tmp/artifacts/${{ matrix.job-name }}/tests.log
     - name: Upload logs to artifacts
-      uses: scality/action-artifacts@v3
+      uses: scality/action-artifacts@v4
       with:
         method: upload
         url: https://artifacts.scality.net
@@ -260,8 +260,8 @@ jobs:
       JOB_NAME: ${{ github.job }}
     steps:
     - name: Checkout
-      uses: actions/checkout@v3
-    - uses: actions/setup-python@v4
+      uses: actions/checkout@v4
+    - uses: actions/setup-python@v5
       with:
         python-version: 3.9
     - name: Setup CI environment
@@ -275,7 +275,7 @@ jobs:
         bash wait_for_local_port.bash 8000 40
         yarn run test_utapi_v2 | tee /tmp/artifacts/${{ github.job }}/tests.log
     - name: Upload logs to artifacts
-      uses: scality/action-artifacts@v3
+      uses: scality/action-artifacts@v4
       with:
         method: upload
         url: https://artifacts.scality.net
@@ -295,8 +295,8 @@ jobs:
       JOB_NAME: ${{ github.job }}
     steps:
     - name: Checkout
-      uses: actions/checkout@v3
-    - uses: actions/setup-python@v4
+      uses: actions/checkout@v4
+    - uses: actions/setup-python@v5
       with:
         python-version: 3.9
     - name: Setup CI environment
@@ -314,7 +314,7 @@ jobs:
         bash wait_for_local_port.bash 5696 40
         yarn run ft_kmip | tee /tmp/artifacts/${{ github.job }}/tests.log
     - name: Upload logs to artifacts
-      uses: scality/action-artifacts@v3
+      uses: scality/action-artifacts@v4
       with:
         method: upload
         url: https://artifacts.scality.net

From ff2fa54086881a8977af2fb611b6c429a1efd99b Mon Sep 17 00:00:00 2001
From: Francois Ferrand <francois.ferrand@scality.com>
Date: Tue, 9 Apr 2024 22:04:35 +0200
Subject: [PATCH 4/7] Use official docker build steps

The docker-build step from `scality/workflows/` fails to login to
 ghcr, as it picks up the old registry creds.

Issue: CLDSRV-524
(cherry picked from commit b824fc0828ff8a89c5cc24e0a5ddbdec5f2463de)
(cherry picked from commit e3c5b99d3c00e8fa05f8fbbf5b0bd746aff719f2)
---
 .github/workflows/release.yaml | 63 +++++++++++++++++++++++-----------
 .github/workflows/tests.yaml   | 32 +++++++++++------
 2 files changed, 65 insertions(+), 30 deletions(-)

diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml
index 0f5e26afdc..8d4e85f0e8 100644
--- a/.github/workflows/release.yaml
+++ b/.github/workflows/release.yaml
@@ -11,28 +11,51 @@ on:
 
 jobs:
   build-federation-image:
-    uses: scality/workflows/.github/workflows/docker-build.yaml@v2
-    secrets: inherit
-    with:
-      push: true
-      registry: ghcr.io
-      namespace: scality
-      name: ${{ github.event.repository.name }}
-      context: .
-      file: images/svc-base/Dockerfile
-      tag: ${{ github.event.inputs.tag }}-svc-base
+    runs-on: ubuntu-20.04
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v3
+      - name: Login to GitHub Registry
+        uses: docker/login-action@v3
+        with:
+          registry: ghcr.io
+          username: ${{ github.repository_owner }}
+          password: ${{ github.token }}
+      - name: Build and push image for federation
+        uses: docker/build-push-action@v5
+        with:
+          push: true
+          context: .
+          file: images/svc-base/Dockerfile
+          tags: |
+            ghcr.io/${{ github.repository }}:${{ github.event.inputs.tag }}-svc-base
+          cache-from: type=gha,scope=federation
+          cache-to: type=gha,mode=max,scope=federation
 
   build-image:
-    uses: scality/workflows/.github/workflows/docker-build.yaml@v2
-    secrets: inherit
-    with:
-      push: true
-      registry: ghcr.io
-      namespace: scality
-      name: ${{ github.event.repository.name }}
-      context: .
-      file: Dockerfile
-      tag: ${{ github.event.inputs.tag }}
+    runs-on: ubuntu-20.04
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v3
+      - name: Login to GitHub Registry
+        uses: docker/login-action@v3
+        with:
+          registry: ghcr.io
+          username: ${{ github.repository_owner }}
+          password: ${{ github.token }}
+      - name: Build and push image
+        uses: docker/build-push-action@v5
+        with:
+          push: true
+          context: .
+          tags: |
+            ghcr.io/${{ github.repository }}:${{ github.event.inputs.tag }}
+          cache-from: type=gha
+          cache-to: type=gha,mode=max
 
   github-release:
     runs-on: ubuntu-latest
diff --git a/.github/workflows/tests.yaml b/.github/workflows/tests.yaml
index cc991cd19a..e4164dfd32 100644
--- a/.github/workflows/tests.yaml
+++ b/.github/workflows/tests.yaml
@@ -148,16 +148,28 @@ jobs:
           cache-to: type=gha,mode=max,scope=cloudserver
 
   build-federation-image:
-    uses: scality/workflows/.github/workflows/docker-build.yaml@v2
-    secrets: inherit
-    with:
-      push: true
-      registry: ghcr.io
-      namespace: scality
-      name: cloudserver
-      context: .
-      file: images/svc-base/Dockerfile
-      tag: ${{ github.sha }}-svc-base
+    runs-on: ubuntu-20.04
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v3
+      - name: Login to GitHub Registry
+        uses: docker/login-action@v3
+        with:
+          registry: ghcr.io
+          username: ${{ github.repository_owner }}
+          password: ${{ github.token }}
+      - name: Build and push image for federation
+        uses: docker/build-push-action@v5
+        with:
+          push: true
+          context: .
+          file: images/svc-base/Dockerfile
+          tags: |
+            ghcr.io/${{ github.repository }}:${{ github.sha }}-svc-base
+          cache-from: type=gha,scope=federation
+          cache-to: type=gha,mode=max,scope=federation
 
   multiple-backend:
     runs-on: ubuntu-latest

From 00dd474a53b75408202a63ed3037768757025392 Mon Sep 17 00:00:00 2001
From: Francois Ferrand <francois.ferrand@scality.com>
Date: Tue, 9 Apr 2024 19:37:20 +0200
Subject: [PATCH 5/7] Build pykmip image

Issue: CLDSRV-524
(cherry picked from commit a2e6d91cf2b40f800b3a2b418e9689f43032e13e)
(cherry picked from commit 4cbe3adfe0de5b4e8cce691912aa50b44dfba86c)
---
 .github/docker/docker-compose.yaml |  2 +-
 .github/workflows/tests.yaml       | 10 ++++++++++
 2 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/.github/docker/docker-compose.yaml b/.github/docker/docker-compose.yaml
index bec9a7c5f2..8c70341d6a 100644
--- a/.github/docker/docker-compose.yaml
+++ b/.github/docker/docker-compose.yaml
@@ -62,6 +62,6 @@ services:
   pykmip:
     network_mode: "host"
     profiles: ['pykmip']
-    image: ghcr.io/cloudserver/pykmip
+    image: ${PYKMIP_IMAGE:-ghcr.io/scality/cloudserver/pykmip}
     volumes:
       - /tmp/artifacts/${JOB_NAME}:/artifacts
diff --git a/.github/workflows/tests.yaml b/.github/workflows/tests.yaml
index e4164dfd32..fb13bba490 100644
--- a/.github/workflows/tests.yaml
+++ b/.github/workflows/tests.yaml
@@ -146,6 +146,15 @@ jobs:
             ghcr.io/${{ github.repository }}:${{ github.sha }}
           cache-from: type=gha,scope=cloudserver
           cache-to: type=gha,mode=max,scope=cloudserver
+      - name: Build and push pykmip image
+        uses: docker/build-push-action@v5
+        with:
+          push: true
+          context: .github/pykmip
+          tags: |
+            ghcr.io/${{ github.repository }}/pykmip:${{ github.sha }}
+          cache-from: type=gha,scope=pykmip
+          cache-to: type=gha,mode=max,scope=pykmip
 
   build-federation-image:
     runs-on: ubuntu-20.04
@@ -304,6 +313,7 @@ jobs:
       S3VAULT: mem
       MPU_TESTING: true
       CLOUDSERVER_IMAGE: ghcr.io/${{ github.repository }}:${{ github.sha }}
+      PYKMIP_IMAGE: ghcr.io/${{ github.repository }}/pykmip:${{ github.sha }}
       JOB_NAME: ${{ github.job }}
     steps:
     - name: Checkout

From 51edf24264e5dab4675fa46c5c68dcd7db23ac66 Mon Sep 17 00:00:00 2001
From: Mickael Bourgois <mickael.bourgois@scality.com>
Date: Tue, 8 Apr 2025 15:18:57 +0200
Subject: [PATCH 6/7] CLDSRV-635: Fix ubuntu 20 in CI

> This is a scheduled Ubuntu 20.04 brownout. Ubuntu 20.04 LTS runner will be removed on 2025-04-15. For more details, see https://github.com/actions/runner-images/issues/11101

(cherry picked from commit 5c4a1b37ac01352c85fd4420db506dbbad3c5728)
---
 .github/workflows/release.yaml | 4 ++--
 .github/workflows/tests.yaml   | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml
index 8d4e85f0e8..da47ac342f 100644
--- a/.github/workflows/release.yaml
+++ b/.github/workflows/release.yaml
@@ -11,7 +11,7 @@ on:
 
 jobs:
   build-federation-image:
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-latest
     steps:
       - name: Checkout
         uses: actions/checkout@v4
@@ -35,7 +35,7 @@ jobs:
           cache-to: type=gha,mode=max,scope=federation
 
   build-image:
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-latest
     steps:
       - name: Checkout
         uses: actions/checkout@v4
diff --git a/.github/workflows/tests.yaml b/.github/workflows/tests.yaml
index fb13bba490..9c5fb49f2a 100644
--- a/.github/workflows/tests.yaml
+++ b/.github/workflows/tests.yaml
@@ -124,7 +124,7 @@ jobs:
       if: always()
 
   build:
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-latest
     steps:
       - name: Checkout
         uses: actions/checkout@v4
@@ -157,7 +157,7 @@ jobs:
           cache-to: type=gha,mode=max,scope=pykmip
 
   build-federation-image:
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-latest
     steps:
       - name: Checkout
         uses: actions/checkout@v4

From 92705f980f5af984487bc57a04e939dfa02983ec Mon Sep 17 00:00:00 2001
From: Leif Henriksen <leif.henriksenlarez@scality.com>
Date: Thu, 17 Jul 2025 14:04:26 +0200
Subject: [PATCH 7/7] CLDSRV-718: fix debian apt-get urls

(cherry picked from commit 2378a2b9cdd94cbf44c4652ec43c16cfd744edd3)
---
 Dockerfile | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/Dockerfile b/Dockerfile
index 804247c349..20354c7758 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -9,7 +9,9 @@ COPY ./package.json yarn.lock ./
 ENV PYTHON=python3.9
 ENV PY_VERSION=3.9.7
 
-RUN apt-get update \
+RUN sed -i 's|deb.debian.org/debian|archive.debian.org/debian|g' /etc/apt/sources.list \
+    && sed -i 's|security.debian.org/debian-security|archive.debian.org/debian-security|g' /etc/apt/sources.list \
+    && apt-get update \
     && apt-get install -y --no-install-recommends \
     jq \
     python \