Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Backport: ci: install transitional package #731

Merged
merged 3 commits into from
Nov 11, 2024
Merged

Backport: ci: install transitional package #731

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
4c8cd21
Backport: ci: install transitional package (#709)
kenhys Nov 1, 2024
5df670b
Backport deb: fix update current behavior about updating from v4 (#711)
kenhys Nov 1, 2024
eb5b04a
ci deb: remove transitional package too
kenhys Nov 11, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions fluent-package/apt/systemd-test/downgrade-to-v4.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,13 +17,14 @@ systemctl status --no-pager td-agent

# Ensure to install the current
sudo apt install -V -y \
/host/${distribution}/pool/${code_name}/${channel}/*/*/fluent-package_*_${architecture}.deb
/host/${distribution}/pool/${code_name}/${channel}/*/*/fluent-package_*_${architecture}.deb \
/host/${distribution}/pool/${code_name}/${channel}/*/*/td-agent_*_all.deb

# td-agent.service is already masked (link to /dev/null), and remove td-agent.service alias not to conflict with v4
sudo systemctl unmask td-agent

# Even though removing fluent-package, log and .conf are kept. dpkg reports "rc fluent-package" and "rc td-agent" status.
sudo apt remove -y fluent-package
sudo apt remove -y fluent-package td-agent

# fluentd.service is already masked (link to /dev/null), then remove it.
sudo systemctl unmask fluentd
Expand Down
8 changes: 6 additions & 2 deletions fluent-package/apt/systemd-test/update-from-v4.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,11 +29,15 @@ done

# Install the current
sudo apt install -V -y \
/host/${distribution}/pool/${code_name}/${channel}/*/*/fluent-package_*_${architecture}.deb
/host/${distribution}/pool/${code_name}/${channel}/*/*/fluent-package_*_${architecture}.deb \
/host/${distribution}/pool/${code_name}/${channel}/*/*/td-agent_*_all.deb

# Test: service status
systemctl status --no-pager fluentd
(! systemctl status --no-pager td-agent)
# BUG: v4 service restart logic will not launched usually because the
# existence check of td-agent.service will always fail.
# As a result, old service is still alive here.
systemctl status --no-pager td-agent

# Test: restoring td-agent service alias
sudo systemctl stop fluentd
Expand Down
3 changes: 2 additions & 1 deletion fluent-package/apt/systemd-test/update-to-next-version-with-backward-compat-for-v4.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,8 @@ done

# Install the current
sudo apt install -V -y \
/host/${distribution}/pool/${code_name}/${channel}/*/*/fluent-package_*_${architecture}.deb
/host/${distribution}/pool/${code_name}/${channel}/*/*/fluent-package_*_${architecture}.deb \
/host/${distribution}/pool/${code_name}/${channel}/*/*/td-agent_*_all.deb
systemctl status --no-pager fluentd

sudo systemctl stop fluentd
Expand Down
Loading