Repository: osbuild/osbuild-composer
Pull request #2900 (2022-08-16 12:17:49)

[GCE images] don't install SDK and turn off GPG check on el9
### Main changes

- Do not install the `google-cloud-sdk` by default on any RHEL `gce*` images. The package ships precompiled binaries and it is not desirable to install it by default on all RHEL images.
- Do not define the Google repository that contains the `google-cloud-sdk` by default on any RHEL `gce*` images, since it is not needed any more.
- Turn off GPG check for `Google Cloud Engine` repository on RHEL-9 `gce*` images due to https://issuetracker.google.com/issues/223626963
- Regenerate all affected image test case manifests.

### Miscellaneous changes

- Rename `distro/rhel90` to `distro/rhel9` to make it consistent with RHEL-7 and RHEL-8.
- Do not require `--output` argument in `generate-all-test-cases` and default to `test/data/manifests`.


This pull request includes:

- [ ] adequate testing for the new functionality or fixed issue
- [ ] adequate documentation informing people about the change such as
  - [ ] submit a PR for the [guides](https://github.com/osbuild/guides) repository if this PR changed any behavior described there: https://www.osbuild.org/guides/

<!--
Thanks for proposing a change to osbuild-composer!

Please don't remove the above check list. These are things that each pull
request must have before it is merged. It helps maintainers to not forget
anything.

If the reason for ticking any of the boxes is ambiguous, please add a short
note explaining why.

In addition, if this pull request fixes a downstream issue, please refer to
test/README.md and add these additional items:

- [ ] 1st commit of any `rhbz#` related PR contains bug reproducer; CI reports FAIL or
- [ ] PR contains automated tests for new functionality and
- [ ] QE has approved reproducer/new tests and
- [ ] Subsequent commits provide bug fixes without modifying the reproducer; CI reports PASS and
- [ ] QE approves this PR; RHBZ status is set to `MODIFIED + Verified=Tested`

Information regarding our GitLab pipeline (Schutzbot):

CI will not be ran automatically if WIP label is applied or the PR is in DRAFT state, instead only
a link will be provided to the pipeline which can then be triggered manually if desired. To run the
CI automatically either switch the PR to ready or apply WIP+test label.

Outside contributors need manual approval from one of the osbuild-composer maintainers.

Schutzbot will only be triggered if all Tests jobs in GitHub workflow succeed.
-->


thozza: > ⚠️ This PR introduces changes in at least one manifest (when comparing PR HEAD [184e649](https://github.com/osbuild/osbuild-composer/commit/184e649f1169e4f4fbd4f9c6d031bebd2d6114fe) with the main merge-base [53d4d7f](https://github.com/osbuild/osbuild-composer/commit/53d4d7f2849a8f3064f5db8468990bfe3e681e76)). Please review the changes. The changes can be found in the [artifacts of the `Manifest-diff` job [0]](https://gitlab.com/redhat/services/products/image-builder/ci/osbuild-composer/-/jobs/2889821519/artifacts/browse) as `manifests.diff`.
> 
> [0] https://gitlab.com/redhat/services/products/image-builder/ci/osbuild-composer/-/jobs/2889821519/artifacts/browse

yes, this is expected...

Patch:
diff --git a/internal/distro/rhel8/distro.go b/internal/distro/rhel8/distro.go
index f845ab1c5..bd78a4e1f 100644
--- a/internal/distro/rhel8/distro.go
+++ b/internal/distro/rhel8/distro.go
@@ -1729,18 +1729,6 @@ func newDistro(distroName string) distro.Distro {
 							"https://packages.cloud.google.com/yum/doc/rpm-package-key.gpg",
 						},
 					},
-					{
-						Id:           "google-cloud-sdk",
-						Name:         "Google Cloud SDK",
-						BaseURL:      []string{"https://packages.cloud.google.com/yum/repos/cloud-sdk-el8-x86_64"},
-						Enabled:      common.BoolToPtr(true),
-						GPGCheck:     common.BoolToPtr(true),
-						RepoGPGCheck: common.BoolToPtr(false),
-						GPGKey: []string{
-							"https://packages.cloud.google.com/yum/doc/yum-key.gpg",
-							"https://packages.cloud.google.com/yum/doc/rpm-package-key.gpg",
-						},
-					},
 				},
 			},
 		},
