app-emulation/wa-linux-agent: update to v2.6.0.2

v2.6.0.2 is the latest released version and contains the upstreamed
Flatcar support.

Signed-off-by: Jeremi Piotrowski <jpiotrowski@microsoft.com>
This commit is contained in:
Jeremi Piotrowski 2022-02-09 10:26:18 +00:00
parent 563b295ed7
commit c312e54e3e
5 changed files with 1 additions and 76 deletions

View File

@ -1 +1 @@
DIST wa-linux-agent-2.3.1.1.tar.gz 1197026 BLAKE2B 2751e43eb563705506d0f698eb69ee029de536f78ec03943861d98ac702d79dba265d72734ef1ad9ffd3b49eb0a2e55fd3536a50248db37c3d0f78b751fa6e27 SHA512 d68a622f0280d442e02b34ddac668f466252a7ed4581af63eb88df544ddb0808db04a3f35e24c1202c974ad6b7aa1e30ed1d4a3c14a3ba0a12de02fa3a5c4406
DIST wa-linux-agent-2.6.0.2.tar.gz 1530936 BLAKE2B f47a4293a939da03859dafac2f422c4066dc2e92d6d4417a7e61e64abf22f1e096fcc7fc4ddfbe3166427ca44df75d967dbd1379d06c1b409fc3edc6340a17f2 SHA512 8826482ceb9e47a9b7f7271c5db19bf46ccabcefd327119e44f2760b147206a1fd3905a0cc8178527fe3326d4179f84bab8f7c673ede3c6de8dcacde0008e405

View File

@ -1,71 +0,0 @@
From 4d914f0bf587c755b63cc4859911e39b5455b5b1 Mon Sep 17 00:00:00 2001
From: Krzesimir Nowak <knowak@microsoft.com>
Date: Tue, 31 Aug 2021 14:46:26 +0200
Subject: [PATCH] Support flatcar
---
azurelinuxagent/common/osutil/factory.py | 3 ++-
azurelinuxagent/pa/deprovision/factory.py | 2 +-
tests/common/osutil/test_factory.py | 6 ++++++
tests/tools.py | 1 +
4 files changed, 10 insertions(+), 2 deletions(-)
diff --git a/azurelinuxagent/common/osutil/factory.py b/azurelinuxagent/common/osutil/factory.py
index b212c382..4bf0a36d 100644
--- a/azurelinuxagent/common/osutil/factory.py
+++ b/azurelinuxagent/common/osutil/factory.py
@@ -81,7 +81,8 @@ def _get_osutil(distro_name, distro_code_name, distro_version, distro_full_name)
if distro_name == "kali":
return DebianOSBaseUtil()
- if distro_name == "coreos" or distro_code_name == "coreos":
+ if distro_name == "flatcar" or distro_code_name == "flatcar" \
+ or distro_name == "coreos" or distro_code_name == "coreos":
return CoreOSUtil()
if distro_name in ("suse", "sle_hpc", "sles", "opensuse"):
diff --git a/azurelinuxagent/pa/deprovision/factory.py b/azurelinuxagent/pa/deprovision/factory.py
index 6197fc6a..e7ce1c83 100644
--- a/azurelinuxagent/pa/deprovision/factory.py
+++ b/azurelinuxagent/pa/deprovision/factory.py
@@ -35,7 +35,7 @@ def get_deprovision_handler(distro_name=DISTRO_NAME,
return Ubuntu1804DeprovisionHandler()
else:
return UbuntuDeprovisionHandler()
- if distro_name == "coreos":
+ if distro_name == "flatcar" or distro_name == "coreos":
return CoreOSDeprovisionHandler()
if "Clear Linux" in distro_full_name:
return ClearLinuxDeprovisionHandler() # pylint: disable=E1120
diff --git a/tests/common/osutil/test_factory.py b/tests/common/osutil/test_factory.py
index f7d46b21..6d6dd46c 100644
--- a/tests/common/osutil/test_factory.py
+++ b/tests/common/osutil/test_factory.py
@@ -142,6 +142,12 @@ class TestOsUtilFactory(AgentTestCase):
distro_full_name="")
self.assertTrue(isinstance(ret, CoreOSUtil))
self.assertEqual(ret.get_service_name(), "waagent")
+ ret = _get_osutil(distro_name="flatcar",
+ distro_code_name="",
+ distro_version="",
+ distro_full_name="")
+ self.assertTrue(isinstance(ret, CoreOSUtil))
+ self.assertEqual(ret.get_service_name(), "waagent")
def test_get_osutil_it_should_return_suse(self):
ret = _get_osutil(distro_name="suse",
diff --git a/tests/tools.py b/tests/tools.py
index 64f1862d..cd16c089 100644
--- a/tests/tools.py
+++ b/tests/tools.py
@@ -452,6 +452,7 @@ supported_distro = [
["ubuntu", "15.10", "Snappy Ubuntu Core"],
["coreos", "", ""],
+ ["flatcar", "", ""],
["suse", "12", "SUSE Linux Enterprise Server"],
["suse", "13.2", "openSUSE"],
--
2.31.1

View File

@ -22,10 +22,6 @@ dev-lang/python-oem:${DEP_PYVER}
dev-python/distro-oem
"
PATCHES=(
"${FILESDIR}/0001-Support-flatcar.patch"
)
S="${WORKDIR}/WALinuxAgent-${PV}"
src_install() {