Skip to content

Commit 9083622

Browse files
gitlab ci pipeline cleanup (NVIDIA#54)
This PR cleans up the GitLab CI pipeline by removing the outdated trigger stage and references, as well as cleaning up the variable used for the artifactory upload. Dropped the "trigger" stage from the stages list. Removed the associated trigger job script and rules from the pipeline. Authors: - Anuradha Karuppiah (https://github.com/AnuradhaKaruppiah) Approvers: - David Gardner (https://github.com/dagardner-nv) URL: NVIDIA#54
1 parent 13d41f9 commit 9083622

File tree

3 files changed

+10
-41
lines changed

3 files changed

+10
-41
lines changed

.gitlab-ci.yml

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,6 @@ stages:
3030
- docs
3131
- package
3232
- upload
33-
- trigger
3433

3534
variables:
3635
UV_CACHE_DIR: .uv-cache
@@ -125,11 +124,3 @@ upload:artifactory:
125124
rules:
126125
- if: $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH
127126
- if: $CI_COMMIT_BRANCH == 'main'
128-
129-
trigger:webhook:
130-
stage: trigger
131-
script:
132-
- echo "Triggering webhook"
133-
- ci/scripts/gitlab/trigger.sh
134-
rules:
135-
- if: $CI_PIPELINE_SOURCE != 'merge_request_event'

ci/scripts/gitlab/artifactory_upload.sh

Lines changed: 10 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,15 @@
1717
# Exit on error
1818
set -e
1919

20-
# Define variables
20+
# change this to ready to publish. this should be done programmatically once
21+
# the release process is finalized.
2122
RELEASE_STATUS=preview
23+
24+
# Define variables
25+
AIQ_ARCH="any"
26+
AIQ_OS="any"
27+
AIQ_COMPONENT_NAME="agentiq"
28+
2229
WHEELS_DIR="${CI_PROJECT_DIR}/.tmp/wheels"
2330
# Define the subdirectories to be exclude
2431
EXCLUDE_SUBDIRS=("examples")
@@ -66,14 +73,6 @@ function install_jfrog_cli() {
6673
}
6774
install_jfrog_cli
6875

69-
# Function to get the current Git branch name
70-
function get_git_branch_name() {
71-
git rev-parse --abbrev-ref HEAD 2>/dev/null || echo "${CI_COMMIT_REF_NAME:-unknown}"
72-
}
73-
74-
# Set the branch name dynamically
75-
BRANCH_NAME=$(get_git_branch_name)
76-
7776
function get_git_tag() {
7877
# Get the latest Git tag, sorted by version, excluding lightweight tags
7978
git describe --tags --abbrev=0 2>/dev/null || echo "no-tag"
@@ -104,7 +103,7 @@ if [[ "${UPLOAD_TO_ARTIFACTORY}" == "true" ]]; then
104103
CI=true jf rt u --fail-no-op --url="${AIQ_ARTIFACTORY_URL}" \
105104
--user="${URM_USER}" --password="${URM_API_KEY}" \
106105
--flat=false "${WHEEL_FILE}" "${ARTIFACTORY_PATH}" \
107-
--target-props "arch=any;os=any;branch=${BRANCH_NAME};component_name=${COMPONENT_NAME};version=${GIT_TAG};release_approver=${RELEASE_APPROVER};release_status=${RELEASE_STATUS}"
106+
--target-props "arch=${AIQ_ARCH};os=${AIQ_OS};branch=${GIT_TAG};component_name=${AIQ_COMPONENT_NAME};version=${GIT_TAG};release_approver=${RELEASE_APPROVER};release_status=${RELEASE_STATUS}"
108107
done
109108
done
110109
else
@@ -116,5 +115,5 @@ if [[ "${LIST_ARTIFACTORY_CONTENTS}" == "true" ]]; then
116115
echo "Listing contents of Artifactory (${AIQ_ARTIFACTORY_NAME}):"
117116
CI=true jf rt s --url="${AIQ_ARTIFACTORY_URL}" \
118117
--user="${URM_USER}" --password="${URM_API_KEY}" \
119-
"${AIQ_ARTIFACTORY_NAME}/" --recursive
118+
"${AIQ_ARTIFACTORY_NAME}/*/${GIT_TAG}/" --recursive
120119
fi

ci/scripts/gitlab/trigger.sh

Lines changed: 0 additions & 21 deletions
This file was deleted.

0 commit comments

Comments
 (0)