Remove desktop addon from create_hdd_textmode

https://progress.opensuse.org/issues/159093
os-autoinst · Apr 17, 2024 · 0e9187f · 0e9187f
1 parent 02c4a84
commit 0e9187f
Show file tree

Hide file tree

Showing 14 changed files with 0 additions and 29 deletions.
diff --git a/data/autoyast_sle15/create_hdd/create_hdd_multipath_lvm_encrypt_textmode_aarch64.xml b/data/autoyast_sle15/create_hdd/create_hdd_multipath_lvm_encrypt_textmode_aarch64.xml
@@ -311,7 +311,6 @@
     <patterns t="list">
       <pattern>apparmor</pattern>
       <pattern>base</pattern>
-      <pattern>basic_desktop</pattern>
       <pattern>enhanced_base</pattern>
       <pattern>minimal_base</pattern>
       <pattern>x11</pattern>

diff --git a/data/autoyast_sle15/create_hdd/create_hdd_multipath_lvm_encrypt_textmode_ppc64le.xml b/data/autoyast_sle15/create_hdd/create_hdd_multipath_lvm_encrypt_textmode_ppc64le.xml
@@ -367,7 +367,6 @@
     <patterns t="list">
       <pattern>apparmor</pattern>
       <pattern>base</pattern>
-      <pattern>basic_desktop</pattern>
       <pattern>enhanced_base</pattern>
       <pattern>minimal_base</pattern>
       <pattern>x11</pattern>

diff --git a/data/autoyast_sle15/create_hdd/create_hdd_multipath_lvm_encrypt_textmode_x86_64.xml b/data/autoyast_sle15/create_hdd/create_hdd_multipath_lvm_encrypt_textmode_x86_64.xml
@@ -333,7 +333,6 @@
     <patterns t="list">
       <pattern>apparmor</pattern>
       <pattern>base</pattern>
-      <pattern>basic_desktop</pattern>
       <pattern>enhanced_base</pattern>
       <pattern>minimal_base</pattern>
       <pattern>x11</pattern>

diff --git a/data/autoyast_sle15/create_hdd/create_hdd_multipath_lvm_textmode_aarch64.xml b/data/autoyast_sle15/create_hdd/create_hdd_multipath_lvm_textmode_aarch64.xml
@@ -307,7 +307,6 @@
     <patterns t="list">
       <pattern>apparmor</pattern>
       <pattern>base</pattern>
-      <pattern>basic_desktop</pattern>
       <pattern>enhanced_base</pattern>
       <pattern>minimal_base</pattern>
       <pattern>x11</pattern>

diff --git a/data/autoyast_sle15/create_hdd/create_hdd_multipath_lvm_textmode_ppc64le.xml b/data/autoyast_sle15/create_hdd/create_hdd_multipath_lvm_textmode_ppc64le.xml
@@ -353,7 +353,6 @@
     <patterns t="list">
       <pattern>apparmor</pattern>
       <pattern>base</pattern>
-      <pattern>basic_desktop</pattern>
       <pattern>enhanced_base</pattern>
       <pattern>minimal_base</pattern>
       <pattern>x11</pattern>

diff --git a/data/autoyast_sle15/create_hdd/create_hdd_multipath_lvm_textmode_x86_64.xml b/data/autoyast_sle15/create_hdd/create_hdd_multipath_lvm_textmode_x86_64.xml
@@ -319,7 +319,6 @@
     <patterns t="list">
       <pattern>apparmor</pattern>
       <pattern>base</pattern>
-      <pattern>basic_desktop</pattern>
       <pattern>enhanced_base</pattern>
       <pattern>minimal_base</pattern>
       <pattern>x11</pattern>

diff --git a/data/autoyast_sle15/create_hdd/create_hdd_multipath_textmode_aarch64.xml b/data/autoyast_sle15/create_hdd/create_hdd_multipath_textmode_aarch64.xml
@@ -248,7 +248,6 @@
     <patterns t="list">
       <pattern>apparmor</pattern>
       <pattern>base</pattern>
-      <pattern>basic_desktop</pattern>
       <pattern>enhanced_base</pattern>
       <pattern>minimal_base</pattern>
       <pattern>x11</pattern>

diff --git a/data/autoyast_sle15/create_hdd/create_hdd_multipath_textmode_ppc64le.xml b/data/autoyast_sle15/create_hdd/create_hdd_multipath_textmode_ppc64le.xml
@@ -285,7 +285,6 @@
     <patterns t="list">
       <pattern>apparmor</pattern>
       <pattern>base</pattern>
