ore/aws/upload: add winli option back to ore

Creating the winli image without uploading anything means that we
dont discover the disk size from the upload file leading to a mismatch
between the default (8) and the actual disk size (16).

Restoring the winli option to ore allows us to override the rule and
specify uploadisksize with uploadsourcesnapshot when winli is set. This
enables disk size discover and AMI creation based on a snapshot without
uploading anything.

This will require a change to the cloud-upload job to buildfetch the
vmdk file before creating the AMI.

Author: marmijo

mantle/cmd/ore/aws/upload.go

@@ -68,6 +68,7 @@ After a successful run, the final line of output will be a line of JSON describi
 	uploadVolumeType         string
 	uploadX86BootMode        string
 	uploadBillingProductCode string
+	uploadCreateWinLIAMI     bool
 )
 
 func init() {
@@ -93,6 +94,8 @@ func init() {
 	cmdUpload.Flags().StringVar(&uploadVolumeType, "volume-type", "gp3", "EBS volume type (gp3, gp2, io1, st1, sc1, standard, etc.)")
 	cmdUpload.Flags().StringVar(&uploadX86BootMode, "x86-boot-mode", "uefi-preferred", "Set boot mode (uefi-preferred, uefi)")
 	cmdUpload.Flags().StringVar(&uploadBillingProductCode, "billing-product-code", "", "set billing product code")
+	cmdUpload.Flags().BoolVar(&uploadCreateWinLIAMI, "winli", false, "Create a Windows LI AMI")
+
 }
 
 func defaultBucketNameForRegion(region string) string {
@@ -140,9 +143,14 @@ func runUpload(cmd *cobra.Command, args []string) error {
 		fmt.Fprintf(os.Stderr, "At most one of --source-object and --source-snapshot may be specified.\n")
 		os.Exit(2)
 	}
-	if uploadDiskSizeInspect && (uploadSourceObject != "" || uploadSourceSnapshot != "") {
-		fmt.Fprintf(os.Stderr, "--disk-size-inspect cannot be used with --source-object or --source-snapshot.\n")
-		os.Exit(2)
+	// The Windows License Included (winli) image is built using a source snapshot, but the disk size is not known.
+	// Allow setting uploadDIskSIzeInspect when using a source snapshot to discover the size of the disk from the
+	// aws upload file that was used to create the snapshot.
+	if !uploadCreateWinLIAMI {
+		if uploadDiskSizeInspect && (uploadSourceObject != "" || uploadSourceSnapshot != "") {
+			fmt.Fprintf(os.Stderr, "--disk-size-inspect cannot be used with --source-object or --source-snapshot.\n")
+			os.Exit(2)
+		}
 	}
 	if uploadFile == "" {
 		fmt.Fprintf(os.Stderr, "specify --file\n")

src/cosalib/aws.py

@@ -138,6 +138,10 @@ def aws_run_ore(build, args):
     assert bool(args.winli) == bool(args.winli_billing_product), \
         "--winli-billing-product and --winli must be specified together"
 
+    winli_name = ""
+    winli_description = ""
+    buildmeta_key = "amis"
+
     if args.winli:
         winli_name = "-winli"
         winli_description = " Windows License Included"
@@ -153,16 +157,10 @@ def aws_run_ore(build, args):
             raise Exception(("Unable to find AMI source snapshot for "
                             f"{region} region"))
         ore_args.extend([
+            '--winli',
             '--source-snapshot', f"{source_snapshot}",
             '--billing-product-code', f"{args.winli_billing_product}"
         ])
-    else:
-        ore_args.extend([
-            '--disk-size-inspect'
-        ])
-        winli_name = ""
-        winli_description = ""
-        buildmeta_key = "amis"
 
     if args.bucket:
         ore_args.extend(['--bucket', f"{args.bucket}"])
@@ -174,6 +172,7 @@ def aws_run_ore(build, args):
         '--ami-description', f"{build.summary} {build.build_id} {build.basearch}{winli_description}",
         '--arch', f"{build.basearch}",
         '--file', f"{build.image_path}",
+        '--disk-size-inspect',
         '--delete-object'
     ])
     for user in args.grant_user: