Skip to content

Revert to normal leone checkout #173

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Mar 5, 2018
Merged

Revert to normal leone checkout #173

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
edb3709
Revert to normal leone checkout
Mar 5, 2018
a7ce40b
Merge branch 'master' into ci/revert_normal_leone
vkarak Mar 5, 2018
e7cc166
Merge branch 'master' into ci/revert_normal_leone
vkarak Mar 5, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 1 addition & 16 deletions Jenkinsfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,29 +83,14 @@ stage('Unittest') {
echo \$SCRATCH""").trim()
def reframeDir = "${scratch}/${dirPrefix}-${machineName}-${uniqueID}"
def moduleDefinition = ''
def gitClone = ''
if (machineName == 'leone') {
moduleDefinition = '''module() { eval `/usr/bin/modulecmd bash $*`; }
export -f module'''
gitClone = """module use /apps/common/UES/RHAT6/easybuild/modules/all/
module load git
git init .
git fetch --tags --quiet https://github.com/eth-cscs/reframe.git +refs/heads/*:refs/remotes/origin/*
git config remote.origin.url https://github.com/eth-cscs/reframe.git
git config --add remote.origin.fetch +refs/heads/*:refs/remotes/origin/*
git config remote.origin.url https://github.com/eth-cscs/reframe.git
git fetch --tags --quiet https://github.com/eth-cscs/reframe.git +refs/pull/*:refs/remotes/origin/pr/* +refs/heads/master:refs/remotes/origin/master
git rev-parse ${env.ghprbActualCommit}^{commit}
git config core.sparsecheckout
git checkout -f ${env.ghprbActualCommit}"""
}
dir(reframeDir) {
if (machineName != 'leone') {
checkout scm
}
checkout scm
sh("""${loginBash}
${moduleDefinition}
${gitClone}
ln -sf ../${cscsSettings} reframe/settings.py
bash ${reframeDir}/${bashScript} -f ${reframeDir} -i ''""")
}
Expand Down