Only quote [template variables]ROSE_ORIG_HOST

Co-authored-by: Tomek Trzeciak <TomekTrzeciak@users.noreply.github.com>

Author: wxtim

cylc/rose/utilities.py

@@ -938,7 +938,10 @@ def record_cylc_install_options(
     rose_orig_host = get_host()
     for section in list(SECTIONS) + ['env']:
         if section in cli_config:
-            cli_config[section].set(['ROSE_ORIG_HOST'], f'"{rose_orig_host}"')
+            cli_config[section].set(
+                ['ROSE_ORIG_HOST'],
+                f'"{rose_orig_host}"' if section in SECTIONS else rose_orig_host
+            )
             cli_config[section]['ROSE_ORIG_HOST'].comments = [
                 ROSE_ORIG_HOST_INSTALLED_OVERRIDE_STRING
             ]

tests/functional/test_post_install.py

@@ -115,7 +115,7 @@ def test_rose_fileinstall_uses_rose_template_vars(tmp_path):
                     f'ROSE_ORIG_HOST="{HOST}"\n'
                     f'\n[env]\n'
                     f'#{ROSE_ORIG_HOST_INSTALLED_OVERRIDE_STRING}\n'
-                    f'ROSE_ORIG_HOST="{HOST}"\n'
+                    f'ROSE_ORIG_HOST={HOST}\n'
                 ),
                 'ref/rose-suite.conf': '!opts=foo (cylc-install)',
                 'ref/opt/rose-suite-foo.conf': '',
@@ -145,7 +145,7 @@ def test_rose_fileinstall_uses_rose_template_vars(tmp_path):
                 'ref/opt/rose-suite-cylc-install.conf':
                     f'!opts=bar baz\n[env]\nBAR=2\n'
                     f'#{ROSE_ORIG_HOST_INSTALLED_OVERRIDE_STRING}\n'
-                    f'ROSE_ORIG_HOST="{HOST}"\n'
+                    f'ROSE_ORIG_HOST={HOST}\n'
                     f'\n[template variables]\n'
                     f'#{ROSE_ORIG_HOST_INSTALLED_OVERRIDE_STRING}\n'
                     f'ROSE_ORIG_HOST="{HOST}"\n',
@@ -174,7 +174,7 @@ def test_rose_fileinstall_uses_rose_template_vars(tmp_path):
                 'ref/opt/rose-suite-cylc-install.conf': (
                     f'!opts=b c\n\n[env]\n'
                     f'#{ROSE_ORIG_HOST_INSTALLED_OVERRIDE_STRING}\n'
-                    f'ROSE_ORIG_HOST="{HOST}"\n'
+                    f'ROSE_ORIG_HOST={HOST}\n'
                     f'\n[template variables]\n'
                     f'#{ROSE_ORIG_HOST_INSTALLED_OVERRIDE_STRING}\n'
                     f'ROSE_ORIG_HOST="{HOST}"\n'
@@ -204,7 +204,7 @@ def test_rose_fileinstall_uses_rose_template_vars(tmp_path):
                 'ref/opt/rose-suite-cylc-install.conf': (
                     f'!opts=foo bar\n[env]\na=b\n'
                     f'#{ROSE_ORIG_HOST_INSTALLED_OVERRIDE_STRING}\n'
-                    f'ROSE_ORIG_HOST="{HOST}"\n'
+                    f'ROSE_ORIG_HOST={HOST}\n'
                     f'[jinja2:suite.rc]\na="b"\n'
                     f'#{ROSE_ORIG_HOST_INSTALLED_OVERRIDE_STRING}\n'
                     f'ROSE_ORIG_HOST="{HOST}"\n'

tests/functional/test_reinstall.py

@@ -125,7 +125,7 @@ async def test_cylc_validate(fixture_provide_flow, cylc_validate_cli):
             'opt/rose-suite-cylc-install.conf', (
                 '# This file records CLI Options.{version_info}\n'
                 '!opts=b c\n'
-                f'\n[env]\n#{ROHIOS}\nROSE_ORIG_HOST="{HOST}"\n'
+                f'\n[env]\n#{ROHIOS}\nROSE_ORIG_HOST={HOST}\n'
                 f'\n[template variables]\n#{ROHIOS}\nROSE_ORIG_HOST="{HOST}"\n'
             )
         )
@@ -151,7 +151,7 @@ def test_cylc_install_files(fixture_install_flow, file_, expect, version_info):
             'opt/rose-suite-cylc-install.conf', (
                 '# This file records CLI Options.{version_info}\n'
                 '!opts=b c d\n'
-                f'\n[env]\n#{ROHIOS}\nROSE_ORIG_HOST="{HOST}"\n'
+                f'\n[env]\n#{ROHIOS}\nROSE_ORIG_HOST={HOST}\n'
                 f'\n[template variables]\n#{ROHIOS}\nROSE_ORIG_HOST="{HOST}"\n'
             )
         )
@@ -194,7 +194,7 @@ async def test_cylc_reinstall_files(
             'opt/rose-suite-cylc-install.conf', (
                 '# This file records CLI Options.{version_info}\n'
                 '!opts=b c d\n'
-                f'\n[env]\n#{ROHIOS}\nROSE_ORIG_HOST="{HOST}"\n'
+                f'\n[env]\n#{ROHIOS}\nROSE_ORIG_HOST={HOST}\n'
                 f'\n[template variables]\n#{ROHIOS}\nROSE_ORIG_HOST="{HOST}"\n'
             )
         )

tests/functional/test_reinstall_clean.py

@@ -109,7 +109,7 @@ async def fixture_install_flow(
                 '!opts=bar\n\n'
                 '[env]\n'
                 f'FOO=1\n#{ROHIOS}\n'
-                f'ROSE_ORIG_HOST="{HOST}"\n'
+                f'ROSE_ORIG_HOST={HOST}\n'
                 f'\n[template variables]\n#{ROHIOS}'
                 f'\nROSE_ORIG_HOST="{HOST}"\n'
             )
@@ -131,7 +131,7 @@ def test_cylc_install_files(fixture_install_flow, file_, expect, version_info):
                 '!opts=baz\n\n'
                 '[env]\n'
                 f'BAR=2\n#{ROHIOS}\n'
-                f'ROSE_ORIG_HOST="{HOST}"\n'
+                f'ROSE_ORIG_HOST={HOST}\n'
                 f'\n[template variables]\n#{ROHIOS}'
                 f'\nROSE_ORIG_HOST="{HOST}"\n'
             )

tests/unit/test_fileinstall.py

@@ -109,7 +109,7 @@ def test_rose_fileinstall_rose_suite_cylc_install_conf(
         "[env]\n"
         "FOO=42\n"
         f"#{ROSE_ORIG_HOST_INSTALLED_OVERRIDE_STRING}\n"
-        f'ROSE_ORIG_HOST="{host}"\n\n'
+        f'ROSE_ORIG_HOST={host}\n\n'
         "[jinja2:suite.rc]\n"
         "BAR=84\n"
         "CORNETTO=120\n"