Remove deprecated OS from GOS support list (#605)

Signed-off-by: ZouYuhua <[email protected]>
vmware · Jul 8, 2024 · 61129bf · 61129bf
1 parent 904b3e7
commit 61129bf
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 184 deletions.
diff --git a/README.md b/README.md
@@ -75,14 +75,10 @@ This project supports below scenarios for end-to-end guest operating system vali
 | Rocky Linux 8.x, 9.x                                   | :heavy_check_mark:               |                          | :heavy_check_mark:                 |
 | AlmaLinux 8.x, 9.x                                     | :heavy_check_mark:               |                          | :heavy_check_mark:                 |
 | SUSE Linux Enterprise 15 SP3 and later                 | :heavy_check_mark:               |                          | :heavy_check_mark:                 |
-| SUSE Linux Enterprise 12 SP5, 15 SP0/SP1/SP2           |                                  |                          | :heavy_check_mark:                 |
 | VMware Photon OS 3.0, 4.0, 5.0                         | :heavy_check_mark:               | :heavy_check_mark:       | :heavy_check_mark:                 |
-| Ubuntu 18.04 live-server                               | :heavy_check_mark:               |                          | :heavy_check_mark:                 |
-| Ubuntu 18.04 desktop                                   |                                  |                          | :heavy_check_mark:                 |
 | Ubuntu 20.04 and later                                 | :heavy_check_mark:               | :heavy_check_mark:       | :heavy_check_mark:                 |
 | Flatcar 2592.0.0 and later                             |                                  | :heavy_check_mark:       | :heavy_check_mark:                 |
 | Debian 10.10 and later, 11.x, 12.x                     | :heavy_check_mark:               |                          | :heavy_check_mark:                 |
-| Debian 9.x, 10.9 and earlier                           |                                  |                          | :heavy_check_mark:                 |
 | Windows 10, 11                                         | :heavy_check_mark:               |                          | :heavy_check_mark:                 |
 | Windows Server 2019, 2022                              | :heavy_check_mark:               |                          | :heavy_check_mark:                 |
 | UnionTech OS Server 20 1050a                           | :heavy_check_mark:               |                          | :heavy_check_mark:                 |

diff --git a/linux/deploy_vm/ubuntu/prepare_ubuntu_iso_install.yml b/linux/deploy_vm/ubuntu/prepare_ubuntu_iso_install.yml
@@ -14,34 +14,20 @@
       {%- else -%}unknown
       {%- endif -%}
 
-- name: "Set fact of Ubuntu Server"
-  block:
-    - name: "Set Ubuntu autoinstall method"
-      ansible.builtin.set_fact:
-        ubuntu_install_method: |-
-          {%- if ubuntu_version and ubuntu_version is version('20.04', '<') -%}simulation
-          {%- else -%}cloud-init
-          {%- endif -%}
-
-    - name: "Set fact of Ubuntu unattend install file"
-      ansible.builtin.set_fact:
-        unattend_install_conf: "Ubuntu/Server/user-data.j2"
-      when: ubuntu_install_method == "cloud-init"
+- name: "Set fact of Ubuntu Server unattend install file"
+  ansible.builtin.set_fact:
+    unattend_install_conf: "Ubuntu/Server/user-data.j2"
   when: ubuntu_edition == 'server'
 
 - name: "Set fact of Ubuntu desktop"
+  when: ubuntu_edition == 'desktop'
   block:
-    - name: “Set autoinstall method for Ubuntu Desktop”
+    - name: “Set fact of unattend install file for Ubuntu Desktop”
       ansible.builtin.set_fact:
         unattend_install_conf: "Ubuntu/Desktop/Ubiquity/ubuntu.seed"
+      when: ubuntu_version and ubuntu_version is version('23.04', '<')
 
-    - name: "Set fact of desktop unattend install file for Ubuntu 23.04 or later"
-      block:
-        - name: “Set autoinstall method for Ubuntu Desktop 23.04 or later”
-          ansible.builtin.set_fact:
-            ubuntu_install_method: "cloud-init"
-        - name: "Set fact of unattend install file for Ubuntu 23.04 or later"
-          ansible.builtin.set_fact:
-            unattend_install_conf: "Ubuntu/Desktop/Subiquity/user-data.j2"
+    - name: "Set fact of unattend install file for Ubuntu 23.04 desktop or later"
+      ansible.builtin.set_fact:
+        unattend_install_conf: "Ubuntu/Desktop/Subiquity/user-data.j2"
       when: ubuntu_version and ubuntu_version is version('23.04', '>=')
-  when: ubuntu_edition == 'desktop'
diff --git a/linux/deploy_vm/ubuntu/ubuntu_autoinstall.yml b/linux/deploy_vm/ubuntu/ubuntu_autoinstall.yml
diff --git a/linux/deploy_vm/ubuntu/ubuntu_install_os.yml b/linux/deploy_vm/ubuntu/ubuntu_install_os.yml
@@ -1,10 +1,6 @@
 # Copyright 2021-2024 VMware, Inc.
 # SPDX-License-Identifier: BSD-2-Clause
 ---
-# Start to Ubuntu OS install
-- include_tasks: ./ubuntu_autoinstall.yml
-  when: ubuntu_install_method is defined and ubuntu_install_method == "simulation"
-
 # Wait for autoinstall start message in serial port output file
 - name: "Wait for Ubuntu autoinstall is started successfully"
   when: unattend_installer == 'Ubuntu-Subiquity'