[cloud] Tag imported AWS images with commit ID

The imported AMI displays its commit ID as part of the startup banner,
but there is currently no sensible way to retrieve this information
without booting the image.

Add a "commit" tag to hold the commit ID from which an imported AMI
was built, to allow automated tests to unambiguously identify the
commit being tested.

Signed-off-by: Michael Brown <mcb30@ipxe.org>

.github/workflows/aws-import.yml

@@ -96,6 +96,7 @@ jobs:
               --retain ${{ env.retain }} \
               --wiki ${{ env.amilist }} \
               --bucket ${{ env.bucket }} \
+              --commit ${{ github.sha }} \
               ${{ env.family }} \
               ${{ env.binaries }}
 

contrib/cloud/aws-import

@@ -75,8 +75,8 @@ def delete_images(region, filters, retain):
         resource.Snapshot(snapshot_id).delete()
 
 
-def import_image(region, name, family, architecture, image, public, overwrite,
-                 retain):
+def import_image(region, name, family, commit, architecture, image, public,
+                 overwrite, retain):
     """Import an AMI image"""
     client = boto3.client('ec2', region_name=region)
     resource = boto3.resource('ec2', region_name=region)
@@ -85,6 +85,8 @@ def import_image(region, name, family, architecture, image, public, overwrite,
         {'Key': 'family', 'Value': family},
         {'Key': 'architecture', 'Value': architecture},
     ]
+    if commit:
+        tags.append({'Key': 'commit', 'Value': commit})
     if overwrite:
         filters = [{'Name': 'name', 'Values': [description]}]
         delete_images(region=region, filters=filters, retain=0)
@@ -152,6 +154,7 @@ parser.add_argument('--retain', type=int, metavar='NUM',
                     help="Retain at most <NUM> old images")
 parser.add_argument('--region', '-r', action='append',
                     help="AWS region(s)")
+parser.add_argument('--commit', '-c', help="Commit ID")
 parser.add_argument('--wiki', '-w', metavar='FILE',
                     help="Generate Dokuwiki table")
 parser.add_argument('--bucket', '-b',
@@ -182,6 +185,7 @@ with ThreadPoolExecutor(max_workers=len(imports)) as executor:
                                region=region,
                                name=args.name,
                                family=args.family,
+                               commit=args.commit,
                                architecture=architectures[image],
                                image=image,
                                public=args.public,