ci: add v6 remote install tests for RPM

.github/workflows/yum.yml

@@ -286,12 +286,13 @@ jobs:
         test:
           - "update-from-v4.sh"
           - "update-from-v4.sh via-v5"
-          - "update-from-v5-lts.sh"
+          - "update-from-v5-lts.sh local"
+          - "update-from-v5-lts.sh v6"
+          - "update-from-v5-lts.sh lts"
           - "downgrade-to-v4.sh"
           - "downgrade-to-v5-lts.sh"
           - "install-newly.sh local"
-          - "install-newly.sh v5"
-          #- "install-newly.sh v6"
+          - "install-newly.sh v6"
           - "install-newly.sh lts"
           - "update-to-next-version.sh"
           - "update-to-next-version-with-backward-compat-for-v4.sh"
@@ -324,18 +325,17 @@ jobs:
           - label: AlmaLinux 10 x86_64
             test: update-from-v4.sh via-v5
           - label: AlmaLinux 10 x86_64
-            test: update-from-v5-lts.sh
+            test: update-from-v5-lts.sh local
+          - label: AlmaLinux 10 x86_64
+            test: update-from-v5-lts.sh v6
+          - label: AlmaLinux 10 x86_64
+            test: update-from-v5-lts.sh lts
           - label: AlmaLinux 10 x86_64
             test: update-to-next-version-with-backward-compat-for-v4.sh
           - label: AlmaLinux 10 x86_64
             test: downgrade-to-v4.sh
           - label: AlmaLinux 10 x86_64
             test: downgrade-to-v5-lts.sh
-          - label: AlmaLinux 10 x86_64
-            test: install-newly.sh v5
-          # After replacing to v6 lts test, this condition should be removed
-          - label: AlmaLinux 10 x86_64
-            test: install-newly.sh lts
           # rpmrebuild is not supported on EPEL for AlmaLinux 10 yet
           - label: AlmaLinux 10 x86_64
             test: update-to-next-version.sh

fluent-package/yum/systemd-test/common.sh

@@ -106,17 +106,31 @@ function install_v6()
       case "$DISTRIBUTION_VERSION" in
         2023)
           curl --fail --silent --show-error --location \
-            https://toolbelt.treasuredata.com/sh/install-amazon2023-fluent-package6.sh | sh
+            https://fluentd.cdn.cncf.io/sh/install-amazon2023-fluent-package6.sh | sh
           ;;
-        2)
+      esac
+      ;;
+    *)
+      curl --fail --silent --show-error --location \
+        https://fluentd.cdn.cncf.io/sh/install-redhat-fluent-package6.sh | sh
+      ;;
+  esac
+}
+
+function install_v6_lts()
+{
+  case "$DISTRIBUTION" in
+    amazon)
+      case "$DISTRIBUTION_VERSION" in
+        2023)
           curl --fail --silent --show-error --location \
-            https://toolbelt.treasuredata.com/sh/install-amazon2-fluent-package6.sh | sh
+            https://fluentd.cdn.cncf.io/sh/install-amazon2023-fluent-package6-lts.sh | sh
           ;;
       esac
       ;;
     *)
       curl --fail --silent --show-error --location \
-        https://toolbelt.treasuredata.com/sh/install-redhat-fluent-package6.sh | sh
+        https://fluentd.cdn.cncf.io/sh/install-redhat-fluent-package6-lts.sh | sh
       ;;
   esac
 }

fluent-package/yum/systemd-test/install-newly.sh

@@ -8,14 +8,11 @@ case $1 in
   local)
     install_current
     ;;
-  v5)
-    install_v5
-    ;;
   v6)
     install_v6
     ;;
   lts)
-    install_v5_lts
+    install_v6_lts
     ;;
 esac
 

fluent-package/yum/systemd-test/update-from-v5-lts.sh

@@ -10,8 +10,18 @@ systemctl status --no-pager fluentd
 systemctl status --no-pager td-agent
 main_pid=$(eval $(systemctl show fluentd --property=MainPID) && echo $MainPID)
 
-# Install the current without stopping the service to test automatic restart after update.
-install_current
+# Install without stopping the service to test automatic restart after update.
+case $1 in
+  local)
+    install_current
+    ;;
+  v6)
+    install_v6
+    ;;
+  lts)
+    install_v6_lts
+    ;;
+esac
 
 # Test: take over enabled state
 systemctl is-enabled fluentd