Skip to content

Commit 9b4c0c3

Browse files
authored
Merge pull request #173 from eth-cscs/ci/revert_normal_leone
Revert to normal leone checkout
2 parents 211fb94 + e7cc166 commit 9b4c0c3

File tree

1 file changed

+1
-16
lines changed

1 file changed

+1
-16
lines changed

Jenkinsfile

Lines changed: 1 addition & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -83,29 +83,14 @@ stage('Unittest') {
8383
echo \$SCRATCH""").trim()
8484
def reframeDir = "${scratch}/${dirPrefix}-${machineName}-${uniqueID}"
8585
def moduleDefinition = ''
86-
def gitClone = ''
8786
if (machineName == 'leone') {
8887
moduleDefinition = '''module() { eval `/usr/bin/modulecmd bash $*`; }
8988
export -f module'''
90-
gitClone = """module use /apps/common/UES/RHAT6/easybuild/modules/all/
91-
module load git
92-
git init .
93-
git fetch --tags --quiet https://github.com/eth-cscs/reframe.git +refs/heads/*:refs/remotes/origin/*
94-
git config remote.origin.url https://github.com/eth-cscs/reframe.git
95-
git config --add remote.origin.fetch +refs/heads/*:refs/remotes/origin/*
96-
git config remote.origin.url https://github.com/eth-cscs/reframe.git
97-
git fetch --tags --quiet https://github.com/eth-cscs/reframe.git +refs/pull/*:refs/remotes/origin/pr/* +refs/heads/master:refs/remotes/origin/master
98-
git rev-parse ${env.ghprbActualCommit}^{commit}
99-
git config core.sparsecheckout
100-
git checkout -f ${env.ghprbActualCommit}"""
10189
}
10290
dir(reframeDir) {
103-
if (machineName != 'leone') {
104-
checkout scm
105-
}
91+
checkout scm
10692
sh("""${loginBash}
10793
${moduleDefinition}
108-
${gitClone}
10994
ln -sf ../${cscsSettings} reframe/settings.py
11095
bash ${reframeDir}/${bashScript} -f ${reframeDir} -i ''""")
11196
}

0 commit comments

Comments
 (0)