diff --git a/.github/workflows/apt.yml b/.github/workflows/apt.yml index 69bb895ce..68e44b0ce 100644 --- a/.github/workflows/apt.yml +++ b/.github/workflows/apt.yml @@ -131,7 +131,9 @@ jobs: - Ubuntu Jammy amd64 - Ubuntu Noble amd64 test: - - "update-from-v4.sh" + - "update-from-v4.sh local" + - "update-from-v4.sh v5" + - "update-from-v4.sh lts" - "downgrade-to-v4.sh" - "install-newly.sh local" - "install-newly.sh v5" @@ -160,13 +162,21 @@ jobs: lxc-image: ubuntu:24.04 exclude: - label: Debian bookworm amd64 - test: update-from-v4.sh + test: update-from-v4.sh local + - label: Debian bookworm amd64 + test: update-from-v4.sh v5 + - label: Debian bookworm amd64 + test: update-from-v4.sh lts - label: Debian bookworm amd64 test: update-to-next-version-with-backward-compat-for-v4.sh - label: Debian bookworm amd64 test: downgrade-to-v4.sh - label: Ubuntu Noble amd64 - test: update-from-v4.sh + test: update-from-v4.sh local + - label: Ubuntu Noble amd64 + test: update-from-v4.sh v5 + - label: Ubuntu Noble amd64 + test: update-from-v4.sh lts - label: Ubuntu Noble amd64 test: update-to-next-version-with-backward-compat-for-v4.sh - label: Ubuntu Noble amd64 diff --git a/fluent-package/apt/systemd-test/update-from-v4.sh b/fluent-package/apt/systemd-test/update-from-v4.sh index 16926a770..a7808e664 100755 --- a/fluent-package/apt/systemd-test/update-from-v4.sh +++ b/fluent-package/apt/systemd-test/update-from-v4.sh @@ -28,8 +28,18 @@ for d in $(seq 1 10); do done # Install the current -sudo apt install -V -y \ - /host/${distribution}/pool/${code_name}/${channel}/*/*/fluent-package_*_${architecture}.deb +case $1 in + local) + sudo apt install -V -y \ + /host/${distribution}/pool/${code_name}/${channel}/*/*/fluent-package_*_${architecture}.deb + ;; + v5) + curl --fail --silent --show-error --location https://toolbelt.treasuredata.com/sh/install-${distribution}-${code_name}-fluent-package5.sh | sh + ;; + lts) + curl --fail --silent --show-error --location https://toolbelt.treasuredata.com/sh/install-${distribution}-${code_name}-fluent-package5-lts.sh | sh + ;; +esac # Test: service status systemctl status --no-pager fluentd