pungi-fedora

Clone

#498 [WIP] rename atomic* variants
Merged 6 years ago by ausil. Opened 6 years ago by dustymabe.
dustymabe/pungi-fedora dusty-rawhide  into  master

file modified
+6 -6 
@@ -261,7 +261,8 @@ 
 

                   'Beta': 'B',
 

                'Rawhide': 'rawh',
 

          'Astronomy_KDE': 'AstK',
 

-                'Atomic': 'AH',
 

+            'AtomicHost': 'AH',
 

+     'AtomicWorkstation': 'AW',
 

               'Cinnamon': 'Cinn',
 

                  'Cloud': 'C',
 

           'Design_suite': 'Dsgn',
 
@@ -279,7 +280,6 @@ 
 

               'Security': 'Sec',
 

                 'Server': 'S',
 

          '-Workstation-': '-WS-',
 

-     'WorkstationOstree': 'WS',
 

  }
 

  

  disc_types = {
 
@@ -729,7 +729,7 @@ 
 

  ]
 

  

  ostree = [
 

-     ("^Atomic$", {
 

+     ("^AtomicHost$", {
 

          "aarch64": {
 

              "version": '!OSTREE_VERSION_FROM_LABEL_DATE_TYPE_RESPIN',
 

              "treefile": "fedora-atomic-host.json",
 
@@ -758,7 +758,7 @@ 
 

              'failable': ['*'],
 

          }
 

      }),
 

-     ("^ostree$", {
 

+     ("^AtomicWorkstation$", {
 

          "x86_64": {
 

              "version": "!OSTREE_VERSION_FROM_LABEL_DATE_TYPE_RESPIN",
 

              "treefile": "fedora-ostree-workstation.json",
 
@@ -772,7 +772,7 @@ 
 

  ]
 

  

  ostree_installer = [
 

-     ("^Atomic$", {
 

+     ("^AtomicHost$", {
 

          "x86_64": {
 

              "repo": "Everything",
 

              "release": None,
 
@@ -825,7 +825,7 @@ 
 

              'failable': ['*'],
 

          }
 

      }),
 

-     ("^WorkstationOstree$", {
 

+     ("^AtomicWorkstation$", {
 

          "x86_64": {
 

              "repo": "Everything",
 

              "release": None,

file modified
+9 -9 
@@ -117,13 +117,13 @@ 
 

  fi
 

  $RSYNCPREFIX compose-partial-copy --arch=armhfp --arch=x86_64 --arch src \
 

      "$DESTDIR" "$RSYNCTARGET/" \
 

-     --variant Everything --variant Atomic --variant CloudImages --variant Container \
 

-     --variant Server --variant Spins --variant Workstation --variant Modular \
 

+     --variant Everything --variant AtomicHost --variant CloudImages --variant Container \
 

+     --variant Server --variant Spins --variant Workstation --variant AtomicWorkstation --variant Modular \
 

      --link-dest="$RSYNCTARGET/Everything" --exclude=repodata
 

  $RSYNCPREFIX compose-partial-copy --arch=armhfp --arch=x86_64 --arch src \
 

      "$DESTDIR" "$RSYNCTARGET/" \
 

-     --variant Everything --variant Atomic --variant CloudImages --variant Container \
 

-     --variant Server --variant Spins --variant Workstation --variant Modular \
 

+     --variant Everything --variant AtomicHost --variant CloudImages --variant Container \
 

+     --variant Server --variant Spins --variant Workstation --variant AtomicWorkstation --variant Modular \
 

      --link-dest="$RSYNCTARGET/Everything" --delete-after
 

  # aarch64 for Server and Everything is primary
 

  $RSYNCPREFIX compose-partial-copy --arch=aarch64 \
 
@@ -164,24 +164,24 @@ 
 

  $RSYNCPREFIX compose-partial-copy --arch=i386 --arch=ppc64 --arch=ppc64le --arch=s390x \
 

      "$DESTDIR" "$RSYNCSECTARGET/" \
 

      --link-dest="$RSYNCTARGET/Everything/" --delete-after
 

- # aarch64 is alternative for Atomic Labs Spins Workstation
 

+ # aarch64 is alternative for AtomicHost Labs Spins Workstation
 

  $RSYNCPREFIX compose-partial-copy --arch=i386 --arch=ppc64 --arch=ppc64le --arch=s390x \
 

      "$DESTDIR" "$RSYNCSECTARGET/" \
 

-     --variant Atomic --variant Cloud --variant CloudImages --variant Container \
 

+     --variant AtomicHost --variant Cloud --variant CloudImages --variant Container \
 

      --variant Labs --variant Spins --variant Workstation --variant Modular \
 

      --link-dest="$RSYNCTARGET/Everything/" --exclude=repodata
 

  $RSYNCPREFIX compose-partial-copy --arch=i386 --arch=ppc64 --arch=ppc64le --arch=s390x \
 

      "$DESTDIR" "$RSYNCSECTARGET/" \
 

-     --variant Atomic --variant Cloud --variant CloudImages --variant Container \
 

+     --variant AtomicHost --variant Cloud --variant CloudImages --variant Container \
 

      --variant Labs --variant Spins --variant Workstation --variant Modular \
 

      --link-dest="$RSYNCTARGET/Everything/" --delete-after
 

  $RSYNCPREFIX compose-partial-copy --arch=aarch64 \
 

      "$DESTDIR" "$RSYNCSECTARGET/" \
 

-     --variant Atomic --variant Cloud --variant Labs --variant Spins --variant Workstation \
 

+     --variant AtomicHost --variant Cloud --variant Labs --variant Spins --variant Workstation \
 

      --link-dest="$RSYNCTARGET/Everything/" --exclude=repodata
 

  $RSYNCPREFIX compose-partial-copy --arch=aarch64 \
 

      "$DESTDIR" "$RSYNCSECTARGET/" \
 

-     --variant Atomic --variant Cloud --variant Labs --variant Spins --variant Workstation \
 

+     --variant AtomicHost --variant Cloud --variant Labs --variant Spins --variant Workstation \
 

      --link-dest="$RSYNCTARGET/Everything/" --delete-after
 

  $RSYNCPREFIX rm "$RSYNCSECTARGET/.composeinfo"
 

  $RSYNCPREFIX ./releng/scripts/build_composeinfo "$RSYNCSECTARGET/" --name "$NEWCOMPOSE_ID"

file modified
+2 -7 
@@ -1,7 +1,7 @@ 
 

  <?xml version="1.0" encoding="UTF-8"?>
 

  <!DOCTYPE variants PUBLIC "-//Red Hat, Inc.//DTD Variants info//EN" "variants2012.dtd">
 

  <variants>
 

-     <variant id="Atomic" name="Atomic" type="variant" is_empty="true">
 

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

          <arches>
 

              <arch>aarch64</arch>
 

              <arch>x86_64</arch>
 
@@ -46,11 +46,6 @@ 
 

              <arch>x86_64</arch>
 

          </arches>
 

      </variant>
 

-     <variant id="ostree" name="ostree" type="variant" is_empty="true">
 

-         <arches>
 

-             <arch>x86_64</arch>
 

-         </arches>
 

-     </variant>
 

      <variant id="Server" name="Server" type="variant">
 

          <arches>
 

              <arch>armhfp</arch>
 
@@ -131,7 +126,7 @@ 
 

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

          </environments>
 

      </variant>
 

-     <variant id="WorkstationOstree" name="Workstation Ostree" type="variant" is_empty="true">
 

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

          <arches>
 

              <arch>aarch64</arch>
 

              <arch>armhfp</arch>

Move Atomic to AtomicHost and WorkstationOstree to
AtomicWorkstation. This is mostly to make things align
more with the names of the things we actually put out.

This is mostly for discussion for right now. I want to talk about this change. A few questions:

  • Is everyone OK with these changes, will they cause problems anywhere?
  • We could use AtomicHost/AtomicWorkstation or Atomic_Host/Atomic_Workstation. Any preferences?

Note that this change will only affect rawhide/f28+. I'm not proposing we change f27.

@adamw @mohanboddu @ausil @walters @lsedlar - I'd appreciate your input on this change.

I'm fine with the new naming. Thanks for doing this!

I'm fine with either AtomicWorkstation or Atomic_Workstation style, I would object with sharp pointy objects to Atomic-Workstation style :)

Do I understand correctly that this change would result in all of these changing consistently: the filename, the volume ID, and the subvariant in the metadata? That's fine (in fact best) if so, I just want to make sure.

(note: I'm assuming whoever it is who's in charge of deciding what 'Atomic' means these days has signed off on this. I have more or less given up on trying to keep track of that.)

 
                  I'm fine with either AtomicWorkstation or Atomic_Workstation style, I would object with sharp pointy objects to Atomic-Workstation style :)

:)

Do I understand correctly that this change would result in all of these changing consistently: the filename, the volume ID, and the subvariant in the metadata? That's fine (in fact best) if so, I just want to make sure.

I think so!?? That's part of why I tried to pull so many people in to review (including you :smiley:)

(note: I'm assuming whoever it is who's in charge of deciding what 'Atomic' means these days has signed off on this. I have more or less given up on trying to keep track of that.)

I'm pretty sure it is officially Atomic Workstation now.

I'll...look into the subvariant stuff, in fact. I'm a bit unsure about that, given that at least according to fedfind, the current subvariant name is Workstation Ostree (note the space). I'm going to have to find some composes where it actually existed and figure out what's going on, I think.

Also, thinking about it, if these images are in the two-week Atomic nightly composes, we would have to decide whether we want to make this change there too - I think those are built using the respective release branches, not master.

Note that this change will only affect rawhide/f28+. I'm not proposing we change f27.

The plan is to only change rawhide/f28+. so for f28 we would make that change there too

Ah, in fact, I think I see it:

[adamw@xps13k pungi-fedora (master)]$ grep -R -i "workstation ostree" *
variants-fedora.xml:    <variant id="WorkstationOstree" name="Workstation Ostree" type="variant" is_empty="true">

You'd probably want to change that line too. And the line for Atomic in that file.
Edited 6 years ago by adamwill

rebased onto bada357ca6dfcfd6604bd5adeb4ffe186a446319
6 years ago

You'd probably want to change that line too. And the line for Atomic in that file.

done! thanks!

Another place to look at: https://pagure.io/workstation-ostree-config (the repo itself, and things like the 'pretty name' in https://pagure.io/workstation-ostree-config/blob/master/f/config.ini )

While we're changing this, maybe just drop the spaces from the 'name's in variants-fedora.xml? I don't see any particularly convincing reason to have them, and these are the only two cases where the variant ID and name do not match (there is another camel-case one, CloudImages, and we do not put a space in the name there).

Pungi should be fine with this. The name change should be fine from configuration point of view.

The nightly.sh script will have to be updated, in a few places it uses the Atomic name.

Given that the old ostree variant is not used after this patch (I think), it could be removed from the XML file.

@dustymabe should we get together with the releng folks to discuss this while we're all in the same place?

@adamwill
While we're changing this, maybe just drop the spaces from the 'name's in variants-fedora.xml?

done

@lsedlar
The nightly.sh script will have to be updated, in a few places it uses the Atomic name.

updated

@lsedlar
Given that the old ostree variant is not used after this patch (I think), it could be removed from the XML file.

done

rebased onto 013f90f474482e992991c66e61f16eb0992c9899
6 years ago

@dustymabe Is there a reason why AtomicWorkstation is getting synced?

@dustymabe Is there a reason why AtomicWorkstation is getting synced?

do you mean "is not getting synced" ? I don't think the WorkstationOstree stuff was in the syncing before.. should it have been?

rebased onto 42f90b2
6 years ago

@dustymabe that it was not synced was an oversight. we should sync the AtomicWorkstation media

1 new commit added

  • sync AtomicWorkstation media
6 years ago

@ausil ^^ can you check the added commit to see if it properly adds syncing for atomicworkstation?

2 new commits added

  • sync AtomicWorkstation media
  • rename atomic* variants
6 years ago

Pull-Request has been merged by ausil
6 years ago
Metadata
None
No Tags
Changes Summary 3
+6 -6
file changed
fedora.conf
+9 -9
file changed
nightly.sh
+2 -7
file changed
variants-fedora.xml
Powered by Pagure 5.13.3
Documentation • File an Issue • About • SSH Hostkey/Fingerprint
© Red Hat, Inc. and others.