Skip to content

Commit f7e394c

Browse files
author
Evan Lezar
committed
Merge branch 'fix-skip-release' into 'master'
Revert "[ci] optionally skip or dry-run external releases" See merge request nvidia/cloud-native/mig-parted!83
2 parents f63bc51 + 4c7736b commit f7e394c

File tree

2 files changed

+0
-12
lines changed

2 files changed

+0
-12
lines changed

.common-ci.yml

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -183,24 +183,16 @@ scan-ubi8-arm64:
183183

184184
# Define an external release step that pushes an image to an external repository.
185185
# This includes a devlopment image off master.
186-
# NOTE: job is skipped if OUT_REGISTRY is null or empty. Can be used to disable release(s) with CI/CD env.
187186
.release:external:
188187
extends:
189188
- .release
190189
rules:
191-
- if: '$OUT_REGISTRY == null || $OUT_REGISTRY == "" || $SKIP_RELEASE'
192-
when: never
193-
- if: '$DRYRUN_RELEASE'
194-
variables:
195-
DOCKER: echo docker
196-
REGCTL: echo regctl
197190
- if: $CI_COMMIT_TAG
198191
variables:
199192
OUT_IMAGE_VERSION: "${CI_COMMIT_TAG}"
200193
- if: $CI_COMMIT_BRANCH == $RELEASE_DEVEL_BRANCH
201194
variables:
202195
OUT_IMAGE_VERSION: "${DEVEL_RELEASE_IMAGE_VERSION}"
203-
- when: on_success
204196

205197
release:staging-ubi8:
206198
extends:

.nvidia-ci.yml

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -115,8 +115,6 @@ image-ubuntu20.04:
115115
OUT_REGISTRY_TOKEN: "${NGC_REGISTRY_TOKEN}"
116116
OUT_REGISTRY: "${NGC_REGISTRY}"
117117
OUT_IMAGE_NAME: "${NGC_REGISTRY_IMAGE}"
118-
SKIP_RELEASE: "${NGC_SKIP_RELEASE}"
119-
DRYRUN_RELEASE: "${NGC_DRYRUN_RELEASE}"
120118

121119
.release:dockerhub:
122120
extends:
@@ -126,8 +124,6 @@ image-ubuntu20.04:
126124
OUT_REGISTRY_TOKEN: "${REGISTRY_TOKEN}"
127125
OUT_REGISTRY: "${DOCKERHUB_REGISTRY}"
128126
OUT_IMAGE_NAME: "${REGISTRY_IMAGE}"
129-
SKIP_RELEASE: "${DOCKERHUB_SKIP_RELEASE}"
130-
DRYRUN_RELEASE: "${DOCKERHUB_DRYRUN_RELEASE}"
131127

132128
# Define the external release targets
133129
# Release to NGC

0 commit comments

Comments
 (0)