diff --git a/internal/distro/rhel8/package_sets.go b/internal/distro/rhel8/package_sets.go
index 409578baa..9517a1954 100644
--- a/internal/distro/rhel8/package_sets.go
+++ b/internal/distro/rhel8/package_sets.go
@@ -675,8 +675,6 @@ func gceCommonPackageSet(t *imageType) rpmmd.PackageSet {
 			"google-compute-engine",
 			"google-osconfig-agent",
 			"gce-disk-expand",
-			// GCP SDK
-			"google-cloud-sdk",
 
 			// Not explicitly included in GCP kickstart, but present on the image
 			// for time synchronization
diff --git a/internal/distro/rhel90/distro.go b/internal/distro/rhel9/distro.go
similarity index 98%
rename from internal/distro/rhel90/distro.go
rename to internal/distro/rhel9/distro.go
index 0dd49ab7f..ba5d1b2c9 100644
--- a/internal/distro/rhel90/distro.go
+++ b/internal/distro/rhel9/distro.go
@@ -1,4 +1,4 @@
-package rhel90
+package rhel9
 
 import (
 	"encoding/json"
@@ -1604,23 +1604,13 @@ func newDistro(distroName string) distro.Distro {
 				Filename: "google-cloud.repo",
 				Repos: []osbuild.YumRepository{
 					{
-						Id:           "google-compute-engine",
-						Name:         "Google Compute Engine",
-						BaseURL:      []string{"https://packages.cloud.google.com/yum/repos/google-compute-engine-el9-x86_64-stable"},
-						Enabled:      common.BoolToPtr(true),
-						GPGCheck:     common.BoolToPtr(true),
-						RepoGPGCheck: common.BoolToPtr(false),
-						GPGKey: []string{
-							"https://packages.cloud.google.com/yum/doc/yum-key.gpg",
-							"https://packages.cloud.google.com/yum/doc/rpm-package-key.gpg",
-						},
-					},
-					{
-						Id:           "google-cloud-sdk",
-						Name:         "Google Cloud SDK",
-						BaseURL:      []string{"https://packages.cloud.google.com/yum/repos/cloud-sdk-el9-x86_64"},
-						Enabled:      common.BoolToPtr(true),
-						GPGCheck:     common.BoolToPtr(true),
+						Id:      "google-compute-engine",
+						Name:    "Google Compute Engine",
+						BaseURL: []string{"https://packages.cloud.google.com/yum/repos/google-compute-engine-el9-x86_64-stable"},
+						Enabled: common.BoolToPtr(true),
+						// TODO: enable GPG check once Google stops using SHA-1 in their keys
+						// https://issuetracker.google.com/issues/223626963
+						GPGCheck:     common.BoolToPtr(false),
 						RepoGPGCheck: common.BoolToPtr(false),
 						GPGKey: []string{
 							"https://packages.cloud.google.com/yum/doc/yum-key.gpg",
diff --git a/internal/distro/rhel90/package_sets.go b/internal/distro/rhel9/package_sets.go
similarity index 99%
rename from internal/distro/rhel90/package_sets.go
rename to internal/distro/rhel9/package_sets.go
index 9a00b63da..5dc255bb1 100644
--- a/internal/distro/rhel90/package_sets.go
+++ b/internal/distro/rhel9/package_sets.go
@@ -1,4 +1,4 @@
-package rhel90
+package rhel9
 
 // This file defines package sets that are used by more than one image type.
 
@@ -811,8 +811,6 @@ func gceCommonPackageSet(t *imageType) rpmmd.PackageSet {
 			"google-compute-engine",
 			"google-osconfig-agent",
 			"gce-disk-expand",
-			// GCP SDK
-			"google-cloud-sdk",
 
 			// Not explicitly included in GCP kickstart, but present on the image
 			// for time synchronization
diff --git a/internal/distro/rhel90/partition_tables.go b/internal/distro/rhel9/partition_tables.go
similarity index 99%
rename from internal/distro/rhel90/partition_tables.go
rename to internal/distro/rhel9/partition_tables.go
index 6099de348..14a826272 100644
--- a/internal/distro/rhel90/partition_tables.go
+++ b/internal/distro/rhel9/partition_tables.go
@@ -1,4 +1,4 @@
-package rhel90
+package rhel9
 
 import (
 	"github.com/osbuild/osbuild-composer/internal/disk"
diff --git a/internal/distro/rhel90/pipelines.go b/internal/distro/rhel9/pipelines.go
similarity index 99%
rename from internal/distro/rhel90/pipelines.go
rename to internal/distro/rhel9/pipelines.go
index f0a910806..11cf71ae0 100644
--- a/internal/distro/rhel90/pipelines.go
+++ b/internal/distro/rhel9/pipelines.go
@@ -1,4 +1,4 @@
-package rhel90
+package rhel9
 
 import (
 	"fmt"
diff --git a/internal/distro/rhel90/stage_options.go b/internal/distro/rhel9/stage_options.go
similarity index 99%
rename from internal/distro/rhel90/stage_options.go
rename to internal/distro/rhel9/stage_options.go
index a964c7d9c..7b0a932b0 100644
--- a/internal/distro/rhel90/stage_options.go
+++ b/internal/distro/rhel9/stage_options.go
@@ -1,4 +1,4 @@
-package rhel90
+package rhel9
 
 import (
 	"fmt"
diff --git a/internal/distroregistry/distroregistry.go b/internal/distroregistry/distroregistry.go
index 04d894034..586d78a93 100644
--- a/internal/distroregistry/distroregistry.go
+++ b/internal/distroregistry/distroregistry.go
@@ -10,7 +10,7 @@ import (
 	"github.com/osbuild/osbuild-composer/internal/distro/fedora"
 	"github.com/osbuild/osbuild-composer/internal/distro/rhel7"
 	"github.com/osbuild/osbuild-composer/internal/distro/rhel8"
-	"github.com/osbuild/osbuild-composer/internal/distro/rhel90"
+	"github.com/osbuild/osbuild-composer/internal/distro/rhel9"
 )
 
 // When adding support for a new distribution, add it here.
@@ -25,9 +25,9 @@ var supportedDistros = []supportedDistro{
 	{rhel8.NewRHEL86, rhel8.NewRHEL86HostDistro},
 	{rhel8.NewRHEL87, rhel8.NewRHEL87HostDistro},
 	{rhel8.NewCentos, rhel8.NewCentosHostDistro},
-	{rhel90.New, rhel90.NewHostDistro},
-	{rhel90.NewRHEL91, rhel90.NewRHEL91HostDistro},
-	{rhel90.NewCentos, rhel90.NewCentosHostDistro},
+	{rhel9.New, rhel9.NewHostDistro},
+	{rhel9.NewRHEL91, rhel9.NewRHEL91HostDistro},
+	{rhel9.NewCentos, rhel9.NewCentosHostDistro},
 }
 
 type supportedDistro struct {


Test patch:
diff --git a/internal/distro/rhel90/distro_test.go b/internal/distro/rhel9/distro_test.go
similarity index 96%
rename from internal/distro/rhel90/distro_test.go
rename to internal/distro/rhel9/distro_test.go
index 56f3aea97..506c4113e 100644
--- a/internal/distro/rhel90/distro_test.go
+++ b/internal/distro/rhel9/distro_test.go
@@ -1,4 +1,4 @@
-package rhel90_test
+package rhel9_test
 
 import (
 	"fmt"
@@ -11,7 +11,7 @@ import (
 	"github.com/osbuild/osbuild-composer/internal/blueprint"
 	"github.com/osbuild/osbuild-composer/internal/distro"
 	"github.com/osbuild/osbuild-composer/internal/distro/distro_test_common"
-	"github.com/osbuild/osbuild-composer/internal/distro/rhel90"
+	"github.com/osbuild/osbuild-composer/internal/distro/rhel9"
 )
 
 type rhelFamilyDistro struct {
@@ -22,7 +22,7 @@ type rhelFamilyDistro struct {
 var rhelFamilyDistros = []rhelFamilyDistro{
 	{
 		name:   "rhel",
-		distro: rhel90.New(),
+		distro: rhel9.New(),
 	},
 }
 
@@ -428,7 +428,7 @@ func TestImageTypeAliases(t *testing.T) {
 func TestDistro_ManifestError(t *testing.T) {
 	// Currently, the only unsupported configuration is OSTree commit types
 	// with Kernel boot options
-	r9distro := rhel90.New()
+	r9distro := rhel9.New()
 	bp := blueprint.Blueprint{
 		Customizations: &blueprint.Customizations{
 			Kernel: &blueprint.KernelCustomization{
@@ -540,12 +540,12 @@ func TestArchitecture_ListImageTypes(t *testing.T) {
 	}
 }
 
-func TestRhel90_ListArches(t *testing.T) {
-	arches := rhel90.New().ListArches()
+func TestRhel9_ListArches(t *testing.T) {
+	arches := rhel9.New().ListArches()
 	assert.Equal(t, []string{"aarch64", "ppc64le", "s390x", "x86_64"}, arches)
 }
 
-func TestRhel90_GetArch(t *testing.T) {
+func TestRhel9_GetArch(t *testing.T) {
 	arches := []struct {
 		name                  string
 		errorExpected         bool
@@ -585,22 +585,22 @@ func TestRhel90_GetArch(t *testing.T) {
 	}
 }
 
-func TestRhel90_Name(t *testing.T) {
-	distro := rhel90.New()
+func TestRhel9_Name(t *testing.T) {
+	distro := rhel9.New()
 	assert.Equal(t, "rhel-90", distro.Name())
 }
 
-func TestRhel90_ModulePlatformID(t *testing.T) {
-	distro := rhel90.New()
+func TestRhel9_ModulePlatformID(t *testing.T) {
+	distro := rhel9.New()
 	assert.Equal(t, "platform:el9", distro.ModulePlatformID())
 }
 
-func TestRhel90_KernelOption(t *testing.T) {
-	distro_test_common.TestDistro_KernelOption(t, rhel90.New())
+func TestRhel9_KernelOption(t *testing.T) {
+	distro_test_common.TestDistro_KernelOption(t, rhel9.New())
 }
 
 func TestDistro_CustomFileSystemManifestError(t *testing.T) {
-	r9distro := rhel90.New()
+	r9distro := rhel9.New()
 	bp := blueprint.Blueprint{
 		Customizations: &blueprint.Customizations{
 			Filesystem: []blueprint.FilesystemCustomization{
@@ -628,7 +628,7 @@ func TestDistro_CustomFileSystemManifestError(t *testing.T) {
 }
 
 func TestDistro_TestRootMountPoint(t *testing.T) {
-	r9distro := rhel90.New()
+	r9distro := rhel9.New()
 	bp := blueprint.Blueprint{
 		Customizations: &blueprint.Customizations{
 			Filesystem: []blueprint.FilesystemCustomization{
@@ -657,7 +657,7 @@ func TestDistro_TestRootMountPoint(t *testing.T) {
 }
 
 func TestDistro_CustomFileSystemSubDirectories(t *testing.T) {
-	r9distro := rhel90.New()
+	r9distro := rhel9.New()
 	bp := blueprint.Blueprint{
 		Customizations: &blueprint.Customizations{
 			Filesystem: []blueprint.FilesystemCustomization{
@@ -688,7 +688,7 @@ func TestDistro_CustomFileSystemSubDirectories(t *testing.T) {
 }
 
 func TestDistro_MountpointsWithArbitraryDepthAllowed(t *testing.T) {
-	r9distro := rhel90.New()
+	r9distro := rhel9.New()
 	bp := blueprint.Blueprint{
 		Customizations: &blueprint.Customizations{
 			Filesystem: []blueprint.FilesystemCustomization{
@@ -727,7 +727,7 @@ func TestDistro_MountpointsWithArbitraryDepthAllowed(t *testing.T) {
 }
 
 func TestDistro_DirtyMountpointsNotAllowed(t *testing.T) {
-	r9distro := rhel90.New()
+	r9distro := rhel9.New()
 	bp := blueprint.Blueprint{
 		Customizations: &blueprint.Customizations{
 			Filesystem: []blueprint.FilesystemCustomization{
@@ -761,7 +761,7 @@ func TestDistro_DirtyMountpointsNotAllowed(t *testing.T) {
 }
 
 func TestDistro_CustomFileSystemPatternMatching(t *testing.T) {
-	r9distro := rhel90.New()
+	r9distro := rhel9.New()
 	bp := blueprint.Blueprint{
 		Customizations: &blueprint.Customizations{
 			Filesystem: []blueprint.FilesystemCustomization{
@@ -793,7 +793,7 @@ func TestDistro_CustomFileSystemPatternMatching(t *testing.T) {
 }
 
 func TestDistro_CustomUsrPartitionNotLargeEnough(t *testing.T) {
-	r9distro := rhel90.New()
+	r9distro := rhel9.New()
 	bp := blueprint.Blueprint{
 		Customizations: &blueprint.Customizations{
 			Filesystem: []blueprint.FilesystemCustomization{
diff --git a/test/data/manifests/centos_8-x86_64-gce-boot.json b/test/data/manifests/centos_8-x86_64-gce-boot.json
index 165f55f5c..3f0f3d7db 100644
--- a/test/data/manifests/centos_8-x86_64-gce-boot.json
+++ b/test/data/manifests/centos_8-x86_64-gce-boot.json
@@ -5390,14 +5390,6 @@
                         "rpm.check_gpg": true
                       }
                     }
-                  },
-                  {
-                    "id": "sha256:b3dfe65a6761e51ccd2eeaf458d70eb012b526d2fd8eba117c99ec8e04e8d338",
-                    "options": {
-                      "metadata": {
-                        "rpm.check_gpg": true
-                      }
-                    }
                   }
                 ]
               }
@@ -5532,20 +5524,6 @@
                   "name": "Google Compute Engine",
                   "gpgcheck": true,
                   "repo_gpgcheck": false
-                },
-                {
-                  "id": "google-cloud-sdk",
-                  "baseurl": [
-                    "https://packages.cloud.google.com/yum/repos/cloud-sdk-el8-x86_64"
-                  ],
-                  "enabled": true,
-                  "gpgkey": [
-                    "https://packages.cloud.google.com/yum/doc/yum-key.gpg",
-                    "https://packages.cloud.google.com/yum/doc/rpm-package-key.gpg"
-                  ],
-                  "name": "Google Cloud SDK",
-                  "gpgcheck": true,
-                  "repo_gpgcheck": false
                 }
               ]
             }
@@ -6700,9 +6678,6 @@
           "sha256:b3b2efe6be4968076f0310e0bc82577a07bd3d471c7c878f6015eda2d165ab53": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/public/el8/cs8-x86_64-baseos-20220208/Packages/coreutils-common-8.30-12.el8.x86_64.rpm"
           },
-          "sha256:b3dfe65a6761e51ccd2eeaf458d70eb012b526d2fd8eba117c99ec8e04e8d338": {
-            "url": "https://rpmrepo.osbuild.org/v2/mirror/public/el8/el8-x86_64-google-cloud-sdk-20220227/Packages/b3dfe65a6761e51ccd2eeaf458d70eb012b526d2fd8eba117c99ec8e04e8d338-google-cloud-sdk-374.0.0-1.x86_64.rpm"
-          },
           "sha256:b49e8c674e462e3f494e825c5fca64002008cbf7a47bf131aa98b7f41678a6eb": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/public/el8/cs8-x86_64-baseos-20220208/Packages/libassuan-2.5.1-3.el8.x86_64.rpm"
           },
@@ -13757,18 +13732,7 @@
         "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/public/el8/el8-x86_64-google-compute-engine-20220227/Packages/8e425325aa0bd3420a428d20cb894c7c619f6da58fc25cab6339b5137c1c77fe-google-osconfig-agent-20211117.00-g1.el8.x86_64.rpm",
         "checksum": "sha256:8e425325aa0bd3420a428d20cb894c7c619f6da58fc25cab6339b5137c1c77fe",
         "check_gpg": true
-      },
-      {
-        "name": "google-cloud-sdk",
-        "epoch": 0,
-        "version": "374.0.0",
-        "release": "1",
-        "arch": "x86_64",
-        "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/public/el8/el8-x86_64-google-cloud-sdk-20220227/Packages/b3dfe65a6761e51ccd2eeaf458d70eb012b526d2fd8eba117c99ec8e04e8d338-google-cloud-sdk-374.0.0-1.x86_64.rpm",
-        "checksum": "sha256:b3dfe65a6761e51ccd2eeaf458d70eb012b526d2fd8eba117c99ec8e04e8d338",
-        "check_gpg": true
       }
     ]
-  },
-  "no-image-info": true
+  }
 }
diff --git a/test/data/manifests/centos_9-x86_64-gce-boot.json b/test/data/manifests/centos_9-x86_64-gce-boot.json
index 8fac6410c..ff9ec59fe 100644
--- a/test/data/manifests/centos_9-x86_64-gce-boot.json
+++ b/test/data/manifests/centos_9-x86_64-gce-boot.json
@@ -25,6 +25,7 @@
       {
         "name": "google-compute-engine",
         "baseurl": "https://rpmrepo.osbuild.org/v2/mirror/public/el9/el9-x86_64-google-compute-engine-20220227",
+        "check_gpg": false,
         "image_type_tags": [
           "gce"
         ]
@@ -32,6 +33,7 @@
       {
         "name": "google-cloud-sdk",
         "baseurl": "https://rpmrepo.osbuild.org/v2/mirror/public/el9/el9-x86_64-google-cloud-sdk-20220227",
+        "check_gpg": false,
         "image_type_tags": [
           "gce"
         ]
@@ -4981,9 +4983,6 @@
                   },
                   {
                     "id": "sha256:b9540086358a7c32bc5181f2e93a495e37a577619472d47641d8b75cbd43041c"
-                  },
-                  {
-                    "id": "sha256:b3dfe65a6761e51ccd2eeaf458d70eb012b526d2fd8eba117c99ec8e04e8d338"
                   }
                 ]
               }
@@ -5117,21 +5116,7 @@
                     "https://packages.cloud.google.com/yum/doc/rpm-package-key.gpg"
                   ],
                   "name": "Google Compute Engine",
-                  "gpgcheck": true,
-                  "repo_gpgcheck": false
-                },
-                {
-                  "id": "google-cloud-sdk",
-                  "baseurl": [
-                    "https://packages.cloud.google.com/yum/repos/cloud-sdk-el9-x86_64"
-                  ],
-                  "enabled": true,
-                  "gpgkey": [
-                    "https://packages.cloud.google.com/yum/doc/yum-key.gpg",
-                    "https://packages.cloud.google.com/yum/doc/rpm-package-key.gpg"
-                  ],
-                  "name": "Google Cloud SDK",
-                  "gpgcheck": true,
+                  "gpgcheck": false,
                   "repo_gpgcheck": false
                 }
               ]
@@ -6309,9 +6294,6 @@
           "sha256:b2676b446f240e0bb1359cf97fbc90b0d70fa8d14d6c8c59885a4dccdd03ef88": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/public/el9/cs9-x86_64-baseos-20220208/Packages/python3-gobject-base-3.40.1-5.el9.x86_64.rpm"
           },
-          "sha256:b3dfe65a6761e51ccd2eeaf458d70eb012b526d2fd8eba117c99ec8e04e8d338": {
-            "url": "https://rpmrepo.osbuild.org/v2/mirror/public/el9/el9-x86_64-google-cloud-sdk-20220227/Packages/b3dfe65a6761e51ccd2eeaf458d70eb012b526d2fd8eba117c99ec8e04e8d338-google-cloud-sdk-374.0.0-1.x86_64.rpm"
-          },
           "sha256:b3e052d17ef4a38dc8938c87d84d1bfe4c487f624628e61b1c79d8b9bbe756ad": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/public/el9/cs9-x86_64-baseos-20220208/Packages/libstdc++-11.2.1-9.1.el9.x86_64.rpm"
           },
@@ -12820,17 +12802,7 @@
         "arch": "x86_64",
         "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/public/el9/el9-x86_64-google-compute-engine-20220227/Packages/b9540086358a7c32bc5181f2e93a495e37a577619472d47641d8b75cbd43041c-google-osconfig-agent-20220201-g1.el9.x86_64.rpm",
         "checksum": "sha256:b9540086358a7c32bc5181f2e93a495e37a577619472d47641d8b75cbd43041c"
-      },
-      {
-        "name": "google-cloud-sdk",
-        "epoch": 0,
-        "version": "374.0.0",
-        "release": "1",
-        "arch": "x86_64",
-        "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/public/el9/el9-x86_64-google-cloud-sdk-20220227/Packages/b3dfe65a6761e51ccd2eeaf458d70eb012b526d2fd8eba117c99ec8e04e8d338-google-cloud-sdk-374.0.0-1.x86_64.rpm",
-        "checksum": "sha256:b3dfe65a6761e51ccd2eeaf458d70eb012b526d2fd8eba117c99ec8e04e8d338"
       }
     ]
-  },
-  "no-image-info": true
+  }
 }
diff --git a/test/data/manifests/rhel_8-x86_64-gce-boot.json b/test/data/manifests/rhel_8-x86_64-gce-boot.json
index c5b936c86..ec2ad8a20 100644
--- a/test/data/manifests/rhel_8-x86_64-gce-boot.json
+++ b/test/data/manifests/rhel_8-x86_64-gce-boot.json
@@ -2184,14 +2184,6 @@
                         "rpm.check_gpg": true
                       }
                     }
-                  },
-                  {
-                    "id": "sha256:b3dfe65a6761e51ccd2eeaf458d70eb012b526d2fd8eba117c99ec8e04e8d338",
-                    "options": {
-                      "metadata": {
-                        "rpm.check_gpg": true
-                      }
-                    }
                   }
                 ]
               }
@@ -2336,20 +2328,6 @@
                   "name": "Google Compute Engine",
                   "gpgcheck": true,
                   "repo_gpgcheck": false
-                },
-                {
-                  "id": "google-cloud-sdk",
-                  "baseurl": [
-                    "https://packages.cloud.google.com/yum/repos/cloud-sdk-el8-x86_64"
-                  ],
-                  "enabled": true,
-                  "gpgkey": [
-                    "https://packages.cloud.google.com/yum/doc/yum-key.gpg",
-                    "https://packages.cloud.google.com/yum/doc/rpm-package-key.gpg"
-                  ],
-                  "name": "Google Cloud SDK",
-                  "gpgcheck": true,
-                  "repo_gpgcheck": false
                 }
               ]
             }
@@ -3573,9 +3551,6 @@
           "sha256:b375af1498f005d94bc311b78facf125bb665369016617a4e53fea13227369fc": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.6-20220201/Packages/hwdata-0.314-8.11.el8.noarch.rpm"
           },
-          "sha256:b3dfe65a6761e51ccd2eeaf458d70eb012b526d2fd8eba117c99ec8e04e8d338": {
-            "url": "https://rpmrepo.osbuild.org/v2/mirror/public/el8/el8-x86_64-google-cloud-sdk-20220227/Packages/b3dfe65a6761e51ccd2eeaf458d70eb012b526d2fd8eba117c99ec8e04e8d338-google-cloud-sdk-374.0.0-1.x86_64.rpm"
-          },
           "sha256:b41c194ecf358e8e6cec46068c4fb6f34780ee2bd65200c367b94170103a8aa9": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.6-20220201/Packages/ima-evm-utils-1.3.2-12.el8.x86_64.rpm"
           },
@@ -10215,18 +10190,7 @@
         "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/public/el8/el8-x86_64-google-compute-engine-20220227/Packages/8e425325aa0bd3420a428d20cb894c7c619f6da58fc25cab6339b5137c1c77fe-google-osconfig-agent-20211117.00-g1.el8.x86_64.rpm",
         "checksum": "sha256:8e425325aa0bd3420a428d20cb894c7c619f6da58fc25cab6339b5137c1c77fe",
         "check_gpg": true
-      },
-      {
-        "name": "google-cloud-sdk",
-        "epoch": 0,
-        "version": "374.0.0",
-        "release": "1",
-        "arch": "x86_64",
-        "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/public/el8/el8-x86_64-google-cloud-sdk-20220227/Packages/b3dfe65a6761e51ccd2eeaf458d70eb012b526d2fd8eba117c99ec8e04e8d338-google-cloud-sdk-374.0.0-1.x86_64.rpm",
-        "checksum": "sha256:b3dfe65a6761e51ccd2eeaf458d70eb012b526d2fd8eba117c99ec8e04e8d338",
-        "check_gpg": true
       }
     ]
-  },
-  "no-image-info": true
+  }
 }
diff --git a/test/data/manifests/rhel_8-x86_64-gce_rhui-boot.json b/test/data/manifests/rhel_8-x86_64-gce_rhui-boot.json
index f9b1ae9ea..af4a6a7be 100644
--- a/test/data/manifests/rhel_8-x86_64-gce_rhui-boot.json
+++ b/test/data/manifests/rhel_8-x86_64-gce_rhui-boot.json
@@ -2192,14 +2192,6 @@
                         "rpm.check_gpg": true
                       }
                     }
-                  },
-                  {
-                    "id": "sha256:b3dfe65a6761e51ccd2eeaf458d70eb012b526d2fd8eba117c99ec8e04e8d338",
-                    "options": {
-                      "metadata": {
-                        "rpm.check_gpg": true
-                      }
-                    }
                   }
                 ]
               }
@@ -2347,20 +2339,6 @@
                   "name": "Google Compute Engine",
                   "gpgcheck": true,
                   "repo_gpgcheck": false
-                },
-                {
-                  "id": "google-cloud-sdk",
-                  "baseurl": [
-                    "https://packages.cloud.google.com/yum/repos/cloud-sdk-el8-x86_64"
-                  ],
-                  "enabled": true,
-                  "gpgkey": [
-                    "https://packages.cloud.google.com/yum/doc/yum-key.gpg",
-                    "https://packages.cloud.google.com/yum/doc/rpm-package-key.gpg"
-                  ],
-                  "name": "Google Cloud SDK",
-                  "gpgcheck": true,
-                  "repo_gpgcheck": false
                 }
               ]
             }
@@ -3587,9 +3565,6 @@
           "sha256:b375af1498f005d94bc311b78facf125bb665369016617a4e53fea13227369fc": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.6-20220201/Packages/hwdata-0.314-8.11.el8.noarch.rpm"
           },
-          "sha256:b3dfe65a6761e51ccd2eeaf458d70eb012b526d2fd8eba117c99ec8e04e8d338": {
-            "url": "https://rpmrepo.osbuild.org/v2/mirror/public/el8/el8-x86_64-google-cloud-sdk-20220227/Packages/b3dfe65a6761e51ccd2eeaf458d70eb012b526d2fd8eba117c99ec8e04e8d338-google-cloud-sdk-374.0.0-1.x86_64.rpm"
-          },
           "sha256:b41c194ecf358e8e6cec46068c4fb6f34780ee2bd65200c367b94170103a8aa9": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.6-20220201/Packages/ima-evm-utils-1.3.2-12.el8.x86_64.rpm"
           },
@@ -10239,18 +10214,7 @@
         "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/public/el8/el8-x86_64-google-compute-engine-20220227/Packages/6ecb3fb45a961a54e079c8cca128ee8d154906564da63d63be318779c5176296-google-rhui-client-rhel8-2.1-1.noarch.rpm",
         "checksum": "sha256:6ecb3fb45a961a54e079c8cca128ee8d154906564da63d63be318779c5176296",
         "check_gpg": true
-      },
-      {
-        "name": "google-cloud-sdk",
-        "epoch": 0,
-        "version": "374.0.0",
-        "release": "1",
-        "arch": "x86_64",
-        "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/public/el8/el8-x86_64-google-cloud-sdk-20220227/Packages/b3dfe65a6761e51ccd2eeaf458d70eb012b526d2fd8eba117c99ec8e04e8d338-google-cloud-sdk-374.0.0-1.x86_64.rpm",
-        "checksum": "sha256:b3dfe65a6761e51ccd2eeaf458d70eb012b526d2fd8eba117c99ec8e04e8d338",
-        "check_gpg": true
       }
     ]
