Skip to content

Commit 2240205

Browse files
author
Evan Lezar
committed
Merge branch 'fix-internal-ci' into 'main'
Fix internal CI rules See merge request nvidia/container-toolkit/container-toolkit!227
2 parents 1e72f92 + 3736bb3 commit 2240205

File tree

1 file changed

+5
-5
lines changed

1 file changed

+5
-5
lines changed

.nvidia-ci.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -48,8 +48,9 @@ variables:
4848
OUT_IMAGE_NAME: "${CI_REGISTRY_IMAGE}/container-toolkit"
4949
PUSH_MULTIPLE_TAGS: "false"
5050
# We delay the job start to allow the public pipeline to generate the required images.
51-
when: delayed
52-
start_in: 30 minutes
51+
rules:
52+
- when: delayed
53+
start_in: 30 minutes
5354
timeout: 30 minutes
5455
retry:
5556
max: 2
@@ -107,9 +108,8 @@ image-packaging:
107108
variables:
108109
IMAGE: "${CI_REGISTRY_IMAGE}/container-toolkit:${CI_COMMIT_SHORT_SHA}-${DIST}"
109110
IMAGE_ARCHIVE: "container-toolkit.tar"
110-
except:
111-
variables:
112-
- $SKIP_SCANS && $SKIP_SCANS == "yes"
111+
rules:
112+
- if: $SKIP_SCANS != "yes"
113113
before_script:
114114
- docker login -u "${CI_REGISTRY_USER}" -p "${CI_REGISTRY_PASSWORD}" "${CI_REGISTRY}"
115115
# TODO: We should specify the architecture here and scan all architectures

0 commit comments

Comments
 (0)