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

distro/rhel8: do not define Google Cloud SDK repo in gce* images

Browse source 
The repo is not needed any more, because the Google Cloud SDK is not
installed in the images by default. If anyone wants to install the SDK,
they can add the appropriate repo definition.
This commit is contained in:
Tomas Hozza 2022-08-16 13:34:24 +02:00 • committed by Christian Kellner
parent 5f48aaa212
commit debd6d4342
12 changed files with 0 additions and 166 deletions
Download patch file Download diff file Expand all files Collapse all files

12
internal/distro/rhel8/distro.go
View file

@ -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",
},
},
},
},
},

14
test/data/manifests/centos_8-x86_64-gce-boot.json
View file

@ -5524,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
}
]
}

14
test/data/manifests/rhel_8-x86_64-gce-boot.json
View file

@ -2328,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
}
]
}

14
test/data/manifests/rhel_8-x86_64-gce_rhui-boot.json
View file

@ -2339,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
}
]
}

14
test/data/manifests/rhel_84-x86_64-gce-boot.json
View file

@ -2360,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
}
]
}

14
test/data/manifests/rhel_84-x86_64-gce_rhui-boot.json
View file

@ -2371,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
}
]
}

14
test/data/manifests/rhel_85-x86_64-gce-boot.json
View file

@ -2328,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
}
]
}

14
test/data/manifests/rhel_85-x86_64-gce_rhui-boot.json
View file

@ -2339,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
}
]
}

14
test/data/manifests/rhel_86-x86_64-gce-boot.json
View file

@ -2328,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
}
]
}

14
test/data/manifests/rhel_86-x86_64-gce_rhui-boot.json
View file

@ -2339,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
}
]
}

14
test/data/manifests/rhel_87-x86_64-gce-boot.json
View file

@ -2322,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
}
]
}

14
test/data/manifests/rhel_87-x86_64-gce_rhui-boot.json
View file

@ -2333,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
}
]
}