-      <pattern>basic_desktop</pattern>
       <pattern>enhanced_base</pattern>
       <pattern>minimal_base</pattern>
       <pattern>x11</pattern>

diff --git a/data/autoyast_sle15/create_hdd/create_hdd_multipath_textmode_x86_64.xml b/data/autoyast_sle15/create_hdd/create_hdd_multipath_textmode_x86_64.xml
@@ -247,7 +247,6 @@
     <patterns t="list">
       <pattern>apparmor</pattern>
       <pattern>base</pattern>
-      <pattern>basic_desktop</pattern>
       <pattern>enhanced_base</pattern>
       <pattern>minimal_base</pattern>
       <pattern>x11</pattern>

diff --git a/data/autoyast_sle15/create_hdd/create_hdd_textmode_aarch64.xml b/data/autoyast_sle15/create_hdd/create_hdd_textmode_aarch64.xml
@@ -309,7 +309,6 @@
       <pattern>apparmor</pattern>
       <pattern>base</pattern>
       <pattern>basesystem</pattern>
-      <pattern>basic_desktop</pattern>
       <pattern>enhanced_base</pattern>
       <pattern>minimal_base</pattern>
       <pattern>x11</pattern>
@@ -333,13 +332,6 @@
         <release_type>nil</release_type>
         <version>{{VERSION}}</version>
       </addon>
-      <addon t="map">
-        <arch>{{ARCH}}</arch>
-        <name>sle-module-desktop-applications</name>
-        <reg_code/>
-        <release_type>nil</release_type>
-        <version>{{VERSION}}</version>
-      </addon>
       <addon t="map">
         <arch>{{ARCH}}</arch>
         <name>sle-module-server-applications</name>

diff --git a/data/autoyast_sle15/create_hdd/create_hdd_textmode_ppc64le.xml b/data/autoyast_sle15/create_hdd/create_hdd_textmode_ppc64le.xml
@@ -340,7 +340,6 @@
     <patterns t="list">
       <pattern>apparmor</pattern>
       <pattern>base</pattern>
-      <pattern>basic_desktop</pattern>
       <pattern>enhanced_base</pattern>
       <pattern>minimal_base</pattern>
       <pattern>x11</pattern>

diff --git a/data/autoyast_sle15/create_hdd/create_hdd_textmode_s390x.xml b/data/autoyast_sle15/create_hdd/create_hdd_textmode_s390x.xml
@@ -337,7 +337,6 @@
       <package>wicked</package>
       <package>snapper</package>
       <package>sle-module-server-applications-release</package>
-      <package>sle-module-desktop-applications-release</package>
       <package>sle-module-basesystem-release</package>
       <package>openssh</package>
       <package>kexec-tools</package>
@@ -354,7 +353,6 @@
       <pattern>apparmor</pattern>
       <pattern>base</pattern>
       <pattern>basesystem</pattern>
-      <pattern>basic_desktop</pattern>
       <pattern>enhanced_base</pattern>
       <pattern>minimal_base</pattern>
       <pattern>x11</pattern>
@@ -378,13 +376,6 @@
         <release_type>nil</release_type>
         <version>{{VERSION}}</version>
       </addon>
-      <addon t="map">
-        <arch>{{ARCH}}</arch>
-        <name>sle-module-desktop-applications</name>
-        <reg_code/>
-        <release_type>nil</release_type>
-        <version>{{VERSION}}</version>
-      </addon>
       <addon t="map">
         <arch>{{ARCH}}</arch>
         <name>sle-module-server-applications</name>

diff --git a/data/autoyast_sle15/create_hdd/create_hdd_textmode_x86_64.xml b/data/autoyast_sle15/create_hdd/create_hdd_textmode_x86_64.xml
@@ -299,7 +299,6 @@
     <patterns t="list">
       <pattern>apparmor</pattern>
       <pattern>base</pattern>
-      <pattern>basic_desktop</pattern>
       <pattern>enhanced_base</pattern>
       <pattern>minimal_base</pattern>
       <pattern>x11</pattern>

diff --git a/data/autoyast_sle15/create_hdd/create_hdd_textmode_x86_64_uefi.xml b/data/autoyast_sle15/create_hdd/create_hdd_textmode_x86_64_uefi.xml
@@ -313,7 +313,6 @@
     <patterns t="list">
       <pattern>apparmor</pattern>
       <pattern>base</pattern>
-      <pattern>basic_desktop</pattern>
       <pattern>enhanced_base</pattern>
       <pattern>minimal_base</pattern>
       <pattern>x11</pattern>