#743 stop building Workstation repo
Merged 4 years ago by kevin. Opened 4 years ago by dustymabe.
dustymabe/pungi-fedora dusty  into  master

file modified
+3 -14
@@ -124,7 +124,7 @@ 

  

  # fomat: [(variant_uid_regex, {arch|*: [packages]})]

  additional_packages = [

-     ('^(Workstation|Server|Everything)$', {

+     ('^(Server|Everything)$', {

          '*': [

              'kernel*',

              'dracut*',
@@ -152,12 +152,6 @@ 

          ],

      }),

  

-     ('^Workstation$', {

-         '*': [

- 

-         ],

-     }),

- 

  ]

  

  multilib = [
@@ -168,7 +162,7 @@ 

  

  filter_packages = [

      ("^.*$", {"*": ["glibc32", "libgcc32"]}),

-     ('(Workstation|Server)$', {

+     ('(Server)$', {

          '*': [

          'kernel*debug*',

          'kernel-kdump*',
@@ -214,11 +208,6 @@ 

  }

  

  createiso_skip = [

-         ('^Workstation$', {

-             '*': True,

-             'src': True

-         }),

- 

          ('^Server$', {

              'src': True

          }),
@@ -237,7 +226,7 @@ 

  

  # fomat: [(variant_uid_regex, {arch|*: [scm_dicts]})]

  #extra_files = [

- #    ('^(Server|Workstation)$', {

+ #    ('^(Server)$', {

  #        '*': [

  #            {

  #                'scm': 'rpm',

file modified
+1 -25
@@ -70,36 +70,12 @@ 

              <arch>x86_64</arch>

          </arches>

      </variant>

-     <variant id="Workstation" name="Workstation" type="variant">

+     <variant id="Workstation" name="Workstation" type="variant" is_empty="true">

          <arches>

              <arch>aarch64</arch>

              <arch>armhfp</arch>

              <arch>x86_64</arch>

          </arches>

-         <groups>

-             <group default="true">base-x</group>

-             <group default="true">container-management</group>

-             <group default="true">core</group>

-             <group default="true">firefox</group>

-             <group default="true">fonts</group>

-             <group default="true">gnome-desktop</group>

-             <group default="true">guest-desktop-agents</group>

-             <group default="true">hardware-support</group>

-             <group default="true">libreoffice</group>

-             <group default="true">multimedia</group>

-             <group default="true">networkmanager-submodules</group>

-             <group default="true">printing</group>

-             <group default="true">workstation-ostree-support</group>

-             <group default="true">workstation-product</group>

-             <group default="true">virtualization</group>

-             <group default="true">arm-tools</group>

-             <!-- Things needed for installation -->

-             <group default="true">anaconda-tools</group>

-             <group default="true">platform-vmware</group>

-         </groups>

-         <environments>

-           <environment display_order="10">workstation-product-environment</environment>

-         </environments>

      </variant>

      <variant id="Silverblue" name="Silverblue" type="variant" is_empty="true">

          <arches>

Similar to what we did for Cloud (6eecb53) we need to stop building
Workstation repos so we can speed up our compose times (see [1]).
We already switched to sourcing from the Everything repo (39683dd).
Now we just need to stop building the repo. This commit makes it so
that we will no longer build the yum repo for Workstation.

[1] https://pagure.io/releng/issue/7403

Looks good to me. Syntax wise I see no problems. Validation scripts also don't find any issues.

Pull-Request has been merged by kevin

4 years ago
Metadata