File tree Expand file tree Collapse file tree 3 files changed +5
-15
lines changed Expand file tree Collapse file tree 3 files changed +5
-15
lines changed Original file line number Diff line number Diff line change @@ -18,6 +18,8 @@ CSURL=https://$SERVER_HOST:9135/Configuration/Server
18
18
19
19
mkdir -p /home/dirac/ClientInstallDIR/etc
20
20
mkdir -p /home/dirac/.globus
21
+ cp /ca/certs/client.pem /home/dirac/.globus/usercert.pem
22
+ cp /ca/certs/client.key /home/dirac/.globus/userkey.pem
21
23
22
24
echo -e " *** $( date -u) **** Getting the tests ****\n"
23
25
@@ -27,10 +29,7 @@ cd "$PWD/TestCode"
27
29
if [[ -n " ${INSTALLATION_BRANCH} " ]]; then
28
30
# Use this for (e.g.) running backward-compatibility tests
29
31
echo " Using https://github.com/DIRACGrid/DIRAC.git@${INSTALLATION_BRANCH} for the tests"
30
- git clone " https://github.com/DIRACGrid/DIRAC.git"
31
- cd DIRAC
32
- git checkout " $INSTALLATION_BRANCH "
33
- cd -
32
+ git clone --single-branch --branch " $INSTALLATION_BRANCH " " https://github.com/DIRACGrid/DIRAC.git"
34
33
else
35
34
for repo_path in " ${TESTREPO[@]} " ; do
36
35
if [[ -d " ${repo_path} " ]]; then
39
38
echo " Using local test repository in branch $( git branch | grep " \*" | sed -e " s/* //" ) "
40
39
cd -
41
40
else
42
- git clone " https://github.com/$repo_path /DIRAC.git"
43
- cd " $( basename " ${repo_path} " ) "
44
- git checkout " $TESTBRANCH "
41
+ git clone --single-branch --branch " $TESTBRANCH " " https://github.com/$repo_path /DIRAC.git"
45
42
echo " Using remote test repository ${repo_path} in branch ${TESTBRANCH} "
46
- cd -
47
43
fi
48
44
done
49
45
fi
Original file line number Diff line number Diff line change @@ -33,11 +33,8 @@ for repo_path in "${TESTREPO[@]}"; do
33
33
echo " Using local test repository in branch $( git branch | grep " \*" | sed -e " s/* //" ) "
34
34
cd -
35
35
else
36
- git clone " https://github.com/$repo_path /DIRAC.git"
37
- cd " $( basename " ${repo_path} " ) "
38
- git checkout " $TESTBRANCH "
36
+ git clone --single-branch --branch " $TESTBRANCH " " https://github.com/$repo_path /DIRAC.git"
39
37
echo " Using remote test repository ${repo_path} in branch ${TESTBRANCH} "
40
- cd -
41
38
fi
42
39
done
43
40
Original file line number Diff line number Diff line change @@ -239,9 +239,6 @@ installDIRAC() {
239
239
echo " export X509_CERT_DIR=\" $PWD /diracos/etc/grid-security/certificates\" " >> " $PWD /bashrc"
240
240
source diracos/diracosrc
241
241
242
- cp /ca/certs/client.pem /home/dirac/.globus/usercert.pem
243
- cp /ca/certs/client.key /home/dirac/.globus/userkey.pem
244
-
245
242
if [[ -n " ${DIRAC_RELEASE+x} " ]]; then
246
243
if [[ -z " ${ALTERNATIVE_MODULES} " ]]; then
247
244
pip install DIRAC " ${DIRAC_RELEASE} "
You can’t perform that action at this time.
0 commit comments