From edb37096de2c6c052fbd742ad2a8d725682e0ff4 Mon Sep 17 00:00:00 2001
From: Theofilos Manitaras <manitaras@cscs.ch>
Date: Mon, 5 Mar 2018 08:55:31 +0100
Subject: [PATCH] Revert to normal leone checkout

---
 Jenkinsfile | 17 +----------------
 1 file changed, 1 insertion(+), 16 deletions(-)

diff --git a/Jenkinsfile b/Jenkinsfile
index eecd2eaacf..7ce86b7677 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -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 ''""")
                 }