Skip to content

Commit 851f7f6

Browse files
thozzaachilleas-k
authored andcommitted
test/cases/gcp: use GCP guest tools to test RHEL-10 images (HMS-9238)
The GCP guest tools are now installed on GCE images, therefore modify the test cases to use it instead of cloud-init, when testing RHEL-10 / c10s. Also update the GCP repos for RHEL-10 and c10s and use the rpmrepo snapshot of RHEL-10 GCP guest tools repository. Signed-off-by: Tomáš Hozza <[email protected]>
1 parent e73e294 commit 851f7f6

File tree

7 files changed

+39
-80
lines changed

7 files changed

+39
-80
lines changed

test/cases/api/gcp.sh

Lines changed: 1 addition & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -144,15 +144,6 @@ function verify() {
144144
GCP_SSH_KEY="$WORKDIR/id_google_compute_engine"
145145
ssh-keygen -t rsa-sha2-512 -f "$GCP_SSH_KEY" -C "$SSH_USER" -N ""
146146

147-
# TODO: remove this once el10 / c10s image moves to oslogin
148-
GCP_METADATA_OPTION=
149-
# On el10 / c10s, we need to temporarily set the metadata key to "ssh-keys", because there is no "oslogin" feature
150-
if [[ ($ID == rhel || $ID == centos) && ${VERSION_ID%.*} == 10 ]]; then
151-
GCP_SSH_METADATA_FILE="$WORKDIR/gcp-ssh-keys-metadata"
152-
echo "${SSH_USER}:$(cat "$GCP_SSH_KEY".pub)" > "$GCP_SSH_METADATA_FILE"
153-
GCP_METADATA_OPTION="--metadata-from-file=ssh-keys=$GCP_SSH_METADATA_FILE"
154-
fi
155-
156147
# create the instance
157148
# resource ID can have max 62 characters, the $GCP_TEST_ID_HASH contains 56 characters
158149
GCP_INSTANCE_NAME="vm-$GCP_TEST_ID_HASH"
@@ -176,7 +167,7 @@ function verify() {
176167
--image-project="$GCP_PROJECT" \
177168
--image="$GCP_IMAGE_NAME" \
178169
--machine-type="$GCP_MACHINE_TYPE" \
179-
$GCP_METADATA_OPTION --labels=gitlab-ci-test=true
170+
--labels=gitlab-ci-test=true
180171

181172
HOST=$($GCP_CMD --format=json compute instances describe "$GCP_INSTANCE_NAME" --zone="$GCP_ZONE" --format='get(networkInterfaces[0].accessConfigs[0].natIP)')
182173

@@ -186,11 +177,5 @@ function verify() {
186177
# Verify image
187178
_ssh="$GCP_CMD compute ssh --strict-host-key-checking=no --ssh-key-file=$GCP_SSH_KEY --zone=$GCP_ZONE $SSH_USER@$GCP_INSTANCE_NAME --"
188179

189-
# TODO: remove this once el10 / c10s image moves to oslogin
190-
# On el10 / c10s, we need to ssh directly, because there is no "oslogin" feature
191-
if [[ ($ID == rhel || $ID == centos) && ${VERSION_ID%.*} == 10 ]]; then
192-
_ssh="ssh -oStrictHostKeyChecking=no -i $GCP_SSH_KEY $SSH_USER@$HOST"
193-
fi
194-
195180
_instanceCheck "$_ssh"
196181
}

test/cases/gcp.sh

Lines changed: 14 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -120,12 +120,15 @@ function verifyInGCP() {
120120
ssh-keygen -t rsa-sha2-512 -f "$GCP_SSH_KEY" -C "$SSH_USER" -N ""
121121

122122
# TODO: remove this once el10 / c10s image moves to oslogin
123+
# NB (thozza): kept here for backward compatibility with RHEL nightly CI pipeline
123124
GCP_METADATA_OPTION=
124-
# On el10 / c10s, we need to temporarily set the metadata key to "ssh-keys", because there is no "oslogin" feature
125-
if [[ ($ID == rhel || $ID == centos) && ${VERSION_ID%.*} == 10 ]]; then
126-
GCP_SSH_METADATA_FILE="$TEMPDIR/gcp-ssh-keys-metadata"
127-
echo "${SSH_USER}:$(cat "$GCP_SSH_KEY".pub)" > "$GCP_SSH_METADATA_FILE"
128-
GCP_METADATA_OPTION="--metadata-from-file=ssh-keys=$GCP_SSH_METADATA_FILE"
125+
if ! nvrGreaterOrEqual "osbuild-composer" "151"; then
126+
# On el10 / c10s, we need to temporarily set the metadata key to "ssh-keys", because there is no "oslogin" feature
127+
if [[ ($ID == rhel || $ID == centos) && ${VERSION_ID%.*} == 10 ]]; then
128+
GCP_SSH_METADATA_FILE="$TEMPDIR/gcp-ssh-keys-metadata"
129+
echo "${SSH_USER}:$(cat "$GCP_SSH_KEY".pub)" > "$GCP_SSH_METADATA_FILE"
130+
GCP_METADATA_OPTION="--metadata-from-file=ssh-keys=$GCP_SSH_METADATA_FILE"
131+
fi
129132
fi
130133

131134
# create the instance
@@ -162,9 +165,12 @@ function verifyInGCP() {
162165
_ssh="$GCP_CMD compute ssh --strict-host-key-checking=no --ssh-key-file=$GCP_SSH_KEY --zone=$GCP_ZONE --quiet $SSH_USER@$GCP_INSTANCE_NAME --"
163166

164167
# TODO: remove this once el10 / c10s image moves to oslogin
165-
# On el10 / c10s, we need to ssh directly, because there is no "oslogin" feature
166-
if [[ ($ID == rhel || $ID == centos) && ${VERSION_ID%.*} == 10 ]]; then
167-
_ssh="ssh -oStrictHostKeyChecking=no -i $GCP_SSH_KEY $SSH_USER@$HOST"
168+
# NB (thozza): kept here for backward compatibility with RHEL nightly CI pipeline
169+
if ! nvrGreaterOrEqual "osbuild-composer" "151"; then
170+
# On el10 / c10s, we need to ssh directly, because there is no "oslogin" feature
171+
if [[ ($ID == rhel || $ID == centos) && ${VERSION_ID%.*} == 10 ]]; then
172+
_ssh="ssh -oStrictHostKeyChecking=no -i $GCP_SSH_KEY $SSH_USER@$HOST"
173+
fi
168174
fi
169175

170176
_instanceCheck "$_ssh"

test/data/repositories/centos-stream-10.json

Lines changed: 6 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -62,19 +62,13 @@
6262
},
6363
{
6464
"name": "google-compute-engine",
65-
"baseurl": "https://rpmrepo.osbuild.org/v2/mirror/public/el9/el9-x86_64-google-compute-engine-20250825",
66-
"check_gpg": false,
65+
"baseurl": "https://rpmrepo.osbuild.org/v2/mirror/public/el10/el10-x86_64-google-compute-engine-20250901",
66+
"check_gpg": true,
67+
"gpgkey": "-----BEGIN PGP PUBLIC KEY BLOCK-----\n\n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\n=mYRk\n-----END PGP PUBLIC KEY BLOCK-----",
6768
"image_type_tags": [
68-
"gce"
69-
]
70-
},
71-
{
72-
"name": "google-cloud-sdk",
73-
"baseurl": "https://rpmrepo.osbuild.org/v2/mirror/public/el9/el9-x86_64-google-cloud-sdk-20250825",
74-
"check_gpg": false,
75-
"image_type_tags": [
76-
"gce"
69+
"gce",
70+
"gcp"
7771
]
7872
}
7973
]
80-
}
74+
}

