Skip to content

Commit c3a8a44

Browse files
committed
contrib/intel/jenkins: Rename py_scripts to upstream
With new build system there will be a separate checkout location for upstream (target branch) Signed-off-by: Zach Dworkin <zachary.dworkin@intel.com>
1 parent 0014555 commit c3a8a44

File tree

1 file changed

+9
-8
lines changed

1 file changed

+9
-8
lines changed

contrib/intel/jenkins/Jenkinsfile

+9-8
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ import groovy.transform.Field
33
properties([disableConcurrentBuilds(abortPrevious: true)])
44
@Field def DO_RUN=true
55
@Field def TARGET="main"
6-
@Field def SCRIPT_LOCATION="py_scripts/contrib/intel/jenkins"
6+
@Field def SCRIPT_LOCATION="upstream/libfabric/contrib/intel/jenkins"
77
@Field def RELEASE=false
88
@Field def BUILD_MODES=["reg", "dbg", "dl"]
99
@Field def PYTHON_VERSION="3.9"
@@ -123,21 +123,22 @@ def save_summary() {
123123
"""
124124
}
125125

126-
def checkout_py_scripts() {
126+
def checkout_upstream() {
127+
def loc = "${env.WORKSPACE}/upstream/libfabric"
127128
sh """
128-
if [[ ! -d ${env.WORKSPACE}/py_scripts ]]; then
129-
mkdir ${env.WORKSPACE}/py_scripts
129+
if [[ ! -d ${env.WORKSPACE}/upstream ]]; then
130+
mkdir -p ${loc}
130131
else
131-
rm -rf ${env.WORKSPACE}/py_scripts && mkdir ${env.WORKSPACE}/py_scripts
132+
rm -rf ${env.WORKSPACE}/upstream && mkdir -p ${loc}
132133
fi
133134
134-
git clone --branch ${TARGET} ${env.UPSTREAM} ${env.WORKSPACE}/py_scripts
135+
git clone --branch ${TARGET} ${env.UPSTREAM} ${loc}
135136
"""
136137
}
137138

138139
def checkout_ci_resources() {
139140
sh """
140-
if [[ ! -d ${env.WORKSPACE}/py_scripts ]]; then
141+
if [[ ! -d ${env.WORKSPACE}/upstream ]]; then
141142
mkdir ${env.WORKSPACE}/ci_resources
142143
else
143144
rm -rf ${env.WORKSPACE}/ci_resources && mkdir ${env.WORKSPACE}/ci_resources
@@ -150,7 +151,7 @@ def checkout_ci_resources() {
150151

151152
def checkout_external_resources() {
152153
checkout_ci_resources()
153-
checkout_py_scripts()
154+
checkout_upstream()
154155
}
155156

156157
def generate_diff(def branch_name, def output_loc) {

0 commit comments

Comments
 (0)