-  },
-  "no-image-info": true
+  }
 }
diff --git a/test/data/manifests/rhel_84-x86_64-gce-boot.json b/test/data/manifests/rhel_84-x86_64-gce-boot.json
index d82f2436f..f4ca05e27 100644
--- a/test/data/manifests/rhel_84-x86_64-gce-boot.json
+++ b/test/data/manifests/rhel_84-x86_64-gce-boot.json
@@ -2211,14 +2211,6 @@
                         "rpm.check_gpg": true
                       }
                     }
-                  },
-                  {
-                    "id": "sha256:b3dfe65a6761e51ccd2eeaf458d70eb012b526d2fd8eba117c99ec8e04e8d338",
-                    "options": {
-                      "metadata": {
-                        "rpm.check_gpg": true
-                      }
-                    }
                   }
                 ]
               }
@@ -2368,20 +2360,6 @@
                   "name": "Google Compute Engine",
                   "gpgcheck": true,
                   "repo_gpgcheck": false
-                },
-                {
-                  "id": "google-cloud-sdk",
-                  "baseurl": [
-                    "https://packages.cloud.google.com/yum/repos/cloud-sdk-el8-x86_64"
-                  ],
-                  "enabled": true,
-                  "gpgkey": [
-                    "https://packages.cloud.google.com/yum/doc/yum-key.gpg",
-                    "https://packages.cloud.google.com/yum/doc/rpm-package-key.gpg"
-                  ],
-                  "name": "Google Cloud SDK",
-                  "gpgcheck": true,
-                  "repo_gpgcheck": false
                 }
               ]
             }
@@ -3593,9 +3571,6 @@
           "sha256:b2dcbd3b81196b16e33054d31c0129c432cf59fb591035845cc299bbb46000c1": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-r8.4-20210921/Packages/libuser-0.62-23.el8.x86_64.rpm"
           },
-          "sha256:b3dfe65a6761e51ccd2eeaf458d70eb012b526d2fd8eba117c99ec8e04e8d338": {
-            "url": "https://rpmrepo.osbuild.org/v2/mirror/public/el8/el8-x86_64-google-cloud-sdk-20220227/Packages/b3dfe65a6761e51ccd2eeaf458d70eb012b526d2fd8eba117c99ec8e04e8d338-google-cloud-sdk-374.0.0-1.x86_64.rpm"
-          },
           "sha256:b41c194ecf358e8e6cec46068c4fb6f34780ee2bd65200c367b94170103a8aa9": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-r8.4-20210921/Packages/ima-evm-utils-1.3.2-12.el8.x86_64.rpm"
           },
@@ -10334,18 +10309,7 @@
         "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/public/el8/el8-x86_64-google-compute-engine-20220227/Packages/8e425325aa0bd3420a428d20cb894c7c619f6da58fc25cab6339b5137c1c77fe-google-osconfig-agent-20211117.00-g1.el8.x86_64.rpm",
         "checksum": "sha256:8e425325aa0bd3420a428d20cb894c7c619f6da58fc25cab6339b5137c1c77fe",
         "check_gpg": true
-      },
-      {
-        "name": "google-cloud-sdk",
-        "epoch": 0,
-        "version": "374.0.0",
-        "release": "1",
-        "arch": "x86_64",
-        "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/public/el8/el8-x86_64-google-cloud-sdk-20220227/Packages/b3dfe65a6761e51ccd2eeaf458d70eb012b526d2fd8eba117c99ec8e04e8d338-google-cloud-sdk-374.0.0-1.x86_64.rpm",
-        "checksum": "sha256:b3dfe65a6761e51ccd2eeaf458d70eb012b526d2fd8eba117c99ec8e04e8d338",
-        "check_gpg": true
       }
     ]
-  },
-  "no-image-info": true
+  }
 }
diff --git a/test/data/manifests/rhel_84-x86_64-gce_rhui-boot.json b/test/data/manifests/rhel_84-x86_64-gce_rhui-boot.json
index fc4ed5f0b..7d67bb041 100644
--- a/test/data/manifests/rhel_84-x86_64-gce_rhui-boot.json
+++ b/test/data/manifests/rhel_84-x86_64-gce_rhui-boot.json
@@ -2219,14 +2219,6 @@
                         "rpm.check_gpg": true
                       }
                     }
-                  },
-                  {
-                    "id": "sha256:b3dfe65a6761e51ccd2eeaf458d70eb012b526d2fd8eba117c99ec8e04e8d338",
-                    "options": {
-                      "metadata": {
-                        "rpm.check_gpg": true
-                      }
-                    }
                   }
                 ]
               }
@@ -2379,20 +2371,6 @@
                   "name": "Google Compute Engine",
                   "gpgcheck": true,
                   "repo_gpgcheck": false
-                },
-                {
-                  "id": "google-cloud-sdk",
-                  "baseurl": [
-                    "https://packages.cloud.google.com/yum/repos/cloud-sdk-el8-x86_64"
-                  ],
-                  "enabled": true,
-                  "gpgkey": [
-                    "https://packages.cloud.google.com/yum/doc/yum-key.gpg",
-                    "https://packages.cloud.google.com/yum/doc/rpm-package-key.gpg"
-                  ],
-                  "name": "Google Cloud SDK",
-                  "gpgcheck": true,
-                  "repo_gpgcheck": false
                 }
               ]
             }
@@ -3607,9 +3585,6 @@
           "sha256:b2dcbd3b81196b16e33054d31c0129c432cf59fb591035845cc299bbb46000c1": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-r8.4-20210921/Packages/libuser-0.62-23.el8.x86_64.rpm"
           },
-          "sha256:b3dfe65a6761e51ccd2eeaf458d70eb012b526d2fd8eba117c99ec8e04e8d338": {
-            "url": "https://rpmrepo.osbuild.org/v2/mirror/public/el8/el8-x86_64-google-cloud-sdk-20220227/Packages/b3dfe65a6761e51ccd2eeaf458d70eb012b526d2fd8eba117c99ec8e04e8d338-google-cloud-sdk-374.0.0-1.x86_64.rpm"
-          },
           "sha256:b41c194ecf358e8e6cec46068c4fb6f34780ee2bd65200c367b94170103a8aa9": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-r8.4-20210921/Packages/ima-evm-utils-1.3.2-12.el8.x86_64.rpm"
           },
@@ -10358,18 +10333,7 @@
         "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/public/el8/el8-x86_64-google-compute-engine-20220227/Packages/6ecb3fb45a961a54e079c8cca128ee8d154906564da63d63be318779c5176296-google-rhui-client-rhel8-2.1-1.noarch.rpm",
         "checksum": "sha256:6ecb3fb45a961a54e079c8cca128ee8d154906564da63d63be318779c5176296",
         "check_gpg": true
-      },
-      {
-        "name": "google-cloud-sdk",
-        "epoch": 0,
-        "version": "374.0.0",
-        "release": "1",
-        "arch": "x86_64",
-        "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/public/el8/el8-x86_64-google-cloud-sdk-20220227/Packages/b3dfe65a6761e51ccd2eeaf458d70eb012b526d2fd8eba117c99ec8e04e8d338-google-cloud-sdk-374.0.0-1.x86_64.rpm",
-        "checksum": "sha256:b3dfe65a6761e51ccd2eeaf458d70eb012b526d2fd8eba117c99ec8e04e8d338",
-        "check_gpg": true
       }
     ]
-  },
-  "no-image-info": true
+  }
 }
diff --git a/test/data/manifests/rhel_85-x86_64-gce-boot.json b/test/data/manifests/rhel_85-x86_64-gce-boot.json
index d5b316d5e..c23c38d48 100644
--- a/test/data/manifests/rhel_85-x86_64-gce-boot.json
+++ b/test/data/manifests/rhel_85-x86_64-gce-boot.json
@@ -2184,14 +2184,6 @@
                         "rpm.check_gpg": true
                       }
                     }
-                  },
-                  {
-                    "id": "sha256:52d8e2885c959f83e0469b0451e9a50f2bb2a91385338a65521f4848d263ae1c",
-                    "options": {
-                      "metadata": {
-                        "rpm.check_gpg": true
-                      }
-                    }
                   }
                 ]
               }
@@ -2336,20 +2328,6 @@
                   "name": "Google Compute Engine",
                   "gpgcheck": true,
                   "repo_gpgcheck": false
-                },
-                {
-                  "id": "google-cloud-sdk",
-                  "baseurl": [
-                    "https://packages.cloud.google.com/yum/repos/cloud-sdk-el8-x86_64"
-                  ],
-                  "enabled": true,
-                  "gpgkey": [
-                    "https://packages.cloud.google.com/yum/doc/yum-key.gpg",
-                    "https://packages.cloud.google.com/yum/doc/rpm-package-key.gpg"
-                  ],
-                  "name": "Google Cloud SDK",
-                  "gpgcheck": true,
-                  "repo_gpgcheck": false
                 }
               ]
             }
@@ -3054,9 +3032,6 @@
           "sha256:52aed1bbd2aa4041e599a453a9c4323775b26d2b1326ffb98ac6febbcab8c230": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-appstream-r8.5-20220504/Packages/nspr-4.32.0-1.el8_4.x86_64.rpm"
           },
-          "sha256:52d8e2885c959f83e0469b0451e9a50f2bb2a91385338a65521f4848d263ae1c": {
-            "url": "https://rpmrepo.osbuild.org/v2/mirror/public/el8/el8-x86_64-google-cloud-sdk-20220504/Packages/52d8e2885c959f83e0469b0451e9a50f2bb2a91385338a65521f4848d263ae1c-google-cloud-sdk-384.0.0-1.x86_64.rpm"
-          },
           "sha256:53849d779914a944acc126459911030c8ac8310ffcab354c6a7bcc4ef4af5bab": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-r8.5-20220504/Packages/e2fsprogs-1.45.6-2.el8.x86_64.rpm"
           },