test/data/repositories/rhel-10.0.json

Lines changed: 4 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -123,21 +123,13 @@
123123
},
124124
{
125125
"name": "google-compute-engine",
126-
"baseurl": "https://rpmrepo.osbuild.org/v2/mirror/public/el9/el9-x86_64-google-compute-engine-20250825",
127-
"check_gpg": false,
128-
"image_type_tags": [
129-
"gce",
130-
"gcp"
131-
]
132-
},
133-
{
134-
"name": "google-cloud-sdk",
135-
"baseurl": "https://rpmrepo.osbuild.org/v2/mirror/public/el9/el9-x86_64-google-cloud-sdk-20250825",
136-
"check_gpg": false,
126+
"baseurl": "https://rpmrepo.osbuild.org/v2/mirror/public/el10/el10-x86_64-google-compute-engine-20250901",
127+
"check_gpg": true,
128+
"gpgkey": "-----BEGIN PGP PUBLIC KEY BLOCK-----\n\n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\n=mYRk\n-----END PGP PUBLIC KEY BLOCK-----",
137129
"image_type_tags": [
138130
"gce",
139131
"gcp"
140132
]
141133
}
142134
]
143-
}
135+
}

test/data/repositories/rhel-10.1.json

Lines changed: 6 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -94,19 +94,13 @@
9494
},
9595
{
9696
"name": "google-compute-engine",
97-
"baseurl": "https://rpmrepo.osbuild.org/v2/mirror/public/el9/el9-x86_64-google-compute-engine-20250825/",
98-
"check_gpg": false,
99-
"image_type_tags": [
100-
"gce"
101-
]
102-
},
103-
{
104-
"name": "google-cloud-sdk",
105-
"baseurl": "https://rpmrepo.osbuild.org/v2/mirror/public/el9/el9-x86_64-google-cloud-sdk-20250825/",
106-
"check_gpg": false,
97+
"baseurl": "https://rpmrepo.osbuild.org/v2/mirror/public/el10/el10-x86_64-google-compute-engine-20250901",
98+
"check_gpg": true,
99+
"gpgkey": "-----BEGIN PGP PUBLIC KEY BLOCK-----\n\n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\n=mYRk\n-----END PGP PUBLIC KEY BLOCK-----",
107100
"image_type_tags": [
108-
"gce"
101+
"gce",
102+
"gcp"
109103
]
110104
}
111105
]
112-
}
106+
}

