Merge ~raharper/curtin:fix/multiple-carry-over-param-separators into curtin:master

[Ryan Harper]

Handle multiple separators which were found in TestAllindata vmtest

TestAllindata specifies additional kernel args and include the '---'
separator. vmtest baseclass already includes a '---' and after
landing of the grub refactor, the python version of the
get_carryover_params did not handle the additional '---'.
Fix this by combining any args after the first '---' separator.

[Server Team CI bot (server-team-bot)]

PASSED: Continuous integration, rev:beafd4b0f34d6e3f56e26a11cc85594d7fa290f5
https://jenkins.ubuntu.com/server/job/curtin-ci/123/
Executed test runs:
    SUCCESS: https://jenkins.ubuntu.com/server/job/curtin-ci/nodes=metal-amd64/123/
    SUCCESS: https://jenkins.ubuntu.com/server/job/curtin-ci/nodes=metal-arm64/123/
    SUCCESS: https://jenkins.ubuntu.com/server/job/curtin-ci/nodes=metal-ppc64el/123/
    SUCCESS: https://jenkins.ubuntu.com/server/job/curtin-ci/nodes=metal-s390x/123/

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/server/job/curtin-ci/123//rebuild

review: Approve (continuous-integration)

[Dan Watkins (oddbloke)]

LGTM, thanks!

review: Approve

[Server Team CI bot (server-team-bot)]

Commit message lints:
- Line #3 has 3 too many characters. Line starts with: "separator. vmtest baseclass"...- Line #4 has 1 too many characters. Line starts with: "grub refactor, the python"...- Line #5 has 1 too many characters. Line starts with: "the additional '---'."...

review: Needs Fixing

[Server Team CI bot (server-team-bot)]

review: Approve (continuous-integration)

diff --git a/curtin/commands/install_grub.py b/curtin/commands/install_grub.py
index 11ffd55..777aa35 100644
--- a/curtin/commands/install_grub.py
+++ b/curtin/commands/install_grub.py
@@ -119,14 +119,19 @@ def get_carryover_params(distroinfo):
     def wrap(sep):
         return ' ' + sep + ' '
 
+    sections = []
     if wrap(preferred_sep) in cmdline:
-        lead, extra = cmdline.split(wrap(preferred_sep))
+        sections = cmdline.split(wrap(preferred_sep))
     elif wrap(legacy_sep) in cmdline:
-        lead, extra = cmdline.split(wrap(legacy_sep))
+        sections = cmdline.split(wrap(legacy_sep))
     else:
         extra = ""
         lead = cmdline
 
+    if sections:
+        lead = sections[0]
+        extra = " ".join(sections[1:])
+
     carry_extra = []
     if extra:
         for tok in extra.split():
diff --git a/tests/unittests/test_commands_install_grub.py b/tests/unittests/test_commands_install_grub.py
index 1d0c43f..8808159 100644
--- a/tests/unittests/test_commands_install_grub.py
+++ b/tests/unittests/test_commands_install_grub.py
@@ -181,7 +181,7 @@ class TestGetCarryoverParams(CiTestCase):
         self.m_load_file.return_value = cmdline
         self.assertEqual([], install_grub.get_carryover_params(distroinfo))
 
-    def test_legacy_seporator(self):
+    def test_legacy_separator(self):
         distroinfo = install_grub.distro.get_distroinfo()
         sep = '--'
         expected_carry_params = ['foo=bar', 'debug=1']
@@ -191,7 +191,7 @@ class TestGetCarryoverParams(CiTestCase):
         self.assertEqual(expected_carry_params,
                          install_grub.get_carryover_params(distroinfo))
 
-    def test_preferred_seporator(self):
+    def test_preferred_separator(self):
         distroinfo = install_grub.distro.get_distroinfo()
         sep = '---'
         expected_carry_params = ['foo=bar', 'debug=1']
@@ -201,6 +201,15 @@ class TestGetCarryoverParams(CiTestCase):
         self.assertEqual(expected_carry_params,
                          install_grub.get_carryover_params(distroinfo))
 
+    def test_multiple_preferred_separator(self):
+        distroinfo = install_grub.distro.get_distroinfo()
+        sep = '---'
+        expected_carry_params = ['extra', 'additional']
+        cmdline = "lead=args %s extra %s additional" % (sep, sep)
+        self.m_load_file.return_value = cmdline
+        self.assertEqual(expected_carry_params,
+                         install_grub.get_carryover_params(distroinfo))
+
     def test_drop_bootif_initrd_boot_image_from_extra(self):
         distroinfo = install_grub.distro.get_distroinfo()
         sep = '---'