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

Johnf/add supported images list #3591

Merged
merged 6 commits into from
Jan 13, 2025
Merged

Johnf/add supported images list #3591

Changes from 2 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
6c629fb
add lpe supported image list
feng-j678 Jan 8, 2025
7669366
apply lisa code format
feng-j678 Jan 8, 2025
61469b9
use range to shorten the image list
feng-j678 Jan 9, 2025
98a3c71
use parse_version for image validation
feng-j678 Jan 10, 2025
938d58d
reformat line character to under 88
feng-j678 Jan 11, 2025
944352b
fix the logic in _verify_lpe_supported_images and refactor the code
feng-j678 Jan 12, 2025
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
116 changes: 98 additions & 18 deletions microsoft/testsuites/vm_extensions/linux_patch_extension.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
simple_requirement,
)
from lisa.base_tools.service import Service
from lisa.operating_system import BSD, SLES, CBLMariner, CentOs, Debian, Oracle, Ubuntu
from lisa.operating_system import BSD, SLES, CentOs, Oracle, Redhat, Ubuntu
from lisa.sut_orchestrator import AZURE
from lisa.sut_orchestrator.azure.common import (
get_compute_client,
Expand Down Expand Up @@ -48,28 +48,108 @@ def _verify_supported_arm64_images(node: Node, log: Logger, full_version: Any) -
_unsupported_image_exception_msg(node)


def _verify_unsupported_images(node: Node, full_version: Any) -> None:
# Unsupported detailed versions for x86_64
unsupported_versions_x86_64 = {
# Major Minor Gen
SLES: ["15.5.1", "15.5.2"],
CBLMariner: ["1.0.1", "2.0.1", "2.0.2", "3.0.1"],
Debian: [
"10.12.1",
"10.12.2",
"10.13.1",
"11.6.1",
"11.7.1",
"11.7.2",
"11.9.2",
def _verify_lpe_supported_images(node: Node, log: Logger, full_version: Any) -> None:
# lpe current supported images
lpe_supported_images_versions = {
# major.minor.gen
CentOs: ["7.7.1", "7.7.2", "7.9.2"],
Oracle: [
"7.9.1",
"7.9.2",
"8.1.1",
"8.1.2",
"8.2.1",
"8.2.2",
"8.3.1",
"8.3.2",
"8.4.1",
"8.4.2",
"8.5.1",
"8.5.2",
"8.9.1",
"8.9.2",
"8.10.1",
"8.10.2",
"9.0.1",
"9.0.2",
"9.1.1",
"9.1.2",
"9.4.1",
"9.4.2",
],
Redhat: [
"7.2.1",
squirrelsc marked this conversation as resolved.
Show resolved Hide resolved
"7.2.2",
"7.3.1",
"7.3.2",
"7.4.1",
"7.4.2",
"7.5.1",
"7.5.2",
"7.6.1",
"7.6.2",
"7.7.1",
"7.7.2",
"7.8.1",
"7.8.2",
"7.9.1",
"7.9.2",
"8.0.1",
"8.0.2",
"8.1.1",
"8.1.2",
"8.2.1",
"8.2.2",
"8.3.1",
"8.3.2",
"8.4.1",
"8.4.2",
"8.5.1",
"8.5.2",
"8.6.1",
"8.6.2",
"8.7.1",
"8.8.1",
"8.8.2",
"8.9.1",
"8.9.2",
"8.10.1",
"8.10.2",
"9.0.1",
"9.0.2",
"9.1.1",
"9.1.2",
"9.2.1",
"9.2.2",
"9.3.1",
"9.3.2",
"9.4.1",
"9.4.2",
"9.5.1",
"9.5.2",
],
SLES: ["12.5.1", "12.5.2", "15.2.1", "15.2.2"],
Ubuntu: [
"16.4.1",
"16.4.2",
"18.4.1",
"18.4.2",
"20.4.1",
"20.4.2",
"22.4.1",
"22.4.2",
],
}

for distro in unsupported_versions_x86_64:
for distro in lpe_supported_images_versions:
LiliDeng marked this conversation as resolved.
Show resolved Hide resolved
if isinstance(node.os, distro):
version_list = unsupported_versions_x86_64.get(distro)
version_list = lpe_supported_images_versions.get(distro)
if version_list is not None and full_version in version_list:
log.debug(f"This is a supported image: {full_version}")
return
else:
# Raise an exception for unsupported version
log.debug(f"This is an unsupported image: {full_version}")
_unsupported_image_exception_msg(node)


Expand Down Expand Up @@ -126,7 +206,7 @@ def _verify_supported_images_and_vm_agent(node: Node, log: Logger) -> None:
if arch == "aarch64":
_verify_supported_arm64_images(node, log, full_version)
else:
_verify_unsupported_images(node, full_version)
_verify_lpe_supported_images(node, log, full_version)

# Verify if VM agent service is running, lpe is a dependent of VM agent
_verify_vm_agent_running(node, log)
Expand Down
Loading