@@ -10221,18 +10196,7 @@
         "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/public/el8/el8-x86_64-google-compute-engine-20220504/Packages/8afd4cbab4d465d1956ea2dfdc8290d85660e7a477daaffd72f7e1c9cc03e041-google-osconfig-agent-20220215.00-g1.el8.x86_64.rpm",
         "checksum": "sha256:8afd4cbab4d465d1956ea2dfdc8290d85660e7a477daaffd72f7e1c9cc03e041",
         "check_gpg": true
-      },
-      {
-        "name": "google-cloud-sdk",
-        "epoch": 0,
-        "version": "384.0.0",
-        "release": "1",
-        "arch": "x86_64",
-        "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/public/el8/el8-x86_64-google-cloud-sdk-20220504/Packages/52d8e2885c959f83e0469b0451e9a50f2bb2a91385338a65521f4848d263ae1c-google-cloud-sdk-384.0.0-1.x86_64.rpm",
-        "checksum": "sha256:52d8e2885c959f83e0469b0451e9a50f2bb2a91385338a65521f4848d263ae1c",
-        "check_gpg": true
       }
     ]
-  },
-  "no-image-info": true
+  }
 }
diff --git a/test/data/manifests/rhel_85-x86_64-gce_rhui-boot.json b/test/data/manifests/rhel_85-x86_64-gce_rhui-boot.json
index 41baf6652..9a74fb4f1 100644
--- a/test/data/manifests/rhel_85-x86_64-gce_rhui-boot.json
+++ b/test/data/manifests/rhel_85-x86_64-gce_rhui-boot.json
@@ -2192,14 +2192,6 @@
                         "rpm.check_gpg": true
                       }
                     }
-                  },
-                  {
-                    "id": "sha256:52d8e2885c959f83e0469b0451e9a50f2bb2a91385338a65521f4848d263ae1c",
-                    "options": {
-                      "metadata": {
-                        "rpm.check_gpg": true
-                      }
-                    }
                   }
                 ]
               }
@@ -2347,20 +2339,6 @@
                   "name": "Google Compute Engine",
                   "gpgcheck": true,
                   "repo_gpgcheck": false
-                },
-                {
-                  "id": "google-cloud-sdk",
-                  "baseurl": [
-                    "https://packages.cloud.google.com/yum/repos/cloud-sdk-el8-x86_64"
-                  ],
-                  "enabled": true,
-                  "gpgkey": [
-                    "https://packages.cloud.google.com/yum/doc/yum-key.gpg",
-                    "https://packages.cloud.google.com/yum/doc/rpm-package-key.gpg"
-                  ],
-                  "name": "Google Cloud SDK",
-                  "gpgcheck": true,
-                  "repo_gpgcheck": false
                 }
               ]
             }
@@ -3065,9 +3043,6 @@
           "sha256:52aed1bbd2aa4041e599a453a9c4323775b26d2b1326ffb98ac6febbcab8c230": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-appstream-r8.5-20220504/Packages/nspr-4.32.0-1.el8_4.x86_64.rpm"
           },
-          "sha256:52d8e2885c959f83e0469b0451e9a50f2bb2a91385338a65521f4848d263ae1c": {
-            "url": "https://rpmrepo.osbuild.org/v2/mirror/public/el8/el8-x86_64-google-cloud-sdk-20220504/Packages/52d8e2885c959f83e0469b0451e9a50f2bb2a91385338a65521f4848d263ae1c-google-cloud-sdk-384.0.0-1.x86_64.rpm"
-          },
           "sha256:53849d779914a944acc126459911030c8ac8310ffcab354c6a7bcc4ef4af5bab": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-r8.5-20220504/Packages/e2fsprogs-1.45.6-2.el8.x86_64.rpm"
           },
@@ -10245,18 +10220,7 @@
         "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/public/el8/el8-x86_64-google-compute-engine-20220504/Packages/6ecb3fb45a961a54e079c8cca128ee8d154906564da63d63be318779c5176296-google-rhui-client-rhel8-2.1-1.noarch.rpm",
         "checksum": "sha256:6ecb3fb45a961a54e079c8cca128ee8d154906564da63d63be318779c5176296",
         "check_gpg": true
-      },
-      {
-        "name": "google-cloud-sdk",
-        "epoch": 0,
-        "version": "384.0.0",
-        "release": "1",
-        "arch": "x86_64",
-        "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/public/el8/el8-x86_64-google-cloud-sdk-20220504/Packages/52d8e2885c959f83e0469b0451e9a50f2bb2a91385338a65521f4848d263ae1c-google-cloud-sdk-384.0.0-1.x86_64.rpm",
-        "checksum": "sha256:52d8e2885c959f83e0469b0451e9a50f2bb2a91385338a65521f4848d263ae1c",
-        "check_gpg": true
       }
     ]
-  },
-  "no-image-info": true
+  }
 }
diff --git a/test/data/manifests/rhel_86-x86_64-gce-boot.json b/test/data/manifests/rhel_86-x86_64-gce-boot.json
index fabd7167b..587b7d947 100644
--- a/test/data/manifests/rhel_86-x86_64-gce-boot.json
+++ b/test/data/manifests/rhel_86-x86_64-gce-boot.json
@@ -2184,14 +2184,6 @@
                         "rpm.check_gpg": true
                       }
                     }
-                  },
-                  {
-                    "id": "sha256:b3dfe65a6761e51ccd2eeaf458d70eb012b526d2fd8eba117c99ec8e04e8d338",
-                    "options": {
-                      "metadata": {
-                        "rpm.check_gpg": true
-                      }
-                    }
                   }
                 ]
               }
@@ -2336,20 +2328,6 @@
                   "name": "Google Compute Engine",
                   "gpgcheck": true,
                   "repo_gpgcheck": false
-                },
-                {
-                  "id": "google-cloud-sdk",
-                  "baseurl": [
-                    "https://packages.cloud.google.com/yum/repos/cloud-sdk-el8-x86_64"
-                  ],
-                  "enabled": true,
-                  "gpgkey": [
-                    "https://packages.cloud.google.com/yum/doc/yum-key.gpg",
-                    "https://packages.cloud.google.com/yum/doc/rpm-package-key.gpg"
-                  ],
-                  "name": "Google Cloud SDK",
-                  "gpgcheck": true,
-                  "repo_gpgcheck": false
                 }
               ]
             }
@@ -3573,9 +3551,6 @@
           "sha256:b375af1498f005d94bc311b78facf125bb665369016617a4e53fea13227369fc": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.6-20220201/Packages/hwdata-0.314-8.11.el8.noarch.rpm"
           },
-          "sha256:b3dfe65a6761e51ccd2eeaf458d70eb012b526d2fd8eba117c99ec8e04e8d338": {
-            "url": "https://rpmrepo.osbuild.org/v2/mirror/public/el8/el8-x86_64-google-cloud-sdk-20220227/Packages/b3dfe65a6761e51ccd2eeaf458d70eb012b526d2fd8eba117c99ec8e04e8d338-google-cloud-sdk-374.0.0-1.x86_64.rpm"
-          },
           "sha256:b41c194ecf358e8e6cec46068c4fb6f34780ee2bd65200c367b94170103a8aa9": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.6-20220201/Packages/ima-evm-utils-1.3.2-12.el8.x86_64.rpm"
           },
@@ -10215,18 +10190,7 @@
         "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/public/el8/el8-x86_64-google-compute-engine-20220227/Packages/8e425325aa0bd3420a428d20cb894c7c619f6da58fc25cab6339b5137c1c77fe-google-osconfig-agent-20211117.00-g1.el8.x86_64.rpm",
         "checksum": "sha256:8e425325aa0bd3420a428d20cb894c7c619f6da58fc25cab6339b5137c1c77fe",
         "check_gpg": true
-      },
-      {
-        "name": "google-cloud-sdk",
-        "epoch": 0,
-        "version": "374.0.0",
-        "release": "1",
-        "arch": "x86_64",
-        "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/public/el8/el8-x86_64-google-cloud-sdk-20220227/Packages/b3dfe65a6761e51ccd2eeaf458d70eb012b526d2fd8eba117c99ec8e04e8d338-google-cloud-sdk-374.0.0-1.x86_64.rpm",
-        "checksum": "sha256:b3dfe65a6761e51ccd2eeaf458d70eb012b526d2fd8eba117c99ec8e04e8d338",
-        "check_gpg": true
       }
     ]
-  },
-  "no-image-info": true
+  }
 }
diff --git a/test/data/manifests/rhel_86-x86_64-gce_rhui-boot.json b/test/data/manifests/rhel_86-x86_64-gce_rhui-boot.json
index 90553696b..9958559a4 100644
--- a/test/data/manifests/rhel_86-x86_64-gce_rhui-boot.json
+++ b/test/data/manifests/rhel_86-x86_64-gce_rhui-boot.json
@@ -2192,14 +2192,6 @@
                         "rpm.check_gpg": true
                       }
                     }
-                  },
-                  {
-                    "id": "sha256:b3dfe65a6761e51ccd2eeaf458d70eb012b526d2fd8eba117c99ec8e04e8d338",
-                    "options": {
-                      "metadata": {
-                        "rpm.check_gpg": true
-                      }
-                    }
                   }
                 ]
               }
@@ -2347,20 +2339,6 @@
                   "name": "Google Compute Engine",
                   "gpgcheck": true,
                   "repo_gpgcheck": false
-                },
-                {
-                  "id": "google-cloud-sdk",
-                  "baseurl": [
-                    "https://packages.cloud.google.com/yum/repos/cloud-sdk-el8-x86_64"
-                  ],
-                  "enabled": true,
-                  "gpgkey": [
-                    "https://packages.cloud.google.com/yum/doc/yum-key.gpg",
-                    "https://packages.cloud.google.com/yum/doc/rpm-package-key.gpg"
-                  ],
-                  "name": "Google Cloud SDK",
-                  "gpgcheck": true,
-                  "repo_gpgcheck": false
                 }
               ]
             }
@@ -3587,9 +3565,6 @@
           "sha256:b375af1498f005d94bc311b78facf125bb665369016617a4e53fea13227369fc": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.6-20220201/Packages/hwdata-0.314-8.11.el8.noarch.rpm"
           },
-          "sha256:b3dfe65a6761e51ccd2eeaf458d70eb012b526d2fd8eba117c99ec8e04e8d338": {
-            "url": "https://rpmrepo.osbuild.org/v2/mirror/public/el8/el8-x86_64-google-cloud-sdk-20220227/Packages/b3dfe65a6761e51ccd2eeaf458d70eb012b526d2fd8eba117c99ec8e04e8d338-google-cloud-sdk-374.0.0-1.x86_64.rpm"
-          },
           "sha256:b41c194ecf358e8e6cec46068c4fb6f34780ee2bd65200c367b94170103a8aa9": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.6-20220201/Packages/ima-evm-utils-1.3.2-12.el8.x86_64.rpm"
           },
@@ -10239,18 +10214,7 @@
         "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/public/el8/el8-x86_64-google-compute-engine-20220227/Packages/6ecb3fb45a961a54e079c8cca128ee8d154906564da63d63be318779c5176296-google-rhui-client-rhel8-2.1-1.noarch.rpm",
         "checksum": "sha256:6ecb3fb45a961a54e079c8cca128ee8d154906564da63d63be318779c5176296",
         "check_gpg": true
-      },
-      {
-        "name": "google-cloud-sdk",
-        "epoch": 0,
-        "version": "374.0.0",
-        "release": "1",
-        "arch": "x86_64",
-        "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/public/el8/el8-x86_64-google-cloud-sdk-20220227/Packages/b3dfe65a6761e51ccd2eeaf458d70eb012b526d2fd8eba117c99ec8e04e8d338-google-cloud-sdk-374.0.0-1.x86_64.rpm",
-        "checksum": "sha256:b3dfe65a6761e51ccd2eeaf458d70eb012b526d2fd8eba117c99ec8e04e8d338",
-        "check_gpg": true
       }
     ]
-  },
-  "no-image-info": true
+  }
 }
diff --git a/test/data/manifests/rhel_87-x86_64-gce-boot.json b/test/data/manifests/rhel_87-x86_64-gce-boot.json
index a48245aea..9e2ce616a 100644
--- a/test/data/manifests/rhel_87-x86_64-gce-boot.json
+++ b/test/data/manifests/rhel_87-x86_64-gce-boot.json
@@ -2178,14 +2178,6 @@
                         "rpm.check_gpg": true
                       }
                     }
-                  },
-                  {
-                    "id": "sha256:b3dfe65a6761e51ccd2eeaf458d70eb012b526d2fd8eba117c99ec8e04e8d338",
-                    "options": {
-                      "metadata": {
-                        "rpm.check_gpg": true
-                      }
-                    }
                   }
                 ]
               }
@@ -2330,20 +2322,6 @@
                   "name": "Google Compute Engine",
                   "gpgcheck": true,
                   "repo_gpgcheck": false
-                },
-                {
-                  "id": "google-cloud-sdk",
-                  "baseurl": [
-                    "https://packages.cloud.google.com/yum/repos/cloud-sdk-el8-x86_64"
-                  ],
-                  "enabled": true,
-                  "gpgkey": [
-                    "https://packages.cloud.google.com/yum/doc/yum-key.gpg",
-                    "https://packages.cloud.google.com/yum/doc/rpm-package-key.gpg"
-                  ],
-                  "name": "Google Cloud SDK",
-                  "gpgcheck": true,
-                  "repo_gpgcheck": false
                 }
               ]
             }
@@ -3522,9 +3500,6 @@
           "sha256:b3056b22b99fdf7a10647ab30a5c2af408216cf33c3be56653f51b85ca90cb86": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-appstream-n8.7-20220415/Packages/libfastjson-0.99.9-1.el8.x86_64.rpm"
           },
