Skip to content

Commit 7beda93

Browse files
dagardner-nvColinM-sys
authored andcommitted
Misc CI improvements (NVIDIA#1867)
* Don't install jfrog on the fly, instead use a container that already has it. * Install a specific version of `slack-sdk` validated with a sha. ## By Submitting this PR I confirm: - I am familiar with the [Contributing Guidelines](https://github.com/NVIDIA/NeMo-Agent-Toolkit/blob/develop/docs/source/resources/contributing/index.md). - We require that all contributors "sign-off" on their commits. This certifies that the contribution is your original work, or you have rights to submit it under the same license, or a compatible license. - Any contribution which contains commits that are not Signed-Off will not be accepted. - When the PR is ready for review, new or existing tests cover these changes. - When the PR is ready for review, the documentation is up to date with these changes. ## Summary by CodeRabbit * **Chores** * Updated CI/CD infrastructure with containerized dependency management for improved reproducibility and reliability * Pinned Slack SDK version for consistent builds Authors: - David Gardner (https://github.com/dagardner-nv) Approvers: - Will Killian (https://github.com/willkill07) URL: NVIDIA#1867
1 parent e6e73ac commit 7beda93

4 files changed

Lines changed: 22 additions & 13 deletions

File tree

.gitlab-ci.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -325,6 +325,8 @@ package:wheel:
325325
- if: $CI_COMMIT_BRANCH =~ /^release\/.*$/
326326

327327
upload:artifactory:
328+
# Container defined in ci/scripts/gitlab/artifactory/Dockerfile
329+
image: $CI_REGISTRY_IMAGE/artifactory:20260413
328330
stage: upload
329331
script:
330332
- echo "Uploading wheel to artifactory"
Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
# SPDX-FileCopyrightText: Copyright (c) 2026, NVIDIA CORPORATION & AFFILIATES. All rights reserved.
2+
# SPDX-License-Identifier: Apache-2.0
3+
#
4+
# Licensed under the Apache License, Version 2.0 (the "License");
5+
# you may not use this file except in compliance with the License.
6+
# You may obtain a copy of the License at
7+
#
8+
# http://www.apache.org/licenses/LICENSE-2.0
9+
#
10+
# Unless required by applicable law or agreed to in writing, software
11+
# distributed under the License is distributed on an "AS IS" BASIS,
12+
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13+
# See the License for the specific language governing permissions and
14+
# limitations under the License.
15+
16+
FROM ghcr.io/astral-sh/uv:0.9.28-python3.13-bookworm
17+
18+
RUN VERSION=2.99.0 curl -fL https://install-cli.jfrog.io | sh

ci/scripts/gitlab/artifactory_upload.sh

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -81,15 +81,6 @@ if [[ ! -d "$WHEELS_BASE_DIR" || -z "$(find "$WHEELS_BASE_DIR" -type f -name "*.
8181
exit 1
8282
fi
8383

84-
# Function to install JFrog CLI if needed
85-
function install_jfrog_cli() {
86-
if ! command -v jf &> /dev/null; then
87-
echo "Installing JFrog CLI..."
88-
curl -fL https://install-cli.jfrog.io | sh || { echo "JFrog CLI installation failed"; exit 1; }
89-
fi
90-
}
91-
install_jfrog_cli
92-
9384
# Upload wheels if enabled
9485
if [[ "${UPLOAD_TO_ARTIFACTORY}" == "true" ]]; then
9586
for NAT_COMPONENT_NAME in ${NAT_COMPONENTS[@]}; do

ci/scripts/gitlab/common.sh

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -65,8 +65,6 @@ function is_current_commit_release_tagged() {
6565

6666
function install_slack_sdk() {
6767
echo "Installing slack-sdk"
68-
uv pip install "slack-sdk~=3.36"
68+
echo "slack-sdk==3.40.1 --hash=sha256:cd8902252979aa248092b0d77f3a9ea3cc605bc5d53663ad728e892e26e14a65" | \
69+
uv pip install --require-hashes -r -
6970
}
70-
71-
echo "Environment Variables"
72-
printenv | sort

0 commit comments

Comments
 (0)