From 09da82087cd42268e9ef48bcc46d89ff87dbbe5b Mon Sep 17 00:00:00 2001
From: Kentaro Hayashi <hayashi@clear-code.com>
Date: Mon, 24 Jun 2024 18:08:16 +0900
Subject: [PATCH] deb: add missing noble

Signed-off-by: Kentaro Hayashi <hayashi@clear-code.com>
---
 fluent-lts-apt-source/convert-artifacts-layout.sh | 4 ++--
 fluent-package/convert-artifacts-layout.sh        | 2 +-
 fluent-package/test-install-in-docker.sh          | 2 +-
 fluent-package/test-verify-repo.sh                | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/fluent-lts-apt-source/convert-artifacts-layout.sh b/fluent-lts-apt-source/convert-artifacts-layout.sh
index 72fa70e29..b15e480fb 100755
--- a/fluent-lts-apt-source/convert-artifacts-layout.sh
+++ b/fluent-lts-apt-source/convert-artifacts-layout.sh
@@ -15,7 +15,7 @@ case $1 in
     apt|deb)
 	REPOSITORY_TYPE=apt
 	REPOSITORY_PATH=$TD_AGENT_DIR/$REPOSITORY_TYPE/repositories
-	for d in bullseye bookworm focal jammy; do
+	for d in bullseye bookworm focal jammy noble; do
 	    case $d in
 		bullseye|bookworm)
 		    # e.g. mapping debian/pool/buster/main/t/td-agent/ => 5/debian/buster/pool/contrib/t/td-agent
@@ -24,7 +24,7 @@ case $1 in
 		    find $REPOSITORY_PATH/debian/pool/$d -name 'fluent*-apt-source*.deb' -not -name '*dbgsym*' \
 			 -exec cp {} $ARTIFACTS_DIR/lts/5/debian/$d/pool/contrib/f/fluent-lts-apt-source \;
 		    ;;
-		focal|jammy)
+		focal|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/lts/5/ubuntu/$d/pool/contrib/f/fluent-lts-apt-source
diff --git a/fluent-package/convert-artifacts-layout.sh b/fluent-package/convert-artifacts-layout.sh
index ae75bd21e..34d0d8b12 100755
--- a/fluent-package/convert-artifacts-layout.sh
+++ b/fluent-package/convert-artifacts-layout.sh
@@ -27,7 +27,7 @@ case $1 in
     apt|deb)
 	REPOSITORY_TYPE=apt
 	REPOSITORY_PATH=$FLUENT_PACKAGE_DIR/$REPOSITORY_TYPE/repositories
-	for d in bullseye bookworm focal jammy; do
+	for d in bullseye bookworm focal jammy noble; do
 	    case $d in
 		bullseye|bookworm)
 		    # e.g. mapping debian/pool/buster/main/t/td-agent/ => 5/debian/buster/pool/contrib/t/td-agent
diff --git a/fluent-package/test-install-in-docker.sh b/fluent-package/test-install-in-docker.sh
index 35f499105..ad429cab0 100755
--- a/fluent-package/test-install-in-docker.sh
+++ b/fluent-package/test-install-in-docker.sh
@@ -84,7 +84,7 @@ case $ID in
     debian|ubuntu)
 	CODENAME=$(cat /etc/os-release | grep VERSION_CODENAME | cut -d'=' -f2)
 	case $CODENAME in
-	    bullseye|bookworm|focal|jammy)
+	    bullseye|bookworm|focal|jammy|noble)
 		setup_apt_user
 		case $REPO in
 		    exp/5)
diff --git a/fluent-package/test-verify-repo.sh b/fluent-package/test-verify-repo.sh
index 56c4ad50e..52d0dd292 100755
--- a/fluent-package/test-verify-repo.sh
+++ b/fluent-package/test-verify-repo.sh
@@ -43,7 +43,7 @@ fi
 VERSION=$1
 
 if [ -z "$DEB_TARGETS" ]; then
-    DEB_TARGETS="debian:bullseye debian:bookworm ubuntu:focal ubuntu:jammy"
+    DEB_TARGETS="debian:bullseye debian:bookworm ubuntu:focal ubuntu:jammy ubuntu:noble"
 fi
 if [ -z "$RPM_TARGETS" ]; then
     RPM_TARGETS="centos:7 almalinux:8 rockylinux:9 amazonlinux:2 amazonlinux:2023"