From 579cc13f2b1415e0f234377a461c95525dccc8c8 Mon Sep 17 00:00:00 2001 From: Tim Liu Date: Fri, 22 Mar 2024 21:12:11 +0800 Subject: [PATCH] Remove unused shared lib in Jenkins files (#10620) "shared-libs" had not been used since we switched to blossom Jenkins. We had ever used "shared-libs" before, but now only need "blossom-lib". Signed-off-by: Tim Liu --- jenkins/Jenkinsfile-blossom.premerge | 8 ++++---- jenkins/Jenkinsfile-blossom.premerge-databricks | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/jenkins/Jenkinsfile-blossom.premerge b/jenkins/Jenkinsfile-blossom.premerge index 2602b8328b6..1656d3d2a3a 100755 --- a/jenkins/Jenkinsfile-blossom.premerge +++ b/jenkins/Jenkinsfile-blossom.premerge @@ -1,6 +1,6 @@ #!/usr/local/env groovy /* - * Copyright (c) 2020-2023, NVIDIA CORPORATION. + * Copyright (c) 2020-2024, NVIDIA CORPORATION. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -24,7 +24,7 @@ import hudson.model.Result import hudson.model.Run import jenkins.model.CauseOfInterruption.UserInterruption -@Library(['shared-libs', 'blossom-lib']) _ +@Library('blossom-lib') @Library('blossom-github-lib@master') import ipp.blossom.* @@ -68,10 +68,10 @@ pipeline { PREMERGE_SCRIPT = '$JENKINS_ROOT/spark-premerge-build.sh' MVN_URM_MIRROR = '-s jenkins/settings.xml -P mirror-apache-to-urm' LIBCUDF_KERNEL_CACHE_PATH = '/tmp/.cudf' - ARTIFACTORY_NAME = "${ArtifactoryConstants.ARTIFACTORY_NAME}" + ARTIFACTORY_NAME = "${common.ARTIFACTORY_NAME}" GITHUB_TOKEN = credentials("github-token") URM_CREDS = credentials("urm_creds") - URM_URL = "https://${ArtifactoryConstants.ARTIFACTORY_NAME}/artifactory/sw-spark-maven" + URM_URL = "https://${common.ARTIFACTORY_NAME}/artifactory/sw-spark-maven" PVC = credentials("pvc") CUSTOM_WORKSPACE = "/home/jenkins/agent/workspace/${BUILD_TAG}" CLASSIFIER = 'cuda11' diff --git a/jenkins/Jenkinsfile-blossom.premerge-databricks b/jenkins/Jenkinsfile-blossom.premerge-databricks index 6f21ce56acd..a13170f7162 100644 --- a/jenkins/Jenkinsfile-blossom.premerge-databricks +++ b/jenkins/Jenkinsfile-blossom.premerge-databricks @@ -21,7 +21,7 @@ * */ -@Library(['shared-libs', 'blossom-lib']) _ +@Library('blossom-lib') @Library('blossom-github-lib@master') import ipp.blossom.*