Skip to content

Commit

Permalink
reset uphold setting for agent service in flatcar distro (#3066)
Browse files Browse the repository at this point in the history
* reset uphold settings for flatcar images

* updated comment

* stop the rebbot service

* address comments
  • Loading branch information
nagworld9 authored Feb 27, 2024
1 parent edd8271 commit 5759501
Show file tree
Hide file tree
Showing 3 changed files with 22 additions and 8 deletions.
19 changes: 19 additions & 0 deletions tests_e2e/orchestrator/scripts/install-agent
Original file line number Diff line number Diff line change
Expand Up @@ -140,6 +140,25 @@ if [[ $(uname -a) == *"flatcar"* ]]; then
if [[ ! -f /usr/share/oem/waagent.conf ]]; then
ln -s "$waagent_conf_path" /usr/share/oem/waagent.conf
fi

# New flatcar images set the uphold property for agent service that is causing automatic restart on stop cmd
# [Upholds= dependency on it has a continuous effect, constantly restarting the unit if necessary]
# Resetting the uphold property as workaround for now
uphold_target=$(systemctl show waagent --property=UpheldBy)
# example output: UpheldBy=multi-user.target
if [[ $uphold_target == *".target"* ]]; then
target_name="${uphold_target#*=}"
if [[ ! -d /etc/systemd/system/$target_name.d ]]; then
mkdir -p /etc/systemd/system/$target_name.d
fi
echo -e "[Unit]\nUpholds=" > /etc/systemd/system/$target_name.d/10-waagent-sysext.conf
systemctl daemon-reload
fi
# Flatcar images does automatic reboot without user input, so turning it off
# Broadcast message from locksmithd at 2024-02-23 19:48:55.478412272 +0000 UTC m=
# System reboot in 5 minutes!
echo "REBOOT_STRATEGY=off" > /etc/flatcar/update.conf
systemctl restart locksmithd
fi

#
Expand Down
7 changes: 1 addition & 6 deletions tests_e2e/test_suites/agent_firewall.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,4 @@ tests:
images:
- "endorsed"
- "endorsed-arm64"
owns_vm: true # This vm cannot be shared with other tests because it modifies the firewall rules and agent status.
# Systemctl stop functionality changed and service doing restart on stop cmd in flatcar images. Thus breaking our tests.
# TODO: Enable once it is fixed
skip_on_images:
- "flatcar"
- "flatcar_arm64"
owns_vm: true # This vm cannot be shared with other tests because it modifies the firewall rules and agent status.
4 changes: 2 additions & 2 deletions tests_e2e/test_suites/agent_update.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,8 @@ owns_vm: true
skip_on_clouds:
- "AzureChinaCloud"
- "AzureUSGovernment"
# Systemctl stop functionality changed and service doing restart on stop cmd in flatcar images. Thus breaking our tests.
# TODO: Enable once it is fixed
# Since Flatcar read-only filesystem, we can't edit the version file. This test relies on the version to be updated in version file.
# TODO: Enable once we find workaround for this
skip_on_images:
- "flatcar"
- "flatcar_arm64"

0 comments on commit 5759501

Please sign in to comment.