deb: refresh target platform (#810)

kenhys · web-flow · commit cff71d1c0d75 · 2025-04-14T15:45:34.000+09:00
deb: refresh target platform

* Add debian:trixie
* Drop debian:bullseye
* Drop ubuntu:focal

Make forward for upcoming v6 series.

NOTE:
* trixie is not shipped officially, so it is still in testing phase.
* package is not uploaded to archive, so some tests are skipped.

Signed-off-by: Kentaro Hayashi &lt;hayashi@clear-code.com&gt;
diff --git a/.github/workflows/apt-arm.yml b/.github/workflows/apt-arm.yml
@@ -15,22 +15,17 @@ jobs:
       fail-fast: false
       matrix:
         label:
-          - Debian GNU/Linux bullseye arm64
           - Debian GNU/Linux bookworm arm64
-          - Ubuntu Focal arm64
+          - Debian GNU/Linux trixie arm64
           - Ubuntu Jammy arm64
           - Ubuntu Noble arm64
         include:
-          - label: Debian GNU/Linux bullseye arm64
-            rake-job: debian-bullseye
-            test-docker-image: arm64v8/debian:bullseye
           - label: Debian GNU/Linux bookworm arm64
             rake-job: debian-bookworm
             test-docker-image: arm64v8/debian:bookworm
-          - label: Ubuntu Focal arm64
-            rake-job: ubuntu-focal
-            rake-options: LINTIAN=no
-            test-docker-image: arm64v8/ubuntu:focal
+          - label: Debian GNU/Linux trixie arm64
+            rake-job: debian-trixie
+            test-docker-image: arm64v8/debian:trixie
           - label: Ubuntu Jammy arm64
             rake-job: ubuntu-jammy
             rake-options: LINTIAN=no
diff --git a/.github/workflows/apt.matrix.json b/.github/workflows/apt.matrix.json
@@ -1,19 +1,14 @@
 {
   "include": [
-    {
-      "label": "Debian bullseye amd64",
-      "rake-job": "debian-bullseye",
-      "test-docker-image": "debian:bullseye"
-    },
     {
       "label": "Debian bookworm amd64",
       "rake-job": "debian-bookworm",
       "test-docker-image": "debian:bookworm"
     },
     {
-      "label": "Ubuntu Focal amd64",
-      "rake-job": "ubuntu-focal",
-      "test-docker-image": "ubuntu:focal"
+      "label": "Debian trixie amd64",
+      "rake-job": "debian-trixie",
+      "test-docker-image": "debian:trixie"
     },
     {
       "label": "Ubuntu Jammy amd64",
diff --git a/.github/workflows/apt.yml b/.github/workflows/apt.yml
@@ -223,9 +223,8 @@ jobs:
       fail-fast: false
       matrix:
         label:
-          - Debian bullseye amd64
           - Debian bookworm amd64
-          - Ubuntu Focal amd64
+          - Debian trixie amd64
           - Ubuntu Jammy amd64
           - Ubuntu Noble amd64
         test:
@@ -254,15 +253,12 @@ jobs:
           - "update-without-data-lost.sh v5 v6"
           - "update-without-data-lost.sh v6 v5"
         include:
-          - label: Debian bullseye amd64
-            rake-job: debian-bullseye
-            container-image: images:debian/11
           - label: Debian bookworm amd64
             rake-job: debian-bookworm
             container-image: images:debian/12
-          - label: Ubuntu Focal amd64
-            rake-job: ubuntu-focal
-            container-image: images:ubuntu/20.04
+          - label: Debian trixie amd64
+            rake-job: debian-trixie
+            container-image: images:debian/13
           - label: Ubuntu Jammy amd64
             rake-job: ubuntu-jammy
             container-image: images:ubuntu/22.04
@@ -280,6 +276,25 @@ jobs:
             test: update-to-next-version-with-backward-compat-for-v4.sh
           - label: Debian bookworm amd64
             test: downgrade-to-v4.sh
+          # Temporary disable test for trixie (not released yet)
+          - label: Debian trixie amd64
+            test: update-from-v4.sh local
+          - label: Debian trixie amd64
+            test: update-from-v4.sh v5
+          - label: Debian trixie amd64
+            test: update-from-v4.sh lts
+          - label: Debian trixie amd64
+            test: update-from-v5-lts.sh
+          - label: Debian trixie amd64
+            test: downgrade-to-v4.sh
+          - label: Debian trixie amd64
+            test: downgrade-to-v5-lts.sh
+          - label: Debian trixie amd64
+            test: install-newly.sh v5
+          - label: Debian trixie amd64
+            test: install-newly.sh lts
+          - label: Debian trixie amd64
+            test: update-to-next-version-with-backward-compat-for-v4.sh
           - label: Ubuntu Noble amd64
             test: update-from-v4.sh local
           - label: Ubuntu Noble amd64
diff --git a/fluent-apt-source/Rakefile b/fluent-apt-source/Rakefile
@@ -86,9 +86,8 @@ class FluentdAptSourcePackageTask < PackageTask
 
   def apt_targets_default
     [
-      "debian-bulleye",
       "debian-bookworm",
-      "ubuntu-focal",
+      "debian-trixie",
       "ubuntu-jammy",
       "ubuntu-noble"
     ]
diff --git a/fluent-apt-source/apt/debian-trixie/Dockerfile b/fluent-apt-source/apt/debian-trixie/Dockerfile
@@ -0,0 +1,17 @@
+FROM debian:trixie
+
+RUN \
+  echo "debconf debconf/frontend select Noninteractive" | \
+    debconf-set-selections
+
+ARG DEBUG
+
+RUN \
+  quiet=$([ "${DEBUG}" = "yes" ] || echo "-qq") && \
+  apt update ${quiet} && \
+  apt install -y -V ${quiet} \
+    debhelper \
+    devscripts \
+    gnupg && \
+  apt clean && \
+  rm -rf /var/lib/apt/lists/*
diff --git a/fluent-lts-apt-source/Rakefile b/fluent-lts-apt-source/Rakefile
@@ -86,9 +86,8 @@ class FluentdAptLtsSourcePackageTask < PackageTask
 
   def apt_targets_default
     [
-      "debian-bulleye",
       "debian-bookworm",
-      "ubuntu-focal",
+      "debian-trixie",
       "ubuntu-jammy",
       "ubuntu-noble"
     ]
diff --git a/fluent-lts-apt-source/apt/debian-trixie/Dockerfile b/fluent-lts-apt-source/apt/debian-trixie/Dockerfile
@@ -0,0 +1,17 @@
+FROM debian:trixie
+
+RUN \
+  echo "debconf debconf/frontend select Noninteractive" | \
+    debconf-set-selections
+
+ARG DEBUG
+
+RUN \
+  quiet=$([ "${DEBUG}" = "yes" ] || echo "-qq") && \
+  apt update ${quiet} && \
+  apt install -y -V ${quiet} \
+    debhelper \
+    devscripts \
+    gnupg && \
+  apt clean && \
+  rm -rf /var/lib/apt/lists/*
diff --git a/fluent-package/Rakefile b/fluent-package/Rakefile
@@ -1355,9 +1355,8 @@ EOS
 
   def apt_targets_default
     [
-      "debian-bullseye",
       "debian-bookworm",
-      "ubuntu-focal",
+      "debian-trixie",
       "ubuntu-jammy",
       "ubuntu-noble",
     ]
diff --git a/fluent-package/apt/commonvar.sh b/fluent-package/apt/commonvar.sh
@@ -6,13 +6,7 @@ td_agent_version=4.5.2
 fluent_package_lts_version=5.0.5
 
 case ${code_name} in
-  xenial)
-    distribution=ubuntu
-    channel=universe
-    mirror=http://archive.ubuntu.com/ubuntu/
-    java_jdk=openjdk-8-jre
-    ;;
-  bionic|focal|hirsute|jammy|noble)
+  jammy|noble)
     distribution=ubuntu
     channel=universe
     mirror=http://archive.ubuntu.com/ubuntu/
@@ -21,12 +15,7 @@ case ${code_name} in
         mirror=http://ports.ubuntu.com/ubuntu-ports
     fi
     ;;
-  buster|bullseye)
-    distribution=debian
-    channel=main
-    mirror=http://deb.debian.org/debian
-    ;;
-  bookworm)
+  bookworm|trixie)
     distribution=debian
     channel=main
     mirror=http://deb.debian.org/debian
diff --git a/fluent-package/apt/debian-trixie-arm64/from b/fluent-package/apt/debian-trixie-arm64/from
@@ -0,0 +1,18 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
+arm64v8/debian:trixie
diff --git a/fluent-package/apt/debian-trixie/Dockerfile b/fluent-package/apt/debian-trixie/Dockerfile
@@ -0,0 +1,61 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
+ARG FROM=debian:trixie
+FROM ${FROM}
+
+COPY qemu-* /usr/bin/
+
+RUN \
+  echo "debconf debconf/frontend select Noninteractive" | \
+    debconf-set-selections
+
+ARG DEBUG
+
+RUN sed -i'' -e 's/main$/main contrib non-free-firmware/g' /etc/apt/sources.list.d/debian.sources
+RUN sed -i'' -e 's/^Types: deb/Types: deb deb-src/g' /etc/apt/sources.list.d/debian.sources
+
+RUN \
+  quiet=$([ "${DEBUG}" = "yes" ] || echo "-qq") && \
+  apt update ${quiet} && \
+  apt install -y -V ${quiet} \
+    build-essential \
+    debhelper \
+    devscripts \
+    ruby-dev \
+    ruby-bundler \
+    libedit2 \
+    libncurses5-dev \
+    libyaml-dev \
+    libffi-dev \
+    libreadline-dev \
+    git \
+    pkg-config \
+    libssl-dev \
+    libpq-dev \
+    tar \
+    lsb-release \
+    zlib1g-dev \
+    cmake && \
+  apt build-dep -y ruby && \
+  apt clean && \
+  # raise IPv4 priority
+  sed -i'' -e 's,#precedence ::ffff:0:0/96  100,precedence ::ffff:0:0/96  100,' /etc/gai.conf && \
+  # enable multiplatform feature
+  gem install --no-document --install-dir /usr/share/rubygems-integration/all bundler builder && \
+  rm -rf /var/lib/apt/lists/* && \
+  curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y
diff --git a/fluent-package/apt/debian-trixie/qemu-dummy-static b/fluent-package/apt/debian-trixie/qemu-dummy-static
@@ -0,0 +1,33 @@
+#!/bin/sh
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
+# Do nothing. This exists only for not requiring qemu-aarch64-static copy.
+# Recent Debian (buster or later) and Ubuntu (18.10 or later) on amd64 hosts or
+# arm64 host don't require qemu-aarch64-static in Docker image. But old Debian
+# and Ubuntu hosts on amd64 require qemu-aarch64-static in Docker image.
+#
+# We use "COPY qemu* /usr/bin/" in Dockerfile. If we don't put any "qemnu*",
+# the "COPY" is failed. It means that we always require "qemu*" even if we
+# use recent Debian/Ubuntu or arm64 host. If we have this dummy "qemu*" file,
+# the "COPY" isn't failed. It means that we can copy "qemu*" only when we
+# need.
+#
+# See also "script" in dev/tasks/linux-packages/azure.linux.arm64.yml.
+# Azure Pipelines uses old Ubuntu (18.04).
+# So we need to put "qemu-aarch64-static" into this directory.
diff --git a/fluent-package/apt/install-test.sh b/fluent-package/apt/install-test.sh
@@ -38,7 +38,7 @@ for conf_path in /etc/td-agent/td-agent.conf /etc/fluent/fluentd.conf; do
 done
 
 case $code_name in
-    bookworm|noble)
+    bookworm|trixie|noble)
 	echo "As ${code_name} is not published for v4, so package upgrade install check for ${code_name} is disabled"
 	exit 0
 	;;
diff --git a/fluent-package/apt/piuparts-test.sh b/fluent-package/apt/piuparts-test.sh
@@ -17,6 +17,13 @@ if [ -z "$(apt-cache show piuparts 2>/dev/null)" ]; then
 	exit 0
 fi
 
+case $code_name in
+    trixie)
+	echo "As ${code_name} is not published for v5, so piuparts check for ${code_name} is disabled"
+	exit 0
+	;;
+esac
+
 find ${repositories_dir}
 DEBIAN_FRONTEND=noninteractive apt install -V -y piuparts mount gnupg curl eatmydata
 gpg_command=gpg
diff --git a/fluent-package/apt/systemd-test/install-newly.sh b/fluent-package/apt/systemd-test/install-newly.sh
@@ -36,7 +36,7 @@ sudo /usr/sbin/fluentd --dry-run
 sudo apt remove -y fluent-package
 
 case ${code_name} in
-  bookworm|noble)
+  bookworm|trixie|noble)
     # no dead fluentd.service symlink in /etc/systemd/system
     (! test -h /etc/systemd/system/fluentd.service)
     test -h /etc/systemd/system/multi-user.target.wants/fluentd.service
diff --git a/fluent-package/convert-artifacts-layout.sh b/fluent-package/convert-artifacts-layout.sh
@@ -27,9 +27,9 @@ case $1 in
     apt|deb)
 	REPOSITORY_TYPE=apt
 	REPOSITORY_PATH=$FLUENT_PACKAGE_DIR/$REPOSITORY_TYPE/repositories
-	for d in bullseye bookworm focal jammy noble; do
+	for d in bookworm trixie jammy noble; do
 	    case $d in
-		bullseye|bookworm)
+		bookworm|trixie)
 		    # e.g. mapping debian/pool/buster/main/t/td-agent/ => 5/debian/buster/pool/contrib/t/td-agent
 		    #      mapping debian/pool/buster/main/f/fluent-package/ => 5/debian/buster/pool/contrib/f/fluent-package
 		    mkdir -p $ARTIFACTS_DIR/5/debian/$d/pool/contrib/f/fluent-package
@@ -49,7 +49,7 @@ case $1 in
 			     -exec cp {} $ARTIFACTS_DIR/5/debian/$d/pool/contrib/f/fluent-apt-source \;
 		    fi
 		    ;;
-		focal|jammy|noble)
+		jammy|noble)
 		    # e.g. mapping ubuntu/pool/.../main/t/td-agent/ => 5/ubuntu/.../pool/contrib/t/td-agent
 		    #      mapping ubuntu/pool/.../main/f/fluent-package/ => 5/ubuntu/.../pool/contrib/f/fluent-package
 		    mkdir -p $ARTIFACTS_DIR/5/ubuntu/$d/pool/contrib/f/fluent-package
diff --git a/fluent-package/manage-fluent-repositories.sh b/fluent-package/manage-fluent-repositories.sh
diff --git a/fluent-package/test-install-in-docker.sh b/fluent-package/test-install-in-docker.sh

Original file line number	Diff line number	Diff line change
`@@ -1,19 +1,14 @@`
`1`	`1`	`{`
`2`	`2`	`"include": [`
`3`		`- {`
`4`		`- "label": "Debian bullseye amd64",`
`5`		`- "rake-job": "debian-bullseye",`
`6`		`- "test-docker-image": "debian:bullseye"`
`7`		`- },`
`8`	`3`	`{`
`9`	`4`	`"label": "Debian bookworm amd64",`
`10`	`5`	`"rake-job": "debian-bookworm",`
`11`	`6`	`"test-docker-image": "debian:bookworm"`
`12`	`7`	`},`
`13`	`8`	`{`
`14`		`- "label": "Ubuntu Focal amd64",`
`15`		`- "rake-job": "ubuntu-focal",`
`16`		`- "test-docker-image": "ubuntu:focal"`
	`9`	`+ "label": "Debian trixie amd64",`
	`10`	`+ "rake-job": "debian-trixie",`
	`11`	`+ "test-docker-image": "debian:trixie"`
`17`	`12`	`},`
`18`	`13`	`{`
`19`	`14`	`"label": "Ubuntu Jammy amd64",`
Original file line number	Diff line number	Diff line change
`@@ -86,9 +86,8 @@ class FluentdAptSourcePackageTask < PackageTask`
`86`	`86`
`87`	`87`	`def apt_targets_default`
`88`	`88`	`[`
`89`		`- "debian-bulleye",`
`90`	`89`	`"debian-bookworm",`
`91`		`- "ubuntu-focal",`
	`90`	`+ "debian-trixie",`
`92`	`91`	`"ubuntu-jammy",`
`93`	`92`	`"ubuntu-noble"`
`94`	`93`	`]`
Original file line number	Diff line number	Diff line change
`@@ -86,9 +86,8 @@ class FluentdAptLtsSourcePackageTask < PackageTask`
`86`	`86`
`87`	`87`	`def apt_targets_default`
`88`	`88`	`[`
`89`		`- "debian-bulleye",`
`90`	`89`	`"debian-bookworm",`
`91`		`- "ubuntu-focal",`
	`90`	`+ "debian-trixie",`
`92`	`91`	`"ubuntu-jammy",`
`93`	`92`	`"ubuntu-noble"`
`94`	`93`	`]`
Original file line number	Diff line number	Diff line change
`@@ -1355,9 +1355,8 @@ EOS`
`1355`	`1355`
`1356`	`1356`	`def apt_targets_default`
`1357`	`1357`	`[`
`1358`		`- "debian-bullseye",`
`1359`	`1358`	`"debian-bookworm",`
`1360`		`- "ubuntu-focal",`
	`1359`	`+ "debian-trixie",`
`1361`	`1360`	`"ubuntu-jammy",`
`1362`	`1361`	`"ubuntu-noble",`
`1363`	`1362`	`]`