-          "sha256:b3dfe65a6761e51ccd2eeaf458d70eb012b526d2fd8eba117c99ec8e04e8d338": {
-            "url": "https://rpmrepo.osbuild.org/v2/mirror/public/el8/el8-x86_64-google-cloud-sdk-20220227/Packages/b3dfe65a6761e51ccd2eeaf458d70eb012b526d2fd8eba117c99ec8e04e8d338-google-cloud-sdk-374.0.0-1.x86_64.rpm"
-          },
           "sha256:b41c194ecf358e8e6cec46068c4fb6f34780ee2bd65200c367b94170103a8aa9": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.7-20220415/Packages/ima-evm-utils-1.3.2-12.el8.x86_64.rpm"
           },
@@ -10185,18 +10160,7 @@
         "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/public/el8/el8-x86_64-google-compute-engine-20220227/Packages/8e425325aa0bd3420a428d20cb894c7c619f6da58fc25cab6339b5137c1c77fe-google-osconfig-agent-20211117.00-g1.el8.x86_64.rpm",
         "checksum": "sha256:8e425325aa0bd3420a428d20cb894c7c619f6da58fc25cab6339b5137c1c77fe",
         "check_gpg": true
-      },
-      {
-        "name": "google-cloud-sdk",
-        "epoch": 0,
-        "version": "374.0.0",
-        "release": "1",
-        "arch": "x86_64",
-        "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/public/el8/el8-x86_64-google-cloud-sdk-20220227/Packages/b3dfe65a6761e51ccd2eeaf458d70eb012b526d2fd8eba117c99ec8e04e8d338-google-cloud-sdk-374.0.0-1.x86_64.rpm",
-        "checksum": "sha256:b3dfe65a6761e51ccd2eeaf458d70eb012b526d2fd8eba117c99ec8e04e8d338",
-        "check_gpg": true
       }
     ]
-  },
-  "no-image-info": true
+  }
 }
diff --git a/test/data/manifests/rhel_87-x86_64-gce_rhui-boot.json b/test/data/manifests/rhel_87-x86_64-gce_rhui-boot.json
index d612e8082..ffdf47a8c 100644
--- a/test/data/manifests/rhel_87-x86_64-gce_rhui-boot.json
+++ b/test/data/manifests/rhel_87-x86_64-gce_rhui-boot.json
@@ -2186,14 +2186,6 @@
                         "rpm.check_gpg": true
                       }
                     }
-                  },
-                  {
-                    "id": "sha256:b3dfe65a6761e51ccd2eeaf458d70eb012b526d2fd8eba117c99ec8e04e8d338",
-                    "options": {
-                      "metadata": {
-                        "rpm.check_gpg": true
-                      }
-                    }
                   }
                 ]
               }
@@ -2341,20 +2333,6 @@
                   "name": "Google Compute Engine",
                   "gpgcheck": true,
                   "repo_gpgcheck": false
-                },
-                {
-                  "id": "google-cloud-sdk",
-                  "baseurl": [
-                    "https://packages.cloud.google.com/yum/repos/cloud-sdk-el8-x86_64"
-                  ],
-                  "enabled": true,
-                  "gpgkey": [
-                    "https://packages.cloud.google.com/yum/doc/yum-key.gpg",
-                    "https://packages.cloud.google.com/yum/doc/rpm-package-key.gpg"
-                  ],
-                  "name": "Google Cloud SDK",
-                  "gpgcheck": true,
-                  "repo_gpgcheck": false
                 }
               ]
             }
@@ -3536,9 +3514,6 @@
           "sha256:b3056b22b99fdf7a10647ab30a5c2af408216cf33c3be56653f51b85ca90cb86": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-appstream-n8.7-20220415/Packages/libfastjson-0.99.9-1.el8.x86_64.rpm"
           },
-          "sha256:b3dfe65a6761e51ccd2eeaf458d70eb012b526d2fd8eba117c99ec8e04e8d338": {
-            "url": "https://rpmrepo.osbuild.org/v2/mirror/public/el8/el8-x86_64-google-cloud-sdk-20220227/Packages/b3dfe65a6761e51ccd2eeaf458d70eb012b526d2fd8eba117c99ec8e04e8d338-google-cloud-sdk-374.0.0-1.x86_64.rpm"
-          },
           "sha256:b41c194ecf358e8e6cec46068c4fb6f34780ee2bd65200c367b94170103a8aa9": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.7-20220415/Packages/ima-evm-utils-1.3.2-12.el8.x86_64.rpm"
           },
@@ -10209,18 +10184,7 @@
         "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/public/el8/el8-x86_64-google-compute-engine-20220227/Packages/6ecb3fb45a961a54e079c8cca128ee8d154906564da63d63be318779c5176296-google-rhui-client-rhel8-2.1-1.noarch.rpm",
         "checksum": "sha256:6ecb3fb45a961a54e079c8cca128ee8d154906564da63d63be318779c5176296",
         "check_gpg": true
-      },
-      {
-        "name": "google-cloud-sdk",
-        "epoch": 0,
-        "version": "374.0.0",
-        "release": "1",
-        "arch": "x86_64",
-        "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/public/el8/el8-x86_64-google-cloud-sdk-20220227/Packages/b3dfe65a6761e51ccd2eeaf458d70eb012b526d2fd8eba117c99ec8e04e8d338-google-cloud-sdk-374.0.0-1.x86_64.rpm",
-        "checksum": "sha256:b3dfe65a6761e51ccd2eeaf458d70eb012b526d2fd8eba117c99ec8e04e8d338",
-        "check_gpg": true
       }
     ]
-  },
-  "no-image-info": true
+  }
 }
diff --git a/test/data/manifests/rhel_90-x86_64-gce-boot.json b/test/data/manifests/rhel_90-x86_64-gce-boot.json
index a56ce356c..c119af364 100644
--- a/test/data/manifests/rhel_90-x86_64-gce-boot.json
+++ b/test/data/manifests/rhel_90-x86_64-gce-boot.json
@@ -17,6 +17,7 @@
       {
         "name": "google-compute-engine",
         "baseurl": "https://rpmrepo.osbuild.org/v2/mirror/public/el9/el9-x86_64-google-compute-engine-20220617",
+        "check_gpg": false,
         "image_type_tags": [
           "gce",
           "gce-rhui"
@@ -25,6 +26,7 @@
       {
         "name": "google-cloud-sdk",
         "baseurl": "https://rpmrepo.osbuild.org/v2/mirror/public/el9/el9-x86_64-google-cloud-sdk-20220617",
+        "check_gpg": false,
         "image_type_tags": [
           "gce",
           "gce-rhui"
@@ -2004,9 +2006,6 @@
                   },
                   {
                     "id": "sha256:2b5574f535a3f3c337b8b1961cfb2a5ff06a36c9969ff5258df7ae1ffbe56e41"
-                  },
-                  {
-                    "id": "sha256:87c6d9bd4811b2ef1582f81e8fb30301dd56e067d0358a2cdadd15b4b07424c9"
                   }
                 ]
               }
@@ -2149,21 +2148,7 @@
                     "https://packages.cloud.google.com/yum/doc/rpm-package-key.gpg"
                   ],
                   "name": "Google Compute Engine",
-                  "gpgcheck": true,
-                  "repo_gpgcheck": false
-                },
-                {
-                  "id": "google-cloud-sdk",
-                  "baseurl": [
-                    "https://packages.cloud.google.com/yum/repos/cloud-sdk-el9-x86_64"
-                  ],
-                  "enabled": true,
-                  "gpgkey": [
-                    "https://packages.cloud.google.com/yum/doc/yum-key.gpg",
-                    "https://packages.cloud.google.com/yum/doc/rpm-package-key.gpg"
-                  ],
-                  "name": "Google Cloud SDK",
-                  "gpgcheck": true,
+                  "gpgcheck": false,
                   "repo_gpgcheck": false
                 }
               ]
@@ -3101,9 +3086,6 @@
           "sha256:8743d4eab6e262efbe770232eb34c3fb5f0c304531b97cc95442ed6c7c8e2909": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el9/el9-x86_64-appstream-n9.0-20220208/Packages/libblockdev-loop-2.25-11.el9.x86_64.rpm"
           },
-          "sha256:87c6d9bd4811b2ef1582f81e8fb30301dd56e067d0358a2cdadd15b4b07424c9": {
-            "url": "https://rpmrepo.osbuild.org/v2/mirror/public/el9/el9-x86_64-google-cloud-sdk-20220617/Packages/87c6d9bd4811b2ef1582f81e8fb30301dd56e067d0358a2cdadd15b4b07424c9-google-cloud-sdk-390.0.0-1.x86_64.rpm"
-          },
           "sha256:887b23796b57b9e476f916c32b27d446a4db40957b92940519162ea7ba1689cc": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el9/el9-x86_64-appstream-n9.0-20220208/Packages/libblockdev-mdraid-2.25-11.el9.x86_64.rpm"
           },
@@ -9516,17 +9498,7 @@
         "arch": "x86_64",
         "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/public/el9/el9-x86_64-google-compute-engine-20220617/Packages/2b5574f535a3f3c337b8b1961cfb2a5ff06a36c9969ff5258df7ae1ffbe56e41-google-osconfig-agent-20220606.00-g1.el9.x86_64.rpm",
         "checksum": "sha256:2b5574f535a3f3c337b8b1961cfb2a5ff06a36c9969ff5258df7ae1ffbe56e41"
-      },
-      {
-        "name": "google-cloud-sdk",
-        "epoch": 0,
-        "version": "390.0.0",
-        "release": "1",
-        "arch": "x86_64",
-        "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/public/el9/el9-x86_64-google-cloud-sdk-20220617/Packages/87c6d9bd4811b2ef1582f81e8fb30301dd56e067d0358a2cdadd15b4b07424c9-google-cloud-sdk-390.0.0-1.x86_64.rpm",
-        "checksum": "sha256:87c6d9bd4811b2ef1582f81e8fb30301dd56e067d0358a2cdadd15b4b07424c9"
       }
     ]
-  },
-  "no-image-info": true
+  }
 }
diff --git a/test/data/manifests/rhel_90-x86_64-gce_rhui-boot.json b/test/data/manifests/rhel_90-x86_64-gce_rhui-boot.json
index 32dabfa1d..76b6be3e0 100644
--- a/test/data/manifests/rhel_90-x86_64-gce_rhui-boot.json
+++ b/test/data/manifests/rhel_90-x86_64-gce_rhui-boot.json
@@ -17,6 +17,7 @@
       {
         "name": "google-compute-engine",
         "baseurl": "https://rpmrepo.osbuild.org/v2/mirror/public/el9/el9-x86_64-google-compute-engine-20220617",
+        "check_gpg": false,
         "image_type_tags": [
           "gce",
           "gce-rhui"
@@ -25,6 +26,7 @@
       {
         "name": "google-cloud-sdk",
         "baseurl": "https://rpmrepo.osbuild.org/v2/mirror/public/el9/el9-x86_64-google-cloud-sdk-20220617",
+        "check_gpg": false,
         "image_type_tags": [
           "gce",
           "gce-rhui"
@@ -2007,9 +2009,6 @@
                   },
                   {
                     "id": "sha256:92edd5aa48d52929de6725b944840f14d3e1d9288dd2ca8ae083e78815fd89a7"
-                  },
-                  {
-                    "id": "sha256:87c6d9bd4811b2ef1582f81e8fb30301dd56e067d0358a2cdadd15b4b07424c9"
                   }
                 ]
               }
@@ -2155,21 +2154,7 @@
                     "https://packages.cloud.google.com/yum/doc/rpm-package-key.gpg"
                   ],
                   "name": "Google Compute Engine",
-                  "gpgcheck": true,
-                  "repo_gpgcheck": false
-                },
-                {
-                  "id": "google-cloud-sdk",
-                  "baseurl": [
-                    "https://packages.cloud.google.com/yum/repos/cloud-sdk-el9-x86_64"
-                  ],
-                  "enabled": true,
-                  "gpgkey": [
-                    "https://packages.cloud.google.com/yum/doc/yum-key.gpg",
-                    "https://packages.cloud.google.com/yum/doc/rpm-package-key.gpg"
-                  ],
-                  "name": "Google Cloud SDK",
-                  "gpgcheck": true,
+                  "gpgcheck": false,
                   "repo_gpgcheck": false
                 }
               ]
@@ -3107,9 +3092,6 @@
           "sha256:8743d4eab6e262efbe770232eb34c3fb5f0c304531b97cc95442ed6c7c8e2909": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el9/el9-x86_64-appstream-n9.0-20220208/Packages/libblockdev-loop-2.25-11.el9.x86_64.rpm"
           },
-          "sha256:87c6d9bd4811b2ef1582f81e8fb30301dd56e067d0358a2cdadd15b4b07424c9": {
-            "url": "https://rpmrepo.osbuild.org/v2/mirror/public/el9/el9-x86_64-google-cloud-sdk-20220617/Packages/87c6d9bd4811b2ef1582f81e8fb30301dd56e067d0358a2cdadd15b4b07424c9-google-cloud-sdk-390.0.0-1.x86_64.rpm"
-          },
           "sha256:887b23796b57b9e476f916c32b27d446a4db40957b92940519162ea7ba1689cc": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el9/el9-x86_64-appstream-n9.0-20220208/Packages/libblockdev-mdraid-2.25-11.el9.x86_64.rpm"
           },
@@ -9534,17 +9516,7 @@
         "arch": "noarch",
         "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/public/el9/el9-x86_64-google-compute-engine-20220617/Packages/92edd5aa48d52929de6725b944840f14d3e1d9288dd2ca8ae083e78815fd89a7-google-rhui-client-rhel9-4.1-1.noarch.rpm",
         "checksum": "sha256:92edd5aa48d52929de6725b944840f14d3e1d9288dd2ca8ae083e78815fd89a7"
