imgtestlib: use image-builder cmd, drop cmd/build/ (HMS-10298)

.github/workflows/tests.yml

@@ -292,7 +292,7 @@ jobs:
     strategy:
       matrix:
         arch:
-          - ppc64le
+          # ppc64le disabled
           - s390x
       fail-fast: false  # if one fails, keep the other(s) running
     name: "Cross-arch qemu based image build/boot smoke test"

Schutzfile

@@ -1,6 +1,6 @@
 {
   "common": {
-    "rngseed": 2026063000,
+    "rngseed": 2026070700,
     "dependencies": {
       "bootc-image-builder": {
         "ref": "quay.io/centos-bootc/bootc-image-builder@sha256:9893e7209e5f449b86ababfd2ee02a58cca2e5990f77b06c3539227531fc8120"

cmd/image-builder/main.go

@@ -413,6 +413,15 @@ func cmdManifestWrapper(pbar progress.ProgressBar, cmd *cobra.Command, args []st
 	if err != nil {
 		return err
 	}
+	bootcRemote, err := cmd.Flags().GetBool("bootc-pull-container")
+	if err != nil {
+		return err
+	}
+	imageSize, err := cmd.Flags().GetUint64("image-size")
+	if err != nil {
+		return err
+	}
+
 	var preview *bool
 	// Verify that the flag was actually passed. If it wasn't passed
 	// we keep our nil value so that images used the distro-defined
@@ -502,6 +511,8 @@ func cmdManifestWrapper(pbar progress.ProgressBar, cmd *cobra.Command, args []st
 		BootcRef:                   bootcRef,
 		BootcInstallerPayloadRef:   bootcInstallerPayloadRef,
 		BootcOmitDefaultKernelArgs: bootcOmitDefaultKernelArgs,
+		BootcRemote:                bootcRemote,
+		ImageSize:                  imageSize,
 		WithSBOM:                   withSBOM,
 		WithRPMList:                withRPMList,
 		IgnoreWarnings:             ignoreWarnings,
@@ -844,6 +855,8 @@ operating systems like Fedora, CentOS and RHEL with easy customizations support.
 	manifestCmd.Flags().String("bootc-installer-payload-ref", "", `bootc installer payload ref`)
 	manifestCmd.Flags().String("bootc-default-fs", "", `default filesystem to use for the bootc install (e.g. ext4)`)
 	manifestCmd.Flags().Bool("bootc-no-default-kernel-args", false, `don't use the default kernel arguments`)
+	manifestCmd.Flags().Bool("bootc-pull-container", false, `pull bootc container from remote location instead of using it from local container storage`)
+	manifestCmd.Flags().Uint64("image-size", 0, `override the default image size in bytes`)
 	manifestCmd.Flags().Bool("use-librepo", true, `use librepo to download packages (disable if you use old versions of osbuild)`)
 	if err := manifestCmd.Flags().MarkHidden("use-librepo"); err != nil {
 		return err

cmd/image-builder/manifest.go

@@ -31,6 +31,8 @@ type manifestOptions struct {
 	BootcRef                   string
 	BootcInstallerPayloadRef   string
 	BootcOmitDefaultKernelArgs bool
+	BootcRemote                bool
+	ImageSize                  uint64
 	Subscription               *subscription.ImageOptions
 	RpmDownloader              osbuild.RpmDownloader
 	WithSBOM                   bool
@@ -106,9 +108,11 @@ func generateManifest(repoDir string, extraRepos []string, img *imagefilter.Resu
 		Facts:        &facts.ImageOptions{APIType: facts.IBCLI_APITYPE},
 		OSTree:       opts.Ostree,
 		Subscription: opts.Subscription,
+		Size:         opts.ImageSize,
 		Bootc: &distro.BootcImageOptions{
-			InstallerPayloadRef:   opts.BootcInstallerPayloadRef,
-			OmitDefaultKernelArgs: opts.BootcOmitDefaultKernelArgs,
+			InstallerPayloadRef:      opts.BootcInstallerPayloadRef,
+			OmitDefaultKernelArgs:    opts.BootcOmitDefaultKernelArgs,
+			UseRemoteContainerSource: opts.BootcRemote,
 		},
 		Preview: opts.Preview,
 	}

cmd/image-builder/upload.go

@@ -198,6 +198,9 @@ func uploaderForCmdOpenstack(cmd *cobra.Command, targetArchStr string, bootMode
 	if err != nil {
 		return nil, err
 	}
+	if image == "" {
+		return nil, fmt.Errorf("%w: %q", ErrUploadConfigNotProvided, []string{"--openstack-image"})
+	}
 	diskFormat, err := cmd.Flags().GetString("openstack-disk-format")
 	if err != nil {
 		return nil, err