From 42f90b2e420189154abadf883a13d088da33af24 Mon Sep 17 00:00:00 2001
From: Dusty Mabe <dusty@dustymabe.com>
Date: Mar 02 2018 20:13:45 +0000
Subject: rename atomic* variants


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.

Signed-off-by: Dusty Mabe <dusty@dustymabe.com>

---

diff --git a/fedora.conf b/fedora.conf
index 50d3451..ae1a054 100644
--- a/fedora.conf
+++ b/fedora.conf
@@ -261,7 +261,8 @@ volume_id_substitutions = {
                  'Beta': 'B',
               'Rawhide': 'rawh',
         'Astronomy_KDE': 'AstK',
-               'Atomic': 'AH',
+           'AtomicHost': 'AH',
+    'AtomicWorkstation': 'AW',
              'Cinnamon': 'Cinn',
                 'Cloud': 'C',
          'Design_suite': 'Dsgn',
@@ -279,7 +280,6 @@ volume_id_substitutions = {
              'Security': 'Sec',
                'Server': 'S',
         '-Workstation-': '-WS-',
-    'WorkstationOstree': 'WS',
 }
 
 disc_types = {
@@ -729,7 +729,7 @@ live_images = [
 ]
 
 ostree = [
-    ("^Atomic$", {
+    ("^AtomicHost$", {
         "aarch64": {
             "version": '!OSTREE_VERSION_FROM_LABEL_DATE_TYPE_RESPIN',
             "treefile": "fedora-atomic-host.json",
@@ -758,7 +758,7 @@ ostree = [
             'failable': ['*'],
         }
     }),
-    ("^ostree$", {
+    ("^AtomicWorkstation$", {
         "x86_64": {
             "version": "!OSTREE_VERSION_FROM_LABEL_DATE_TYPE_RESPIN",
             "treefile": "fedora-ostree-workstation.json",
@@ -772,7 +772,7 @@ ostree = [
 ]
 
 ostree_installer = [
-    ("^Atomic$", {
+    ("^AtomicHost$", {
         "x86_64": {
             "repo": "Everything",
             "release": None,
@@ -825,7 +825,7 @@ ostree_installer = [
             'failable': ['*'],
         }
     }),
-    ("^WorkstationOstree$", {
+    ("^AtomicWorkstation$", {
         "x86_64": {
             "repo": "Everything",
             "release": None,
diff --git a/nightly.sh b/nightly.sh
index b1db4c5..01d159e 100755
--- a/nightly.sh
+++ b/nightly.sh
@@ -117,12 +117,12 @@ if [ ! -d "$RSYNCTARGET" ]; then
 fi
 $RSYNCPREFIX compose-partial-copy --arch=armhfp --arch=x86_64 --arch src \
     "$DESTDIR" "$RSYNCTARGET/" \
-    --variant Everything --variant Atomic --variant CloudImages --variant Container \
+    --variant Everything --variant AtomicHost --variant CloudImages --variant Container \
     --variant Server --variant Spins --variant Workstation --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 Everything --variant AtomicHost --variant CloudImages --variant Container \
     --variant Server --variant Spins --variant Workstation --variant Modular \
     --link-dest="$RSYNCTARGET/Everything" --delete-after
 # aarch64 for Server and Everything is primary
@@ -164,24 +164,24 @@ $RSYNCPREFIX compose-partial-copy --arch=i386 --arch=ppc64 --arch=ppc64le --arch
 $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"
diff --git a/variants-fedora.xml b/variants-fedora.xml
index 34b06d9..5780535 100644
--- a/variants-fedora.xml
+++ b/variants-fedora.xml
@@ -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>