From e617d843fd472eb413772bba172af84c8d5c2e4c Mon Sep 17 00:00:00 2001 From: Jonathan Gramain Date: Thu, 29 May 2025 10:23:40 -0700 Subject: [PATCH 1/3] 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 c65f511ff9..5f33e54ed2 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 b1f57ee496..8abb9cc6dc 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 bd01be3787eca44399e75d56ee47f56985850b66 Mon Sep 17 00:00:00 2001 From: Mickael Bourgois Date: Tue, 8 Apr 2025 15:18:57 +0200 Subject: [PATCH 2/3] 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 1c4827a73c..eb2bd5ab57 100644 --- a/.github/workflows/tests.yaml +++ b/.github/workflows/tests.yaml @@ -125,7 +125,7 @@ jobs: if: always() build: - runs-on: ubuntu-20.04 + runs-on: ubuntu-latest steps: - name: Checkout uses: actions/checkout@v4 @@ -164,7 +164,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 8ff51972227b01a1d06292bece1c0872b8e09514 Mon Sep 17 00:00:00 2001 From: Leif Henriksen Date: Thu, 17 Jul 2025 14:04:26 +0200 Subject: [PATCH 3/3] 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 \