-      },
-      {
-        "name": "google-cloud-sdk",
-        "epoch": 0,
-        "version": "390.0.0",
-        "release": "1",
-        "arch": "x86_64",
-        "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/public/el9/el9-x86_64-google-cloud-sdk-20220617/Packages/87c6d9bd4811b2ef1582f81e8fb30301dd56e067d0358a2cdadd15b4b07424c9-google-cloud-sdk-390.0.0-1.x86_64.rpm",
-        "checksum": "sha256:87c6d9bd4811b2ef1582f81e8fb30301dd56e067d0358a2cdadd15b4b07424c9"
       }
     ]
-  },
-  "no-image-info": true
+  }
 }
diff --git a/test/data/manifests/rhel_91-x86_64-gce-boot.json b/test/data/manifests/rhel_91-x86_64-gce-boot.json
index d74e4ba83..9da731311 100644
--- a/test/data/manifests/rhel_91-x86_64-gce-boot.json
+++ b/test/data/manifests/rhel_91-x86_64-gce-boot.json
@@ -20,6 +20,7 @@
         "name": "google-compute-engine",
         "baseurl": "https://rpmrepo.osbuild.org/v2/mirror/public/el9/el9-x86_64-google-compute-engine-20220617",
         "gpgkey": "-----BEGIN PGP PUBLIC KEY BLOCK-----\n\n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\nICgvL2RlcG90L2dvb2dsZTMvcHJvZHVjdGlvbi9ib3JnL2Nsb3VkLXJhcHR1cmUv\na2V5cy9jbG91ZC1yYXB0dXJlLXB1YmtleXMvY2xvdWQtcmFwdHVyZS1zaWduaW5n\nLWtleS0yMDIwLTEyLTAzLTE2XzA4XzA1LnB1YikgPGdsaW51eC10ZWFtQGdvb2ds\nZS5jb20+iQEoBBMBCAAcBQJfyX5eCRCLV8XCg29L6wIbAwUJA8MKsAIZAQAAQXoI\nAJp6SujppQkl3eZW2u0s457BXx63WN6nl7Cak6t7D+lqNFUF4htXVrBWfT/wRx6c\nV6OY/pYVx0Jai4NUhL9CZEVBX03phc3w+LBqWtFXdtMoUEeTBrVwQfgBp8IajRwO\n8lvw3cmcz9GZvUpIYqvtlemaQu1hWqvoeDOX6yeuUfRfCyXmvdLK+oGC9FhNApmk\nqqYER3W52J5WgtIX3zyQp40OMVr5DVKNk8Zb5e6SATyQFRtIPHxjyroKzOHdVVj7\nklR6qKZGAnYANjb/eUS0Bk62bBwGWFjRw9ZWqBrXgTuRMZJYoLpb3o1/L0rsvhim\nnydMwSu6zXzVqrDA18yqeme5AQ0EX8l+XgEIAMNKH4p0F42MhyVVWdEq3RBPnn3f\nIXhZVm39OA25oRnm8qSeihVUir5wkh9j/eVSqrxN7h0SOh20XIp7le56CjqqPOzx\nNgV0IAdeldGhSiVPXib6qQnyuFKuk3RPEiNYlsl2bc2WuBNqblEonDdKHKk1THKi\nWcd6VfGrIoMKTEFIOZHrFx1+3fB1CXkiQgDDF7qfLCZJS2md0YtEl0mtomJpYXYg\nGMU2De9MRiPh6h6Fl3heu8TItWsxspnmbp/WjpBRG7NKtQf0lP+K9moKaE+miwKV\nddfRtuL0rRn/65XKTq/vqazc7nSsirQvRh6Ezwb76qYY7jbX7SoIuR0Pn+MAEQEA\nAYkBHwQYAQgAEwUCX8l+XgkQi1fFwoNvS+sCGwwAABsaCADDuWFJYSVmkZXVIjZv\nYrbo8H3d9UjW1BhXftYgSUImxqMX79kN8knZ3qdy5BKV4flZFxxziFl8rDKwD96m\nqsKfBzvIqxOhnizDzGwkXVS1DkQ22R0CtWIEkdLhjZVnkMRSavkSCEa1kWH1rpou\nh4xUz+etkIuy0NWg8oSkuiQe7+B5sLB9P+f1TV2iUUii+Dp4oAKXnE7H6vNwBWnt\nHg/nbuN9+53Pd0ox0uE+uy0bTDlhvJ88/BYw4+n6RQXjl5h1HuQoqTT1Wsk2QQYn\nQpBDqKapHVOfSTK7hy+R+qcJQXSuufsJ0GotIK/VBGGCvpMKFB/vKdaw/PmAZ1WO\nHe0jmQENBGCRt7MBCADkYJHHQQoL6tKrW/LbmfR9ljz7ib2aWno4JO3VKQvLwjyU\nMPpq/SXXMOnx8jXwgWizpPxQYDRJ0SQXS9ULJ1hXRL/OgMnZAYvYDeV2jBnKsAIE\ndiG/e1qm8P4W9qpWJc+hNq7FOT13RzGWRx57SdLWSXo0KeY38r9lvjjOmT/cuOcm\njwlDT9XYf/RSO+yJ/AsyMdAr+ZbDeQUd9HYJiPdI04lGaGM02MjDMnx+monc+y54\nt+Z+ry1WtQdzoQt9dHlIPlV1tR+xV5DHHsejCZxu9TWzzSlL5wfBBeEz7R/OIziv\nGJpWQdJzd+2QDXSRg9q2XYWP5ZVtSgjVVJjNlb6ZABEBAAG0VEFydGlmYWN0IFJl\nZ2lzdHJ5IFJlcG9zaXRvcnkgU2lnbmVyIDxhcnRpZmFjdC1yZWdpc3RyeS1yZXBv\nc2l0b3J5LXNpZ25lckBnb29nbGUuY29tPokBTgQTAQoAOBYhBDW6oLM+nrOW9Zyo\nOMC6XObcYxWjBQJgkbezAhsDBQsJCAcCBhUKCQgLAgQWAgMBAh4BAheAAAoJEMC6\nXObcYxWj+igIAMFh6DrAYMeq9sbZ1ZG6oAMrinUheGQbEqe76nIDQNsZnhDwZ2wW\nqgVC7DgOMqlhQmOmzm7M6Nzmq2dvPwq3xC2OeI9fQyzjT72deBTzLP7PJok9PJFO\nMdLfILSsUnmMsheQt4DUO0jYAX2KUuWOIXXJaZ319QyoRNBPYa5qz7qXS7wHLOY8\n9IDqfHt6Aud8ER5zhyOyhytcYMeaGC1g1IKWmgewnhEq02FantMJGlmmFi2eA0EP\nD02GC3742QGqRxLwjWsm5/TpyuU24EYKRGCRm7QdVIo3ugFSetKrn0byOxWGBvtu\n4fH8XWvZkRT+u+yzH1s5yFYBqc2JTrrJvRU=\n=0lhn\n-----END PGP PUBLIC KEY BLOCK-----\n-----BEGIN PGP PUBLIC KEY BLOCK-----\nVersion: GnuPG v1\n\nmQENBFWKtqgBCADmKQWYQF9YoPxLEQZ5XA6DFVg9ZHG4HIuehsSJETMPQ+W9K5c5\nUs5assCZBjG/k5i62SmWb09eHtWsbbEgexURBWJ7IxA8kM3kpTo7bx+LqySDsSC3\n/8JRkiyibVV0dDNv/EzRQsGDxmk5Xl8SbQJ/C2ECSUT2ok225f079m2VJsUGHG+5\nRpyHHgoMaRNedYP8ksYBPSD6sA3Xqpsh/0cF4sm8QtmsxkBmCCIjBa0B0LybDtdX\nXIq5kPJsIrC2zvERIPm1ez/9FyGmZKEFnBGeFC45z5U//pHdB1z03dYKGrKdDpID\n17kNbC5wl24k/IeYyTY9IutMXvuNbVSXaVtRABEBAAG0Okdvb2dsZSBDbG91ZCBQ\nYWNrYWdlcyBSUE0gU2lnbmluZyBLZXkgPGdjLXRlYW1AZ29vZ2xlLmNvbT6JATgE\nEwECACIFAlWKtqgCGy8GCwkIBwMCBhUIAgkKCwQWAgMBAh4BAheAAAoJEPCcOUw+\nG6jV+QwH/0wRH+XovIwLGfkg6kYLEvNPvOIYNQWnrT6zZ+XcV47WkJ+i5SR+QpUI\nudMSWVf4nkv+XVHruxydafRIeocaXY0E8EuIHGBSB2KR3HxG6JbgUiWlCVRNt4Qd\n6udC6Ep7maKEIpO40M8UHRuKrp4iLGIhPm3ELGO6uc8rks8qOBMH4ozU+3PB9a0b\nGnPBEsZdOBI1phyftLyyuEvG8PeUYD+uzSx8jp9xbMg66gQRMP9XGzcCkD+b8w1o\n7v3J3juKKpgvx5Lqwvwv2ywqn/Wr5d5OBCHEw8KtU/tfxycz/oo6XUIshgEbS/+P\n6yKDuYhRp6qxrYXjmAszIT25cftb4d4=\n=/PbX\n-----END PGP PUBLIC KEY BLOCK-----",
+        "check_gpg": false,
         "image_type_tags": [
           "gce",
           "gce-rhui"
@@ -29,6 +30,7 @@
         "name": "google-cloud-sdk",
         "baseurl": "https://rpmrepo.osbuild.org/v2/mirror/public/el9/el9-x86_64-google-cloud-sdk-20220617",
         "gpgkey": "-----BEGIN PGP PUBLIC KEY BLOCK-----\n\n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\nICgvL2RlcG90L2dvb2dsZTMvcHJvZHVjdGlvbi9ib3JnL2Nsb3VkLXJhcHR1cmUv\na2V5cy9jbG91ZC1yYXB0dXJlLXB1YmtleXMvY2xvdWQtcmFwdHVyZS1zaWduaW5n\nLWtleS0yMDIwLTEyLTAzLTE2XzA4XzA1LnB1YikgPGdsaW51eC10ZWFtQGdvb2ds\nZS5jb20+iQEoBBMBCAAcBQJfyX5eCRCLV8XCg29L6wIbAwUJA8MKsAIZAQAAQXoI\nAJp6SujppQkl3eZW2u0s457BXx63WN6nl7Cak6t7D+lqNFUF4htXVrBWfT/wRx6c\nV6OY/pYVx0Jai4NUhL9CZEVBX03phc3w+LBqWtFXdtMoUEeTBrVwQfgBp8IajRwO\n8lvw3cmcz9GZvUpIYqvtlemaQu1hWqvoeDOX6yeuUfRfCyXmvdLK+oGC9FhNApmk\nqqYER3W52J5WgtIX3zyQp40OMVr5DVKNk8Zb5e6SATyQFRtIPHxjyroKzOHdVVj7\nklR6qKZGAnYANjb/eUS0Bk62bBwGWFjRw9ZWqBrXgTuRMZJYoLpb3o1/L0rsvhim\nnydMwSu6zXzVqrDA18yqeme5AQ0EX8l+XgEIAMNKH4p0F42MhyVVWdEq3RBPnn3f\nIXhZVm39OA25oRnm8qSeihVUir5wkh9j/eVSqrxN7h0SOh20XIp7le56CjqqPOzx\nNgV0IAdeldGhSiVPXib6qQnyuFKuk3RPEiNYlsl2bc2WuBNqblEonDdKHKk1THKi\nWcd6VfGrIoMKTEFIOZHrFx1+3fB1CXkiQgDDF7qfLCZJS2md0YtEl0mtomJpYXYg\nGMU2De9MRiPh6h6Fl3heu8TItWsxspnmbp/WjpBRG7NKtQf0lP+K9moKaE+miwKV\nddfRtuL0rRn/65XKTq/vqazc7nSsirQvRh6Ezwb76qYY7jbX7SoIuR0Pn+MAEQEA\nAYkBHwQYAQgAEwUCX8l+XgkQi1fFwoNvS+sCGwwAABsaCADDuWFJYSVmkZXVIjZv\nYrbo8H3d9UjW1BhXftYgSUImxqMX79kN8knZ3qdy5BKV4flZFxxziFl8rDKwD96m\nqsKfBzvIqxOhnizDzGwkXVS1DkQ22R0CtWIEkdLhjZVnkMRSavkSCEa1kWH1rpou\nh4xUz+etkIuy0NWg8oSkuiQe7+B5sLB9P+f1TV2iUUii+Dp4oAKXnE7H6vNwBWnt\nHg/nbuN9+53Pd0ox0uE+uy0bTDlhvJ88/BYw4+n6RQXjl5h1HuQoqTT1Wsk2QQYn\nQpBDqKapHVOfSTK7hy+R+qcJQXSuufsJ0GotIK/VBGGCvpMKFB/vKdaw/PmAZ1WO\nHe0jmQENBGCRt7MBCADkYJHHQQoL6tKrW/LbmfR9ljz7ib2aWno4JO3VKQvLwjyU\nMPpq/SXXMOnx8jXwgWizpPxQYDRJ0SQXS9ULJ1hXRL/OgMnZAYvYDeV2jBnKsAIE\ndiG/e1qm8P4W9qpWJc+hNq7FOT13RzGWRx57SdLWSXo0KeY38r9lvjjOmT/cuOcm\njwlDT9XYf/RSO+yJ/AsyMdAr+ZbDeQUd9HYJiPdI04lGaGM02MjDMnx+monc+y54\nt+Z+ry1WtQdzoQt9dHlIPlV1tR+xV5DHHsejCZxu9TWzzSlL5wfBBeEz7R/OIziv\nGJpWQdJzd+2QDXSRg9q2XYWP5ZVtSgjVVJjNlb6ZABEBAAG0VEFydGlmYWN0IFJl\nZ2lzdHJ5IFJlcG9zaXRvcnkgU2lnbmVyIDxhcnRpZmFjdC1yZWdpc3RyeS1yZXBv\nc2l0b3J5LXNpZ25lckBnb29nbGUuY29tPokBTgQTAQoAOBYhBDW6oLM+nrOW9Zyo\nOMC6XObcYxWjBQJgkbezAhsDBQsJCAcCBhUKCQgLAgQWAgMBAh4BAheAAAoJEMC6\nXObcYxWj+igIAMFh6DrAYMeq9sbZ1ZG6oAMrinUheGQbEqe76nIDQNsZnhDwZ2wW\nqgVC7DgOMqlhQmOmzm7M6Nzmq2dvPwq3xC2OeI9fQyzjT72deBTzLP7PJok9PJFO\nMdLfILSsUnmMsheQt4DUO0jYAX2KUuWOIXXJaZ319QyoRNBPYa5qz7qXS7wHLOY8\n9IDqfHt6Aud8ER5zhyOyhytcYMeaGC1g1IKWmgewnhEq02FantMJGlmmFi2eA0EP\nD02GC3742QGqRxLwjWsm5/TpyuU24EYKRGCRm7QdVIo3ugFSetKrn0byOxWGBvtu\n4fH8XWvZkRT+u+yzH1s5yFYBqc2JTrrJvRU=\n=0lhn\n-----END PGP PUBLIC KEY BLOCK-----\n-----BEGIN PGP PUBLIC KEY BLOCK-----\nVersion: GnuPG v1\n\nmQENBFWKtqgBCADmKQWYQF9YoPxLEQZ5XA6DFVg9ZHG4HIuehsSJETMPQ+W9K5c5\nUs5assCZBjG/k5i62SmWb09eHtWsbbEgexURBWJ7IxA8kM3kpTo7bx+LqySDsSC3\n/8JRkiyibVV0dDNv/EzRQsGDxmk5Xl8SbQJ/C2ECSUT2ok225f079m2VJsUGHG+5\nRpyHHgoMaRNedYP8ksYBPSD6sA3Xqpsh/0cF4sm8QtmsxkBmCCIjBa0B0LybDtdX\nXIq5kPJsIrC2zvERIPm1ez/9FyGmZKEFnBGeFC45z5U//pHdB1z03dYKGrKdDpID\n17kNbC5wl24k/IeYyTY9IutMXvuNbVSXaVtRABEBAAG0Okdvb2dsZSBDbG91ZCBQ\nYWNrYWdlcyBSUE0gU2lnbmluZyBLZXkgPGdjLXRlYW1AZ29vZ2xlLmNvbT6JATgE\nEwECACIFAlWKtqgCGy8GCwkIBwMCBhUIAgkKCwQWAgMBAh4BAheAAAoJEPCcOUw+\nG6jV+QwH/0wRH+XovIwLGfkg6kYLEvNPvOIYNQWnrT6zZ+XcV47WkJ+i5SR+QpUI\nudMSWVf4nkv+XVHruxydafRIeocaXY0E8EuIHGBSB2KR3HxG6JbgUiWlCVRNt4Qd\n6udC6Ep7maKEIpO40M8UHRuKrp4iLGIhPm3ELGO6uc8rks8qOBMH4ozU+3PB9a0b\nGnPBEsZdOBI1phyftLyyuEvG8PeUYD+uzSx8jp9xbMg66gQRMP9XGzcCkD+b8w1o\n7v3J3juKKpgvx5Lqwvwv2ywqn/Wr5d5OBCHEw8KtU/tfxycz/oo6XUIshgEbS/+P\n6yKDuYhRp6qxrYXjmAszIT25cftb4d4=\n=/PbX\n-----END PGP PUBLIC KEY BLOCK-----",
+        "check_gpg": false,
         "image_type_tags": [
           "gce",
           "gce-rhui"
@@ -5164,9 +5166,6 @@
                   },
                   {
                     "id": "sha256:2b5574f535a3f3c337b8b1961cfb2a5ff06a36c9969ff5258df7ae1ffbe56e41"
-                  },
-                  {
-                    "id": "sha256:87c6d9bd4811b2ef1582f81e8fb30301dd56e067d0358a2cdadd15b4b07424c9"
                   }
                 ]
               }