test/data/repositories/rhel-10.json

Lines changed: 6 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -64,19 +64,13 @@
6464
},
6565
{
6666
"name": "google-compute-engine",
67-
"baseurl": "https://packages.cloud.google.com/yum/repos/google-compute-engine-el9-x86_64-stable",
68-
"check_gpg": false,
67+
"baseurl": "https://rpmrepo.osbuild.org/v2/mirror/public/el10/el10-x86_64-google-compute-engine-20250901",
68+
"check_gpg": true,
69+
"gpgkey": "-----BEGIN PGP PUBLIC KEY BLOCK-----\n\nmQINBGfoJEcBEACuF94Bd+EFfhP6nHIs1YRe0zLzOyGGCYIFdiO5A7V1Ta3XgtXo\nlR/r7omYIDhB49NU/x4qgWmakd10tFpQER5sP0iWK40ywnwLxrMUsm3Rp+CKI/Dg\nHAGM7eez4JjLWLsmxlFLOf1b0X+M5d4j6/GqnaBoMUbYeDBEPQIzmVss1juBCLUs\np7qs+QGs1CThD0O5zQoGNzpoTfzSd24xADAPSTaaqw9vsFlBRjiw5bGc7OE5tKfn\nuj/0C9d5wVFuGOM/yrmNBduut4C+iAaSESxYfmu+l1LE/8u96+gWCcTGwLteI8gj\nZcrTSglHwo4V013AHHeuO0Wc1P7H6QE9onFa/JS4jAYh3asHOrjGOzrEN3ae8ZJk\nGgfJ+GImbShs9d2rOk9QuLVzPkoAsbsi6xqLz7PD81nTb3r8Tn8gFM3bSjZsQ1K0\nGDNe7J4MfZbTzhHsst2Srk8w/JSvCCzamSu/29VpQLnF2gciNA7+EnqanFIq0xh/\nDJcpICYjMsAFzJCpObrfw6Vme0n+32gQ8AT39hriBjG4GAcK0FL2qgxhigmXTUya\nVdXy7579uxOWk6Gl3NTVkOGIqFTty3fkmXGzyF9HiZ7Pj1EOx3xlDB8kqdZiq2Li\npGJDFOvbwIpuB+iGxnF/Of9NgYQP5SZ83egN0NC0uXqFwmeZdo4XpZioIQARAQAB\ntEBHb29nbGUgQ2xvdWQgdjEwIFJQTSBQYWNrYWdlIFNpZ25pbmcgS2V5IHYxIDxn\nYy10ZWFtQGdvb2dsZS5jb20+iQJUBBMBCgA+FiEExfdEoJgTb0DDcOhJMVbGMbZJ\nNvkFAmfoJEcCGwMFCRjH8gAFCwkIBwIGFQoJCAsCBBYCAwECHgECF4AACgkQMVbG\nMbZJNvnP5A//dHk3tyLxdKsEId4C6jgB9zcCvafsMUhkE3relhsrHiZuX02loULU\nkTEfaFB9VICLjSD8wOChg9labL6+aSoN8fwWHb2OSqDm7RgtmDLwUjDthmu37YLx\nUGeX+vaF17gMrJUwpcDjjSsEXF5ako8/UQe0MBVtfijEfPwm0snO4dE6DYgnJXZR\nOpKIYofakO1tOtMHGWHHeRu+Sl8PQ6xE07cUVr3ytpgNeJiDQeffb5upYMxyk3/V\npBnS5OhfAbTl9/2OJ01tNJkNQkr96+tuI90pu8TVIfS0yxseg3JpwG2UXgKMqoPV\nX4jSXzCXz+Tle5oh/thAWmUAOALirZzmNLsKVAs+JCjnroHEBpIuafzd3rBGxNHS\nJApch5Qtl+2CmRVysK/FrZIzsEq2CKpMO+SDKldn2sYPE+gQQKtEPGmZb4DpQgsb\n6WACWoCWPynRVW179ugiHI7MgeHMGynHexL/ADMSDAe/HZ7OYM34yfpCh9dLY8S2\n1oghowrIYayonr32E/1l5YQMoGVM8HWQZBBecseWoxpSd2ukHiIfkj4s2K0oFb6F\nfHYyGQJcSHIfHs+Ayr/4oaEz2V+SS8V6ubB8vKmJkSpx6hrzDi9hSpxGVpRwIBiH\nEa9YaVfL5VB2gQV2jkjIi/wR5+zq0EYbA5qnmHwmKMGD9zKklAzk2sO5Ag0EZ+gk\nRwEQAME4Lj74iBrX6VoMvQZzilef/0Vx2OPy25n45TPwn/HDDHyRdNNCl1fcHQ/v\n7agVDpDpcTUu+8vkkMI84aCIoheY3jPdqhbETwhxNt2hUtf/1cbAm1gkvdcdci4C\nk3myuTzuwRF1U7svrLcc/EEx9tDfNOlCxuremj1eIpbUHpKx51IqYlxUK0X24yAq\n6pBrl6wOPysaThw/lwC8Y3w/2zm9t18L2+xs370jWj5e/2JBbWt6gpCV59ucW9WZ\nr9Nw/Vr/nUB7kEoujg85rNRyX1U7/y+dEVgZTKT4DsVLcGs1YWXoYfvV2yZV7ah1\ntdNS7VkcZC4sP4Vulw6j/Yt69rE9eBnBlJGARqxrdwUCpDuO+7TsfkTfRQHvMZqR\npZX/2cq+xfFFe1erGjtkZ90y07nfpQ9zpmFyq7Y87NLqvG/IHk2lXfGYV1ynYo7u\ndez/jj60NkHaXvwJrdnwCP3CH5qspVDEXVWlfXX0KFwp6gCCRLqQXwaHNsYWladd\nVuagApLglBS0ClcmSG3Ydp4yUAMxNQzw2NDJu7cyyrGWQCPT50ILhbT589N9+Sdl\nx7k7qRUO3y0F2qw5GDcxAhsuTOcFElRVFGU7Df4wy1i17QeUddzbKborugDgBgyN\n9/GRQGAEkLlksaMPY1dpgiOWqz2h9+QB4/7Emkgx/s3Rts8LABEBAAGJAjwEGAEK\nACYWIQTF90SgmBNvQMNw6EkxVsYxtkk2+QUCZ+gkRwIbDAUJGMfyAAAKCRAxVsYx\ntkk2+RySD/97Cpqq9xbQP33Pcv3y+nvsKm+HTiE5w/8uatWw78C/G+LNYsQcFb0q\nhyj2DoPWO3DQZlnYxSr+K5xtn293IdBBMPoZZUfZjLbiSTQpR0ZxcHqtDZvgLpGz\nhX1Sb8By0/uNGDYKsof2ipqTZYwhJIITt1R2prUEpIwmBGFIUFWFs/2DnH7KmzWP\n4OmbfzAae6Vqhizbiq/bTsD0EwoLHUxonPt22nP8JbeuV0ennUR1DiRDOvn7XZej\n/aah7+Kb8bl1r38HvecCcwXMpDgAx+dHFnI1GfafZDIHOVR+96HkgAz7H6BeNxzy\naLd3MLQR30/CV/7IZtiMFMfM2598rplIMku0MCRgY5IOzxhhiZ4VUshGI+EXN7Fq\nGTIsuHYGeqqUY7GbXXgM3R1HgBLA7VWStuARuPXiSDgDH2XpDLBRQiDD6OR62D9E\n/Gllspl5fhkl9VefiTrhjGc32emZ6aqA4jGz2LH8h2OVw7fGEDlsr7YrfD5EbZ4u\nbdZwoHQk+pWs40JK4T6MANw4NV161Mokq6Wb3eHL3E+Jm2vXOdg2yv8jL0hzVOY5\ng81ieWhRr3yivw+aBLdeWA54dSdSYMPLssA8nIUwzHoinE+AKPWq3t3u/am5Q2j+\nvr0oRTdkSzSA9kKgEBJgm9jogAgq5WXfKgo9xJkXj2J9y2oDnRnGeA==\n=mYRk\n-----END PGP PUBLIC KEY BLOCK-----",
6970
"image_type_tags": [
70-
"gce"
71-
]
72-
},
73-
{
74-
"name": "google-cloud-sdk",
75-
"baseurl": "https://packages.cloud.google.com/yum/repos/cloud-sdk-el9-x86_64",
76-
"check_gpg": false,
77-
"image_type_tags": [
78-
"gce"
71+
"gce",
72+
"gcp"
7973
]
8074
}
8175
]
82-
}
76+
}

0 commit comments

Comments
 (0)