cosalib/aws: don't require build artifact for AWS WinLI builds

The build artifact is not needed in the AWS WIndows License Included
(WinLI) case because the image is built from an existing snapshot.
To allow individual cloud providers to override this requirement,
move the build artifact check to each provider's wrapper. Don't
perform the check in the AWS wrapper if building a winli image.

Also modify the AWS ore upload code to not require an upload file
when a source snapshot is used, which allows the WinLI image to be
built without the need for an upload file.

Author: marmijo

mantle/cmd/ore/aws/upload.go

@@ -144,8 +144,8 @@ func runUpload(cmd *cobra.Command, args []string) error {
 		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")
+	if uploadFile == "" && uploadSourceSnapshot == "" {
+		fmt.Fprintf(os.Stderr, "specify --file or --source-snapshot\n")
 		os.Exit(2)
 	}
 	if uploadImageName == "" {

src/cmd-ore-wrapper

@@ -121,8 +121,6 @@ Each target has its own sub options. To access them us:
             build.ensure_built()
 
     if args.upload:
-        if not build.have_artifact:
-            raise Exception(f"Missing build artifact {build.image_path}")
         log.info("executing upload commands for ore")
         cmd, _ = get_cloud_ore_cmds(target)
         cmd(build, args)

src/cosalib/aliyun.py

@@ -137,6 +137,9 @@ def make_public(build, args):
 
 @retry(reraise=True, stop=stop_after_attempt(3))
 def aliyun_run_ore(build, args):
+    if not build.have_artifact:
+        raise Exception(f"Missing build artifact {build.image_path}")
+
     build.refresh_meta()
     ore_args = ['ore']
     if args.log_level:

src/cosalib/aws.py

@@ -110,6 +110,11 @@ def aws_run_ore_replicate(build, args):
 
 @retry(reraise=True, stop=stop_after_attempt(3))
 def aws_run_ore(build, args):
+    # Skip the artifact check for AWS Windows License Included (WinLI) builds.
+    # The build artifact is not required for WinLI.
+    if (not build.have_artifact) and (not args.winli):
+        raise Exception(f"Missing build artifact {build.image_path}")
+
     # First add the ore command to run before any options
     ore_args = ['ore', 'aws', 'upload']
 
@@ -157,7 +162,10 @@ def aws_run_ore(build, args):
             '--billing-product-code', f"{args.winli_billing_product}"
         ])
     else:
-        ore_args.extend(['--disk-size-inspect'])
+        ore_args.extend([
+            '--disk-size-inspect',
+            '--file', f"{build.image_path}",
+        ])
         winli_name = ""
         winli_description = ""
         buildmeta_key = "amis"
@@ -171,7 +179,6 @@ def aws_run_ore(build, args):
         '--name', f"{build.build_name}{winli_name}-{build.build_id}-{build.basearch}",
         '--ami-description', f"{build.summary} {build.build_id} {build.basearch}{winli_description}",
         '--arch', f"{build.basearch}",
-        '--file', f"{build.image_path}",
         '--delete-object'
     ])
     for user in args.grant_user:

src/cosalib/azure.py

@@ -34,6 +34,9 @@ def azure_run_ore(build, args):
     :param build: Build instance to use
     :type build: Build
     """
+    if not build.have_artifact:
+        raise Exception(f"Missing build artifact {build.image_path}")
+
     azure_vhd_name = f"{build.image_name_base}.vhd"
     ore_args = [
         'ore',

src/cosalib/gcp.py

@@ -37,6 +37,9 @@ def gcp_run_ore(build, args):
     """
     Execute ore to upload the tarball and register the image
     """
+    if not build.have_artifact:
+        raise Exception(f"Missing build artifact {build.image_path}")
+
     arg_exp_str = "parameter '--{}' or envVar '{}' must be defined"
     if args.bucket is None:
         raise Exception(arg_exp_str.format("bucket", "GCP_BUCKET"))

src/cosalib/ibmcloud.py

@@ -102,6 +102,9 @@ def write_ova(self, image_name):
 
 @retry(reraise=True, stop=stop_after_attempt(3))
 def ibmcloud_run_ore(build, args):
+    if not build.have_artifact:
+        raise Exception(f"Missing build artifact {build.image_path}")
+
     ore_args = ['ore']
     if args.log_level:
         ore_args.extend(['--log-level', args.log_level])