Switch support of ubuntu focal to jammy

thelastpickle · Jan 8, 2025 · 5b7acbd · 5b7acbd
1 parent c0984ae
commit 5b7acbd
Show file tree

Hide file tree

Showing 6 changed files with 16 additions and 16 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -55,9 +55,9 @@ jobs:
     # Build debian packages
     strategy:
       matrix:
-        suite: [focal, bullseye, bookworm]
+        suite: [jammy, bullseye, bookworm]
         include:
-          - suite: focal
+          - suite: jammy
             os-version: ubuntu-20.04
           - suite: bullseye
             os-version: ubuntu-22.04
@@ -454,9 +454,9 @@ jobs:
     if: github.event_name == 'release' && github.event.action == 'published'
     strategy:
       matrix:
-        suite: [focal, bionic]
+        suite: [jammy, bionic]
         include:
-          - suite: focal
+          - suite: jammy
             os-version: ubuntu-20.04
           - suite: bionic
             os-version: ubuntu-18.04

diff --git a/packaging/build-deb.sh b/packaging/build-deb.sh
@@ -3,14 +3,14 @@
 set -e
 
 case $1 in
-  ""|focal|bullseye|bookworm)
+  ""|jammy|bullseye|bookworm)
     suites=("${1:-bionic}")
     ;;
   all)
-    suites=(focal bullseye bookworm)
+    suites=(jammy bullseye bookworm)
     ;;
   *)
-    echo "Unknown distribution suite - allowed values: 'all', 'focal', 'bullseye', 'bookworm'"
+    echo "Unknown distribution suite - allowed values: 'all', 'jammy', 'bullseye', 'bookworm'"
     exit 1
     ;;
 esac

diff --git a/packaging/docker-build/Dockerfile-debian-11 b/packaging/docker-build/Dockerfile-debian-11
@@ -26,7 +26,7 @@ WORKDIR ${WORKDIR}
 ENV PIP_DEFAULT_TIMEOUT 100
 RUN echo "Acquire::http::Pipeline-Depth 0;" >> /etc/apt/apt.conf
 
-# add a repo that contains a backport of dh-virtualenv 1.1 for focal, bionic
+# add a repo that contains a backport of dh-virtualenv 1.1 for jammy, bionic
 RUN apt-get update && \
     apt-get install -y software-properties-common
 

diff --git a/packaging/docker-build/Dockerfile-debian-12 b/packaging/docker-build/Dockerfile-debian-12
@@ -26,15 +26,15 @@ WORKDIR ${WORKDIR}
 ENV PIP_DEFAULT_TIMEOUT 100
 RUN echo "Acquire::http::Pipeline-Depth 0;" >> /etc/apt/apt.conf
 
-# add a repo that contains a backport of dh-virtualenv 1.1 for focal, bionic
+# add a repo that contains a backport of dh-virtualenv 1.1 for jammy, bionic
 RUN apt-get update && \
     apt-get install -y software-properties-common
 
 # install dependencies
 RUN apt-get update \
     && apt-get install -y \
-        libffi-dev \   
-        libssl-dev \  
+        libffi-dev \
+        libssl-dev \
         debhelper \
         gcc \
         dh-python \

diff --git a/packaging/docker-build/Dockerfile-ubuntu b/packaging/docker-build/Dockerfile-ubuntu
@@ -26,7 +26,7 @@ WORKDIR ${WORKDIR}
 ENV PIP_DEFAULT_TIMEOUT 100
 RUN echo "Acquire::http::Pipeline-Depth 0;" >> /etc/apt/apt.conf
 
-# add a repo that contains a backport of dh-virtualenv 1.1 for focal, bionic
+# add a repo that contains a backport of dh-virtualenv 1.1 for jammy, bionic
 RUN apt-get update && \
     apt-get install -y software-properties-common
 

diff --git a/packaging/docker-build/docker-compose.yml b/packaging/docker-build/docker-compose.yml
@@ -13,27 +13,27 @@
 # limitations under the License.
 
 services:
-  cassandra-medusa-builder-focal:
+  cassandra-medusa-builder-jammy:
     build:
       platforms:
         - linux/amd64
       context: ../..
       dockerfile: packaging/docker-build/Dockerfile-ubuntu
       args:
-        - BUILD_IMAGE=ubuntu:20.04
+        - BUILD_IMAGE=ubuntu:22.04
         - EXTRA_PACKAGES=""
     volumes:
       - ../..:/usr/src/app/cassandra-medusa
       - ../../packages:/usr/src/app/packages
       - ./scripts:/usr/src/app/scripts
-  cassandra-medusa-tester-focal:
+  cassandra-medusa-tester-jammy:
     build:
       platforms:
         - linux/amd64
       context: ../..
       dockerfile: packaging/docker-build/Dockerfile-tester
       args:
-        - BUILD_IMAGE=ubuntu:20.04
+        - BUILD_IMAGE=ubuntu:22.04
     volumes:
       - ../../packages:/usr/src/app/packages
   cassandra-medusa-builder-bullseye: