Merge ~sespiros/ubuntu-qa-tools/+git/ubuntu-qa-tools:uvt-improvements into ubuntu-qa-tools:master

[Spyros Seimenis]

Simple test (commands below not working as it is):

uvt new trusty amd64 test
uvt new impish amd64 test
uvt new xenial i386 test

7eb9b63... by Spyros Seimenis on 2021-10-04

Fix to support custom SSH keys

48fdd19... by Spyros Seimenis on 2021-10-04

Fix to support custom SSH keys (backwards compatible)

[Alex Murray (alexmurray)]

To maintain backwards compatibility, it would be better to keep vm_ssh_key pointing to the public key and then just drop the .pub suffix from this to get the private key IMO - then we won't break existing configs that use vm_ssh_key.

review: Needs Fixing

f179fb5... by Spyros Seimenis on 2021-10-11

Revert "Fix to support custom SSH keys"

This reverts commit 7eb9b63186b1c9f45ca067de3bc82580d1d1d586.

[Spyros Seimenis (sespiros)]

Thanks for the review Alex. I reverted my last commit and added a change which should maintain backwards compatibility.

[Steve Beattie (sbeattie)]

See inline comments.

[Spyros Seimenis (sespiros)]

Thanks for taking the time to review the changes and the suggestions. I replied inline.

[Steve Beattie (sbeattie)]

On Wed, Oct 13, 2021 at 03:13:08PM -0000, Marc Deslauriers wrote:
>
> The dev release isos rarely work, it might not make sense for you to
> deploy the dev release with the ansible script, or it will likely fail
> more often than not.

Hrm, that has not been my experience, but then I am sporadic about
creating devel release vms and once created, just continually
update it. So it's possible I've gotten lucky with them.

--
Steve Beattie
<email address hidden>

Unmerged commits

48fdd19... by Spyros Seimenis on 2021-10-04

Fix to support custom SSH keys (backwards compatible)

f179fb5... by Spyros Seimenis on 2021-10-11

Revert "Fix to support custom SSH keys"

This reverts commit 7eb9b63186b1c9f45ca067de3bc82580d1d1d586.

7eb9b63... by Spyros Seimenis on 2021-10-04

Fix to support custom SSH keys

ab5c3ba... by Spyros Seimenis on 2021-10-01

Fix case for unavailable server iso for xenial i386

94293d7... by Spyros Seimenis on 2021-10-01

Add functionality to detect and download devel

74ca745... by Spyros Seimenis on 2021-09-30

Modify regex that picks the latest version

Current implementation fails to pick up the latest version
for trusty because it is not in a new line in the webpage.

diff --git a/vm-tools/uvt b/vm-tools/uvt
index 233ee46..c06b93a 100755
--- a/vm-tools/uvt
+++ b/vm-tools/uvt
@@ -1410,6 +1410,8 @@ def vm_run_command(vm_name, command, root=False, start=False,
         return False
 
     ssh_command = ['ssh']
+    ssh_command += ['-i', uvt_conf['vm_ssh_key'].rsplit('.', 1)[0]]
+
     if verbose:
         ssh_command += ['-vvv']
     if root:
@@ -2832,6 +2834,12 @@ def download_release_iso(release, release_num, arch, iso_type):
     latest_release = find_latest_release(release_num, iso_type)
 
     release_iso="ubuntu-%s-%s-%s.iso" % (latest_release, iso_type, arch)
+    latest_release = latest_release.split('-')[0]
+
+    if latest_release == "16.04.7" and arch == "i386":
+        print("WARNING: iso not available for i386 on 16.04.7.")
+        print("Falling back to 16.04.6.\n")
+        release_iso="ubuntu-%s-%s-%s.iso" % ("16.04.6", iso_type, arch)
 
     if iso_type in ['mini', 'mini-desktop']:
         url="http://archive.ubuntu.com/ubuntu/dists/%s/main/installer-%s/current/images/netboot/mini.iso" % (release, arch)
@@ -2908,12 +2916,19 @@ def find_latest_release(release_num, iso_type):
 
     text = re.compile(r'<[^>]+>').sub('', html).split('\n')
     matches = []
+    beta = False;
     for line in text:
         if line.startswith(' ' + release_num):
-            matches.append(line[0:].split('/')[0][1:])
+            matches.append(re.search(r'\d+\.\d+(\.\d+)? ', line).group().strip())
+            if 'Beta' in line:
+                beta = True;
 
     if len(matches) > 0:
         latest_release = sorted(matches)[-1]
+
+        if beta:
+            latest_release +='-beta'
+
         print("Found release %s" % latest_release)
         return latest_release