Skip to content

Commit e7823c6

Browse files
committed
fix: saving some time in cloning
1 parent 11efbd4 commit e7823c6

File tree

3 files changed

+5
-15
lines changed

3 files changed

+5
-15
lines changed

tests/CI/install_client.sh

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,8 @@ CSURL=https://$SERVER_HOST:9135/Configuration/Server
1818

1919
mkdir -p /home/dirac/ClientInstallDIR/etc
2020
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
2123

2224
echo -e "*** $(date -u) **** Getting the tests ****\n"
2325

@@ -27,10 +29,7 @@ cd "$PWD/TestCode"
2729
if [[ -n "${INSTALLATION_BRANCH}" ]]; then
2830
# Use this for (e.g.) running backward-compatibility tests
2931
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"
3433
else
3534
for repo_path in "${TESTREPO[@]}"; do
3635
if [[ -d "${repo_path}" ]]; then
@@ -39,11 +38,8 @@ else
3938
echo "Using local test repository in branch $(git branch | grep "\*" | sed -e "s/* //")"
4039
cd -
4140
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"
4542
echo "Using remote test repository ${repo_path} in branch ${TESTBRANCH}"
46-
cd -
4743
fi
4844
done
4945
fi

tests/CI/install_server.sh

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -33,11 +33,8 @@ for repo_path in "${TESTREPO[@]}"; do
3333
echo "Using local test repository in branch $(git branch | grep "\*" | sed -e "s/* //")"
3434
cd -
3535
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"
3937
echo "Using remote test repository ${repo_path} in branch ${TESTBRANCH}"
40-
cd -
4138
fi
4239
done
4340

tests/Jenkins/utilities.sh

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -239,9 +239,6 @@ installDIRAC() {
239239
echo "export X509_CERT_DIR=\"$PWD/diracos/etc/grid-security/certificates\"" >> "$PWD/bashrc"
240240
source diracos/diracosrc
241241

242-
cp /ca/certs/client.pem /home/dirac/.globus/usercert.pem
243-
cp /ca/certs/client.key /home/dirac/.globus/userkey.pem
244-
245242
if [[ -n "${DIRAC_RELEASE+x}" ]]; then
246243
if [[ -z "${ALTERNATIVE_MODULES}" ]]; then
247244
pip install DIRAC "${DIRAC_RELEASE}"

0 commit comments

Comments
 (0)