Merge branch 'revert-skip-release' into 'master'

Revert changes to skip release of images

See merge request nvidia/container-toolkit/container-toolkit!132
This commit is contained in:
Evan Lezar 2022-04-11 11:46:36 +00:00
commit 36ffd0983c
2 changed files with 0 additions and 12 deletions

View File

@ -191,24 +191,16 @@ test-packaging:
# Define an external release step that pushes an image to an external repository. # Define an external release step that pushes an image to an external repository.
# This includes a devlopment image off master. # This includes a devlopment image off master.
# NOTE: job is skipped if OUT_REGISTRY is null or empty. Can be used to disable release(s) with CI/CD env.
.release:external: .release:external:
extends: extends:
- .release - .release
rules: rules:
- if: '$OUT_REGISTRY == null || $OUT_REGISTRY == "" || $SKIP_RELEASE'
when: never
- if: '$DRYRUN_RELEASE'
variables:
DOCKER: echo docker
REGCTL: echo regctl
- if: $CI_COMMIT_TAG - if: $CI_COMMIT_TAG
variables: variables:
OUT_IMAGE_VERSION: "${CI_COMMIT_TAG}" OUT_IMAGE_VERSION: "${CI_COMMIT_TAG}"
- if: $CI_COMMIT_BRANCH == $RELEASE_DEVEL_BRANCH - if: $CI_COMMIT_BRANCH == $RELEASE_DEVEL_BRANCH
variables: variables:
OUT_IMAGE_VERSION: "${DEVEL_RELEASE_IMAGE_VERSION}" OUT_IMAGE_VERSION: "${DEVEL_RELEASE_IMAGE_VERSION}"
- when: on_success
# Define the release jobs # Define the release jobs
release:staging-centos7: release:staging-centos7:

View File

@ -231,8 +231,6 @@ scan-ubi8-arm64:
OUT_REGISTRY_TOKEN: "${NGC_REGISTRY_TOKEN}" OUT_REGISTRY_TOKEN: "${NGC_REGISTRY_TOKEN}"
OUT_REGISTRY: "${NGC_REGISTRY}" OUT_REGISTRY: "${NGC_REGISTRY}"
OUT_IMAGE_NAME: "${NGC_REGISTRY_IMAGE}" OUT_IMAGE_NAME: "${NGC_REGISTRY_IMAGE}"
SKIP_RELEASE: "${NGC_SKIP_RELEASE}"
DRYRUN_RELEASE: "${NGC_DRYRUN_RELEASE}"
.release:dockerhub: .release:dockerhub:
extends: extends:
@ -242,8 +240,6 @@ scan-ubi8-arm64:
OUT_REGISTRY_TOKEN: "${REGISTRY_TOKEN}" OUT_REGISTRY_TOKEN: "${REGISTRY_TOKEN}"
OUT_REGISTRY: "${DOCKERHUB_REGISTRY}" OUT_REGISTRY: "${DOCKERHUB_REGISTRY}"
OUT_IMAGE_NAME: "${REGISTRY_IMAGE}" OUT_IMAGE_NAME: "${REGISTRY_IMAGE}"
SKIP_RELEASE: "${DOCKERHUB_SKIP_RELEASE}"
DRYRUN_RELEASE: "${DOCKERHUB_DRYRUN_RELEASE}"
release:staging-ubuntu18.04: release:staging-ubuntu18.04:
extends: extends: