particle-os/debian-forge-composer
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

distro/rhel9: don't install google-cloud-sdk in any gce* images

Browse source 
The Google SDK ships pre-compiled binaries. It is undesirable to install
it by default in `gce` and `gce-rhui` in its current shape. Also not
installing it does not anyhow affect the RHEL integration as the guest
OS in GCP.
This commit is contained in:
Tomas Hozza 2022-08-16 13:07:36 +02:00 • committed by Christian Kellner
parent cf92c1f23a
commit 5f48aaa212
6 changed files with 15 additions and 87 deletions
Download patch file Download diff file Expand all files Collapse all files

2
internal/distro/rhel9/package_sets.go
View file

@ -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

20
test/data/manifests/centos_9-x86_64-gce-boot.json
View file

@ -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"
}
]
}
@ -6309,9 +6308,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 +12816,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
}
}

20
test/data/manifests/rhel_90-x86_64-gce-boot.json
View file

@ -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"
}
]
}
@ -3101,9 +3100,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 +9512,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
}
}

20
test/data/manifests/rhel_90-x86_64-gce_rhui-boot.json
View file

@ -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"
}
]
}
@ -3107,9 +3106,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 +9530,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
}
}

20
test/data/manifests/rhel_91-x86_64-gce-boot.json
View file

File diff suppressed because one or more lines are too long

20
test/data/manifests/rhel_91-x86_64-gce_rhui-boot.json
View file

File diff suppressed because one or more lines are too long