Skip to content

Commit 8f13e26

Browse files
committed
test: removed some unused functions
1 parent d3c4cee commit 8f13e26

File tree

2 files changed

+0
-94
lines changed

2 files changed

+0
-94
lines changed

tests/Jenkins/dirac_ci.sh

Lines changed: 0 additions & 56 deletions
Original file line numberDiff line numberDiff line change
@@ -172,14 +172,6 @@ fullInstallDIRAC() {
172172

173173
killRunsv
174174

175-
# install ElasticSearch locally
176-
if [[ -z $NoSQLDB_HOST || $NoSQLDB_HOST == "localhost" ]]; then
177-
echo "Installing ElasticSearch locally"
178-
installES
179-
else
180-
echo "NoSQLDB_HOST != localhost, skipping local ElasticSearch install"
181-
fi
182-
183175
# basic install, with only the CS (and ComponentMonitoring) running, together with DB InstalledComponentsDB, which is needed)
184176
if ! installSite; then
185177
echo "ERROR: installSite failed" >&2
@@ -357,54 +349,6 @@ fullInstallDIRAC() {
357349
}
358350

359351

360-
#...............................................................................
361-
#
362-
# miniInstallDIRAC:
363-
#
364-
# This function install the bare minimum of DIRAC
365-
#
366-
#...............................................................................
367-
368-
miniInstallDIRAC(){
369-
echo "==> [miniInstallDIRAC]"
370-
371-
finalCleanup
372-
373-
killRunsv
374-
375-
# basic install, with only the CS (and ComponentMonitoring) running, together with DB InstalledComponentsDB, which is needed)
376-
if ! installSite; then
377-
echo "ERROR: installSite failed" >&2
378-
exit 1
379-
fi
380-
381-
# Dealing with security stuff
382-
# generateCertificates
383-
if ! generateUserCredentials; then
384-
echo "ERROR: generateUserCredentials failed" >&2
385-
exit 1
386-
fi
387-
388-
if ! diracCredentials; then
389-
echo "ERROR: diracCredentials failed" >&2
390-
exit 1
391-
fi
392-
393-
# just add a site
394-
if ! diracAddSite; then
395-
echo "ERROR: diracAddSite failed" >&2
396-
exit 1
397-
fi
398-
399-
# fix the SandboxStore and other stuff
400-
python "${TESTCODE}/DIRAC/tests/Jenkins/dirac-cfg-update-server.py" dirac-JenkinsSetup "${DEBUG}"
401-
402-
echo "==> Restarting Configuration Server"
403-
dirac-restart-component Configuration Server ${DEBUG}
404-
}
405-
406-
407-
408352
clean(){
409353

410354
echo "==> [clean]"

tests/Jenkins/utilities.sh

Lines changed: 0 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -419,24 +419,6 @@ getUserProxy() {
419419
}
420420

421421

422-
#.............................................................................
423-
#
424-
# prepareForServer:
425-
#
426-
# This function gets the DIRAC install script
427-
#
428-
#.............................................................................
429-
430-
prepareForServer() {
431-
echo '==> [prepareForServer]'
432-
433-
#get the necessary scripts: dirac-install.py file
434-
curl -O -L https://raw.githubusercontent.com/DIRACGrid/management/master/dirac-install.py
435-
cp dirac-install.py "${SERVERINSTALLDIR}/"
436-
chmod +x "${SERVERINSTALLDIR}/dirac-install.py"
437-
}
438-
439-
440422
#-------------------------------------------------------------------------------
441423
# OPEN SSL... let's create a fake CA and certificates
442424
#-------------------------------------------------------------------------------
@@ -1057,23 +1039,3 @@ downloadProxy() {
10571039
exit 1
10581040
fi
10591041
}
1060-
1061-
1062-
#.............................................................................
1063-
#
1064-
# installES:
1065-
#
1066-
# install (and run) ElasticSearch in the current directory
1067-
#
1068-
#.............................................................................
1069-
1070-
installES() {
1071-
echo '==> [installES]'
1072-
1073-
curl -L -O https://artifacts.elastic.co/downloads/elasticsearch/elasticsearch-6.6.0.tar.gz
1074-
tar -xvf elasticsearch-6.6.0.tar.gz
1075-
cd elasticsearch-6.6.0/bin
1076-
./elasticsearch -d -Ecluster.name=jenkins_cluster -Enode.name=jenkins_node &
1077-
1078-
cd ../..
1079-
}

0 commit comments

Comments
 (0)