Skip to content

Commit 1c2ee5b

Browse files
authored
Merge pull request #309 from JunAr7112/migrate_ngc_changes
2 parents 7d1591a + 1127c8e commit 1c2ee5b

File tree

1 file changed

+18
-16
lines changed

1 file changed

+18
-16
lines changed

.common-ci.yml

Lines changed: 18 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -172,6 +172,8 @@ trigger-pipeline:
172172
OUT_VERSION: "${CI_COMMIT_SHORT_SHA}"
173173
before_script:
174174
- !reference [.regctl-setup, before_script]
175+
# We ensure the OUT_IMAGE_NAME is set
176+
- 'echo "Image: ${OUT_IMAGE_NAME}" ; [[ -n "${OUT_IMAGE_NAME}" ]] || exit 1'
175177
- apk add --no-cache make bash
176178
script:
177179
- 'echo "Logging in to CI registry ${CI_REGISTRY}"'
@@ -220,37 +222,37 @@ trigger-pipeline:
220222
extends:
221223
- .release
222224
variables:
223-
OUT_REGISTRY_USER: "${CI_REGISTRY_USER}"
224-
OUT_REGISTRY_TOKEN: "${CI_REGISTRY_PASSWORD}"
225-
OUT_REGISTRY: "${CI_REGISTRY}"
226-
OUT_IMAGE_NAME: "${CI_REGISTRY_IMAGE}/staging/driver"
225+
OUT_REGISTRY_USER: "${NGC_REGISTRY_USER}"
226+
OUT_REGISTRY_TOKEN: "${NGC_REGISTRY_TOKEN}"
227+
OUT_REGISTRY: "${NGC_REGISTRY}"
228+
OUT_IMAGE_NAME: "${NGC_STAGING_REGISTRY}/driver"
227229

228230
.release:staging-ubuntu22.04:
229231
extends:
230232
- .release-ubuntu22.04
231233
variables:
232-
OUT_REGISTRY_USER: "${CI_REGISTRY_USER}"
233-
OUT_REGISTRY_TOKEN: "${CI_REGISTRY_PASSWORD}"
234-
OUT_REGISTRY: "${CI_REGISTRY}"
235-
OUT_IMAGE_NAME: "${CI_REGISTRY_IMAGE}/staging/driver"
234+
OUT_REGISTRY_USER: "${NGC_REGISTRY_USER}"
235+
OUT_REGISTRY_TOKEN: "${NGC_REGISTRY_TOKEN}"
236+
OUT_REGISTRY: "${NGC_REGISTRY}"
237+
OUT_IMAGE_NAME: "${NGC_STAGING_REGISTRY}/driver"
236238

237239
.release:staging-ubuntu24.04:
238240
extends:
239241
- .release-ubuntu24.04
240242
variables:
241-
OUT_REGISTRY_USER: "${CI_REGISTRY_USER}"
242-
OUT_REGISTRY_TOKEN: "${CI_REGISTRY_PASSWORD}"
243-
OUT_REGISTRY: "${CI_REGISTRY}"
244-
OUT_IMAGE_NAME: "${CI_REGISTRY_IMAGE}/staging/driver"
243+
OUT_REGISTRY_USER: "${NGC_REGISTRY_USER}"
244+
OUT_REGISTRY_TOKEN: "${NGC_REGISTRY_TOKEN}"
245+
OUT_REGISTRY: "${NGC_REGISTRY}"
246+
OUT_IMAGE_NAME: "${NGC_STAGING_REGISTRY}/driver"
245247

246248
.release:staging-rhel9:
247249
extends:
248250
- .release-rhel9
249251
variables:
250-
OUT_REGISTRY_USER: "${CI_REGISTRY_USER}"
251-
OUT_REGISTRY_TOKEN: "${CI_REGISTRY_PASSWORD}"
252-
OUT_REGISTRY: "${CI_REGISTRY}"
253-
OUT_IMAGE_NAME: "${CI_REGISTRY_IMAGE}/staging/driver"
252+
OUT_REGISTRY_USER: "${NGC_REGISTRY_USER}"
253+
OUT_REGISTRY_TOKEN: "${NGC_REGISTRY_TOKEN}"
254+
OUT_REGISTRY: "${NGC_REGISTRY}"
255+
OUT_IMAGE_NAME: "${NGC_STAGING_REGISTRY}/driver"
254256

255257
# Define an external release step that pushes an image to an external repository.
256258
.release:external:

0 commit comments

Comments
 (0)