@@ -5311,21 +5310,7 @@
                     "https://packages.cloud.google.com/yum/doc/rpm-package-key.gpg"
                   ],
                   "name": "Google Compute Engine",
-                  "gpgcheck": true,
-                  "repo_gpgcheck": false
-                },
-                {
-                  "id": "google-cloud-sdk",
-                  "baseurl": [
-                    "https://packages.cloud.google.com/yum/repos/cloud-sdk-el9-x86_64"
-                  ],
-                  "enabled": true,
-                  "gpgkey": [
-                    "https://packages.cloud.google.com/yum/doc/yum-key.gpg",
-                    "https://packages.cloud.google.com/yum/doc/rpm-package-key.gpg"
-                  ],
-                  "name": "Google Cloud SDK",
-                  "gpgcheck": true,
+                  "gpgcheck": false,
                   "repo_gpgcheck": false
                 }
               ]
@@ -6314,9 +6299,6 @@
           "sha256:877a6bc8658f919581b93af9eb01437cbb35d752b4c3587b9e90aa46a58a7aea": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el9/el9-x86_64-baseos-n9.1-20220324/Packages/cyrus-sasl-lib-2.1.27-20.el9.x86_64.rpm"
           },
-          "sha256:87c6d9bd4811b2ef1582f81e8fb30301dd56e067d0358a2cdadd15b4b07424c9": {
-            "url": "https://rpmrepo.osbuild.org/v2/mirror/public/el9/el9-x86_64-google-cloud-sdk-20220617/Packages/87c6d9bd4811b2ef1582f81e8fb30301dd56e067d0358a2cdadd15b4b07424c9-google-cloud-sdk-390.0.0-1.x86_64.rpm"
-          },
           "sha256:887b23796b57b9e476f916c32b27d446a4db40957b92940519162ea7ba1689cc": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el9/el9-x86_64-appstream-n9.1-20220324/Packages/libblockdev-mdraid-2.25-11.el9.x86_64.rpm"
           },
@@ -13289,17 +13271,7 @@
         "arch": "x86_64",
         "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/public/el9/el9-x86_64-google-compute-engine-20220617/Packages/2b5574f535a3f3c337b8b1961cfb2a5ff06a36c9969ff5258df7ae1ffbe56e41-google-osconfig-agent-20220606.00-g1.el9.x86_64.rpm",
         "checksum": "sha256:2b5574f535a3f3c337b8b1961cfb2a5ff06a36c9969ff5258df7ae1ffbe56e41"
-      },
-      {
-        "name": "google-cloud-sdk",
-        "epoch": 0,
-        "version": "390.0.0",
-        "release": "1",
-        "arch": "x86_64",
-        "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/public/el9/el9-x86_64-google-cloud-sdk-20220617/Packages/87c6d9bd4811b2ef1582f81e8fb30301dd56e067d0358a2cdadd15b4b07424c9-google-cloud-sdk-390.0.0-1.x86_64.rpm",
-        "checksum": "sha256:87c6d9bd4811b2ef1582f81e8fb30301dd56e067d0358a2cdadd15b4b07424c9"
       }
     ]
-  },
-  "no-image-info": true
+  }
 }
diff --git a/test/data/manifests/rhel_91-x86_64-gce_rhui-boot.json b/test/data/manifests/rhel_91-x86_64-gce_rhui-boot.json
index 56fbcef0b..ab1509d92 100644
--- a/test/data/manifests/rhel_91-x86_64-gce_rhui-boot.json
+++ b/test/data/manifests/rhel_91-x86_64-gce_rhui-boot.json
@@ -20,6 +20,7 @@
         "name": "google-compute-engine",
         "baseurl": "https://rpmrepo.osbuild.org/v2/mirror/public/el9/el9-x86_64-google-compute-engine-20220617",
         "gpgkey": "-----BEGIN PGP PUBLIC KEY BLOCK-----\n\n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\nICgvL2RlcG90L2dvb2dsZTMvcHJvZHVjdGlvbi9ib3JnL2Nsb3VkLXJhcHR1cmUv\na2V5cy9jbG91ZC1yYXB0dXJlLXB1YmtleXMvY2xvdWQtcmFwdHVyZS1zaWduaW5n\nLWtleS0yMDIwLTEyLTAzLTE2XzA4XzA1LnB1YikgPGdsaW51eC10ZWFtQGdvb2ds\nZS5jb20+iQEoBBMBCAAcBQJfyX5eCRCLV8XCg29L6wIbAwUJA8MKsAIZAQAAQXoI\nAJp6SujppQkl3eZW2u0s457BXx63WN6nl7Cak6t7D+lqNFUF4htXVrBWfT/wRx6c\nV6OY/pYVx0Jai4NUhL9CZEVBX03phc3w+LBqWtFXdtMoUEeTBrVwQfgBp8IajRwO\n8lvw3cmcz9GZvUpIYqvtlemaQu1hWqvoeDOX6yeuUfRfCyXmvdLK+oGC9FhNApmk\nqqYER3W52J5WgtIX3zyQp40OMVr5DVKNk8Zb5e6SATyQFRtIPHxjyroKzOHdVVj7\nklR6qKZGAnYANjb/eUS0Bk62bBwGWFjRw9ZWqBrXgTuRMZJYoLpb3o1/L0rsvhim\nnydMwSu6zXzVqrDA18yqeme5AQ0EX8l+XgEIAMNKH4p0F42MhyVVWdEq3RBPnn3f\nIXhZVm39OA25oRnm8qSeihVUir5wkh9j/eVSqrxN7h0SOh20XIp7le56CjqqPOzx\nNgV0IAdeldGhSiVPXib6qQnyuFKuk3RPEiNYlsl2bc2WuBNqblEonDdKHKk1THKi\nWcd6VfGrIoMKTEFIOZHrFx1+3fB1CXkiQgDDF7qfLCZJS2md0YtEl0mtomJpYXYg\nGMU2De9MRiPh6h6Fl3heu8TItWsxspnmbp/WjpBRG7NKtQf0lP+K9moKaE+miwKV\nddfRtuL0rRn/65XKTq/vqazc7nSsirQvRh6Ezwb76qYY7jbX7SoIuR0Pn+MAEQEA\nAYkBHwQYAQgAEwUCX8l+XgkQi1fFwoNvS+sCGwwAABsaCADDuWFJYSVmkZXVIjZv\nYrbo8H3d9UjW1BhXftYgSUImxqMX79kN8knZ3qdy5BKV4flZFxxziFl8rDKwD96m\nqsKfBzvIqxOhnizDzGwkXVS1DkQ22R0CtWIEkdLhjZVnkMRSavkSCEa1kWH1rpou\nh4xUz+etkIuy0NWg8oSkuiQe7+B5sLB9P+f1TV2iUUii+Dp4oAKXnE7H6vNwBWnt\nHg/nbuN9+53Pd0ox0uE+uy0bTDlhvJ88/BYw4+n6RQXjl5h1HuQoqTT1Wsk2QQYn\nQpBDqKapHVOfSTK7hy+R+qcJQXSuufsJ0GotIK/VBGGCvpMKFB/vKdaw/PmAZ1WO\nHe0jmQENBGCRt7MBCADkYJHHQQoL6tKrW/LbmfR9ljz7ib2aWno4JO3VKQvLwjyU\nMPpq/SXXMOnx8jXwgWizpPxQYDRJ0SQXS9ULJ1hXRL/OgMnZAYvYDeV2jBnKsAIE\ndiG/e1qm8P4W9qpWJc+hNq7FOT13RzGWRx57SdLWSXo0KeY38r9lvjjOmT/cuOcm\njwlDT9XYf/RSO+yJ/AsyMdAr+ZbDeQUd9HYJiPdI04lGaGM02MjDMnx+monc+y54\nt+Z+ry1WtQdzoQt9dHlIPlV1tR+xV5DHHsejCZxu9TWzzSlL5wfBBeEz7R/OIziv\nGJpWQdJzd+2QDXSRg9q2XYWP5ZVtSgjVVJjNlb6ZABEBAAG0VEFydGlmYWN0IFJl\nZ2lzdHJ5IFJlcG9zaXRvcnkgU2lnbmVyIDxhcnRpZmFjdC1yZWdpc3RyeS1yZXBv\nc2l0b3J5LXNpZ25lckBnb29nbGUuY29tPokBTgQTAQoAOBYhBDW6oLM+nrOW9Zyo\nOMC6XObcYxWjBQJgkbezAhsDBQsJCAcCBhUKCQgLAgQWAgMBAh4BAheAAAoJEMC6\nXObcYxWj+igIAMFh6DrAYMeq9sbZ1ZG6oAMrinUheGQbEqe76nIDQNsZnhDwZ2wW\nqgVC7DgOMqlhQmOmzm7M6Nzmq2dvPwq3xC2OeI9fQyzjT72deBTzLP7PJok9PJFO\nMdLfILSsUnmMsheQt4DUO0jYAX2KUuWOIXXJaZ319QyoRNBPYa5qz7qXS7wHLOY8\n9IDqfHt6Aud8ER5zhyOyhytcYMeaGC1g1IKWmgewnhEq02FantMJGlmmFi2eA0EP\nD02GC3742QGqRxLwjWsm5/TpyuU24EYKRGCRm7QdVIo3ugFSetKrn0byOxWGBvtu\n4fH8XWvZkRT+u+yzH1s5yFYBqc2JTrrJvRU=\n=0lhn\n-----END PGP PUBLIC KEY BLOCK-----\n-----BEGIN PGP PUBLIC KEY BLOCK-----\nVersion: GnuPG v1\n\nmQENBFWKtqgBCADmKQWYQF9YoPxLEQZ5XA6DFVg9ZHG4HIuehsSJETMPQ+W9K5c5\nUs5assCZBjG/k5i62SmWb09eHtWsbbEgexURBWJ7IxA8kM3kpTo7bx+LqySDsSC3\n/8JRkiyibVV0dDNv/EzRQsGDxmk5Xl8SbQJ/C2ECSUT2ok225f079m2VJsUGHG+5\nRpyHHgoMaRNedYP8ksYBPSD6sA3Xqpsh/0cF4sm8QtmsxkBmCCIjBa0B0LybDtdX\nXIq5kPJsIrC2zvERIPm1ez/9FyGmZKEFnBGeFC45z5U//pHdB1z03dYKGrKdDpID\n17kNbC5wl24k/IeYyTY9IutMXvuNbVSXaVtRABEBAAG0Okdvb2dsZSBDbG91ZCBQ\nYWNrYWdlcyBSUE0gU2lnbmluZyBLZXkgPGdjLXRlYW1AZ29vZ2xlLmNvbT6JATgE\nEwECACIFAlWKtqgCGy8GCwkIBwMCBhUIAgkKCwQWAgMBAh4BAheAAAoJEPCcOUw+\nG6jV+QwH/0wRH+XovIwLGfkg6kYLEvNPvOIYNQWnrT6zZ+XcV47WkJ+i5SR+QpUI\nudMSWVf4nkv+XVHruxydafRIeocaXY0E8EuIHGBSB2KR3HxG6JbgUiWlCVRNt4Qd\n6udC6Ep7maKEIpO40M8UHRuKrp4iLGIhPm3ELGO6uc8rks8qOBMH4ozU+3PB9a0b\nGnPBEsZdOBI1phyftLyyuEvG8PeUYD+uzSx8jp9xbMg66gQRMP9XGzcCkD+b8w1o\n7v3J3juKKpgvx5Lqwvwv2ywqn/Wr5d5OBCHEw8KtU/tfxycz/oo6XUIshgEbS/+P\n6yKDuYhRp6qxrYXjmAszIT25cftb4d4=\n=/PbX\n-----END PGP PUBLIC KEY BLOCK-----",
