Merge pull request #3277 from Azure/hotfix-2.12.0.3

Hotfix 2.12.0.4 to master

Author: maddieford

azurelinuxagent/common/version.py

@@ -209,7 +209,7 @@ def has_logrotate():
 #
 #            When doing a release, be sure to use the actual agent version. Current agent version: 2.4.0.0
 #
-AGENT_VERSION = '2.12.0.2'
+AGENT_VERSION = '2.12.0.4'
 AGENT_LONG_VERSION = "{0}-{1}".format(AGENT_NAME, AGENT_VERSION)
 AGENT_DESCRIPTION = """
 The Azure Linux Agent supports the provisioning and running of Linux

setup.py

@@ -320,10 +320,11 @@ def run(self):
 #   will be removed from Python 3.
 # * In version 3.13 of Python, the crypt module was removed and legacycrypt is
 #   required instead.
-requires = [
-    "distro;python_version>='3.8'",
-    "legacycrypt;python_version>='3.13'",
-]
+requires = []
+if sys.version_info[0] >= 3 and sys.version_info[1] >= 8:
+    requires.append('distro')
+if sys.version_info[0] >= 3 and sys.version_info[1] >= 13:
+    requires.append('legacycrypt')
 
 modules = []  # pylint: disable=invalid-name
 

tests_e2e/orchestrator/lib/agent_test_suite.py

@@ -938,7 +938,7 @@ def read_file(path: str) -> str:
         template: Dict[str, Any] = json.loads(read_file(str(self._test_source_directory/"orchestrator"/"templates/vmss.json")))
 
         # Scale sets for some images need to be deployed with 'plan' property
-        plan_required_images = ["almalinux", "kinvolk", "erockyenterprisesoftwarefoundationinc1653071250513"]
+        plan_required_images = ["almalinux", "kinvolk", "resf"]
         if publisher in plan_required_images:
             resources: List[Dict[str, Any]] = template.get('resources')
             for resource in resources:

tests_e2e/test_suites/images.yml

@@ -191,7 +191,7 @@ images:
          AzureChinaCloud: []
          AzureUSGovernment: []
    rocky_9:
-      urn: "erockyenterprisesoftwarefoundationinc1653071250513 rockylinux-9 rockylinux-9 latest"
+      urn: "resf rockylinux-x86_64 9-base latest"
       locations:
          AzureChinaCloud: []
          AzureUSGovernment: []