+        "check_gpg": false,
         "image_type_tags": [
           "gce",
           "gce-rhui"
@@ -29,6 +30,7 @@
         "name": "google-cloud-sdk",
         "baseurl": "https://rpmrepo.osbuild.org/v2/mirror/public/el9/el9-x86_64-google-cloud-sdk-20220617",
         "gpgkey": "-----BEGIN PGP PUBLIC KEY BLOCK-----\n\n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\nICgvL2RlcG90L2dvb2dsZTMvcHJvZHVjdGlvbi9ib3JnL2Nsb3VkLXJhcHR1cmUv\na2V5cy9jbG91ZC1yYXB0dXJlLXB1YmtleXMvY2xvdWQtcmFwdHVyZS1zaWduaW5n\nLWtleS0yMDIwLTEyLTAzLTE2XzA4XzA1LnB1YikgPGdsaW51eC10ZWFtQGdvb2ds\nZS5jb20+iQEoBBMBCAAcBQJfyX5eCRCLV8XCg29L6wIbAwUJA8MKsAIZAQAAQXoI\nAJp6SujppQkl3eZW2u0s457BXx63WN6nl7Cak6t7D+lqNFUF4htXVrBWfT/wRx6c\nV6OY/pYVx0Jai4NUhL9CZEVBX03phc3w+LBqWtFXdtMoUEeTBrVwQfgBp8IajRwO\n8lvw3cmcz9GZvUpIYqvtlemaQu1hWqvoeDOX6yeuUfRfCyXmvdLK+oGC9FhNApmk\nqqYER3W52J5WgtIX3zyQp40OMVr5DVKNk8Zb5e6SATyQFRtIPHxjyroKzOHdVVj7\nklR6qKZGAnYANjb/eUS0Bk62bBwGWFjRw9ZWqBrXgTuRMZJYoLpb3o1/L0rsvhim\nnydMwSu6zXzVqrDA18yqeme5AQ0EX8l+XgEIAMNKH4p0F42MhyVVWdEq3RBPnn3f\nIXhZVm39OA25oRnm8qSeihVUir5wkh9j/eVSqrxN7h0SOh20XIp7le56CjqqPOzx\nNgV0IAdeldGhSiVPXib6qQnyuFKuk3RPEiNYlsl2bc2WuBNqblEonDdKHKk1THKi\nWcd6VfGrIoMKTEFIOZHrFx1+3fB1CXkiQgDDF7qfLCZJS2md0YtEl0mtomJpYXYg\nGMU2De9MRiPh6h6Fl3heu8TItWsxspnmbp/WjpBRG7NKtQf0lP+K9moKaE+miwKV\nddfRtuL0rRn/65XKTq/vqazc7nSsirQvRh6Ezwb76qYY7jbX7SoIuR0Pn+MAEQEA\nAYkBHwQYAQgAEwUCX8l+XgkQi1fFwoNvS+sCGwwAABsaCADDuWFJYSVmkZXVIjZv\nYrbo8H3d9UjW1BhXftYgSUImxqMX79kN8knZ3qdy5BKV4flZFxxziFl8rDKwD96m\nqsKfBzvIqxOhnizDzGwkXVS1DkQ22R0CtWIEkdLhjZVnkMRSavkSCEa1kWH1rpou\nh4xUz+etkIuy0NWg8oSkuiQe7+B5sLB9P+f1TV2iUUii+Dp4oAKXnE7H6vNwBWnt\nHg/nbuN9+53Pd0ox0uE+uy0bTDlhvJ88/BYw4+n6RQXjl5h1HuQoqTT1Wsk2QQYn\nQpBDqKapHVOfSTK7hy+R+qcJQXSuufsJ0GotIK/VBGGCvpMKFB/vKdaw/PmAZ1WO\nHe0jmQENBGCRt7MBCADkYJHHQQoL6tKrW/LbmfR9ljz7ib2aWno4JO3VKQvLwjyU\nMPpq/SXXMOnx8jXwgWizpPxQYDRJ0SQXS9ULJ1hXRL/OgMnZAYvYDeV2jBnKsAIE\ndiG/e1qm8P4W9qpWJc+hNq7FOT13RzGWRx57SdLWSXo0KeY38r9lvjjOmT/cuOcm\njwlDT9XYf/RSO+yJ/AsyMdAr+ZbDeQUd9HYJiPdI04lGaGM02MjDMnx+monc+y54\nt+Z+ry1WtQdzoQt9dHlIPlV1tR+xV5DHHsejCZxu9TWzzSlL5wfBBeEz7R/OIziv\nGJpWQdJzd+2QDXSRg9q2XYWP5ZVtSgjVVJjNlb6ZABEBAAG0VEFydGlmYWN0IFJl\nZ2lzdHJ5IFJlcG9zaXRvcnkgU2lnbmVyIDxhcnRpZmFjdC1yZWdpc3RyeS1yZXBv\nc2l0b3J5LXNpZ25lckBnb29nbGUuY29tPokBTgQTAQoAOBYhBDW6oLM+nrOW9Zyo\nOMC6XObcYxWjBQJgkbezAhsDBQsJCAcCBhUKCQgLAgQWAgMBAh4BAheAAAoJEMC6\nXObcYxWj+igIAMFh6DrAYMeq9sbZ1ZG6oAMrinUheGQbEqe76nIDQNsZnhDwZ2wW\nqgVC7DgOMqlhQmOmzm7M6Nzmq2dvPwq3xC2OeI9fQyzjT72deBTzLP7PJok9PJFO\nMdLfILSsUnmMsheQt4DUO0jYAX2KUuWOIXXJaZ319QyoRNBPYa5qz7qXS7wHLOY8\n9IDqfHt6Aud8ER5zhyOyhytcYMeaGC1g1IKWmgewnhEq02FantMJGlmmFi2eA0EP\nD02GC3742QGqRxLwjWsm5/TpyuU24EYKRGCRm7QdVIo3ugFSetKrn0byOxWGBvtu\n4fH8XWvZkRT+u+yzH1s5yFYBqc2JTrrJvRU=\n=0lhn\n-----END PGP PUBLIC KEY BLOCK-----\n-----BEGIN PGP PUBLIC KEY BLOCK-----\nVersion: GnuPG v1\n\nmQENBFWKtqgBCADmKQWYQF9YoPxLEQZ5XA6DFVg9ZHG4HIuehsSJETMPQ+W9K5c5\nUs5assCZBjG/k5i62SmWb09eHtWsbbEgexURBWJ7IxA8kM3kpTo7bx+LqySDsSC3\n/8JRkiyibVV0dDNv/EzRQsGDxmk5Xl8SbQJ/C2ECSUT2ok225f079m2VJsUGHG+5\nRpyHHgoMaRNedYP8ksYBPSD6sA3Xqpsh/0cF4sm8QtmsxkBmCCIjBa0B0LybDtdX\nXIq5kPJsIrC2zvERIPm1ez/9FyGmZKEFnBGeFC45z5U//pHdB1z03dYKGrKdDpID\n17kNbC5wl24k/IeYyTY9IutMXvuNbVSXaVtRABEBAAG0Okdvb2dsZSBDbG91ZCBQ\nYWNrYWdlcyBSUE0gU2lnbmluZyBLZXkgPGdjLXRlYW1AZ29vZ2xlLmNvbT6JATgE\nEwECACIFAlWKtqgCGy8GCwkIBwMCBhUIAgkKCwQWAgMBAh4BAheAAAoJEPCcOUw+\nG6jV+QwH/0wRH+XovIwLGfkg6kYLEvNPvOIYNQWnrT6zZ+XcV47WkJ+i5SR+QpUI\nudMSWVf4nkv+XVHruxydafRIeocaXY0E8EuIHGBSB2KR3HxG6JbgUiWlCVRNt4Qd\n6udC6Ep7maKEIpO40M8UHRuKrp4iLGIhPm3ELGO6uc8rks8qOBMH4ozU+3PB9a0b\nGnPBEsZdOBI1phyftLyyuEvG8PeUYD+uzSx8jp9xbMg66gQRMP9XGzcCkD+b8w1o\n7v3J3juKKpgvx5Lqwvwv2ywqn/Wr5d5OBCHEw8KtU/tfxycz/oo6XUIshgEbS/+P\n6yKDuYhRp6qxrYXjmAszIT25cftb4d4=\n=/PbX\n-----END PGP PUBLIC KEY BLOCK-----",
+        "check_gpg": false,
         "image_type_tags": [
           "gce",
           "gce-rhui"
@@ -5167,9 +5169,6 @@
                   },
                   {
                     "id": "sha256:92edd5aa48d52929de6725b944840f14d3e1d9288dd2ca8ae083e78815fd89a7"
-                  },
-                  {
-                    "id": "sha256:87c6d9bd4811b2ef1582f81e8fb30301dd56e067d0358a2cdadd15b4b07424c9"
                   }
                 ]
               }
@@ -5317,21 +5316,7 @@
                     "https://packages.cloud.google.com/yum/doc/rpm-package-key.gpg"
                   ],
                   "name": "Google Compute Engine",
-                  "gpgcheck": true,
-                  "repo_gpgcheck": false
-                },
-                {
-                  "id": "google-cloud-sdk",
-                  "baseurl": [
-                    "https://packages.cloud.google.com/yum/repos/cloud-sdk-el9-x86_64"
-                  ],
-                  "enabled": true,
-                  "gpgkey": [
-                    "https://packages.cloud.google.com/yum/doc/yum-key.gpg",
-                    "https://packages.cloud.google.com/yum/doc/rpm-package-key.gpg"
-                  ],
-                  "name": "Google Cloud SDK",
-                  "gpgcheck": true,
+                  "gpgcheck": false,
                   "repo_gpgcheck": false
                 }
               ]
@@ -6320,9 +6305,6 @@
           "sha256:877a6bc8658f919581b93af9eb01437cbb35d752b4c3587b9e90aa46a58a7aea": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el9/el9-x86_64-baseos-n9.1-20220324/Packages/cyrus-sasl-lib-2.1.27-20.el9.x86_64.rpm"
           },
-          "sha256:87c6d9bd4811b2ef1582f81e8fb30301dd56e067d0358a2cdadd15b4b07424c9": {
-            "url": "https://rpmrepo.osbuild.org/v2/mirror/public/el9/el9-x86_64-google-cloud-sdk-20220617/Packages/87c6d9bd4811b2ef1582f81e8fb30301dd56e067d0358a2cdadd15b4b07424c9-google-cloud-sdk-390.0.0-1.x86_64.rpm"
-          },
           "sha256:887b23796b57b9e476f916c32b27d446a4db40957b92940519162ea7ba1689cc": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el9/el9-x86_64-appstream-n9.1-20220324/Packages/libblockdev-mdraid-2.25-11.el9.x86_64.rpm"
           },
@@ -13307,17 +13289,7 @@
         "arch": "noarch",
         "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/public/el9/el9-x86_64-google-compute-engine-20220617/Packages/92edd5aa48d52929de6725b944840f14d3e1d9288dd2ca8ae083e78815fd89a7-google-rhui-client-rhel9-4.1-1.noarch.rpm",
         "checksum": "sha256:92edd5aa48d52929de6725b944840f14d3e1d9288dd2ca8ae083e78815fd89a7"
-      },
-      {
-        "name": "google-cloud-sdk",
-        "epoch": 0,
-        "version": "390.0.0",
-        "release": "1",
-        "arch": "x86_64",
-        "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/public/el9/el9-x86_64-google-cloud-sdk-20220617/Packages/87c6d9bd4811b2ef1582f81e8fb30301dd56e067d0358a2cdadd15b4b07424c9-google-cloud-sdk-390.0.0-1.x86_64.rpm",
-        "checksum": "sha256:87c6d9bd4811b2ef1582f81e8fb30301dd56e067d0358a2cdadd15b4b07424c9"
       }
     ]
-  },
-  "no-image-info": true
+  }
 }
diff --git a/tools/test-case-generators/generate-all-test-cases b/tools/test-case-generators/generate-all-test-cases
index 7337a67f1..27f92e743 100755
--- a/tools/test-case-generators/generate-all-test-cases
+++ b/tools/test-case-generators/generate-all-test-cases
@@ -1354,8 +1354,8 @@ def get_args():
         "--output",
         metavar="DIR",
         type=os.path.abspath,
-        help="directory for storing generated image test cases",
-        required=True
+        default="test/data/manifests",
+        help="directory for storing generated image test cases (default 'test/data/manifests')"
     )
     parser.add_argument(
         "--sources",