fix: some simplifications, removed unused functions

Author: fstagni

tests/.dirac-ci-config.yaml

@@ -4,7 +4,7 @@ config:
   CLIENT_UPLOAD_BASE64: SSBsaWtlIHBpenphIQo=
   CLIENT_UPLOAD_LFN: LFN:/vo/test_lfn.txt
   CLIENT_UPLOAD_FILE: test_lfn.txt
-  PILOT_INSTALLATION_COMMAND: dirac-pilot.py --modules /home/dirac/LocalRepo/ALTERNATIVE_MODULES/DIRAC -M 2 -N jenkins.cern.ch -Q jenkins-queue_not_important -n DIRAC.Jenkins.ch --pilotUUID=whatever12345 --cert --certLocation=/home/dirac/PilotInstallDIR/etc/grid-security --CVMFS_locations=/home/dirac/PilotInstallDIR -o diracInstallOnly --wnVO=vo --debug
+  PILOT_INSTALLATION_COMMAND: dirac-pilot.py --modules /home/dirac/LocalRepo/ALTERNATIVE_MODULES/DIRAC -M 2 -N jenkins.cern.ch -Q jenkins-queue_not_important -n DIRAC.Jenkins.ch --pilotUUID=whatever12345 --CVMFS_locations=/home/dirac/ -o diracInstallOnly --wnVO=vo --debug
   PILOT_JSON: "{
         \"timestamp\": \"2023-02-13T14:34:26.725499\",
         \"CEs\": {

tests/CI/run_pilot.sh

@@ -11,22 +11,21 @@ set -x
 source CONFIG
 
 # Creating "the worker node"
-mkdir -p /home/dirac/PilotInstallDIR/etc/grid-security/certificates
-mkdir -p /home/dirac/PilotInstallDIR/etc/grid-security/vomsdir
-mkdir -p /home/dirac/PilotInstallDIR/etc/grid-security/vomses
+mkdir -p /home/dirac/etc/grid-security/certificates
+mkdir -p /home/dirac/etc/grid-security/vomsdir
+mkdir -p /home/dirac/etc/grid-security/vomses
 
-cp /ca/certs/pilot.pem /home/dirac/PilotInstallDIR/etc/grid-security/hostcert.pem
-cp /ca/certs/pilot.key /home/dirac/PilotInstallDIR/etc/grid-security/hostkey.pem
-cp /ca/certs/ca.cert.pem /home/dirac/PilotInstallDIR/etc/grid-security/certificates
+cp /ca/certs/ca.cert.pem /home/dirac/etc/grid-security/certificates
+touch /home/dirac/etc/grid-security/vomsdir/vomsdir
+touch /home/dirac/etc/grid-security/vomses/vomses
 
-touch /home/dirac/PilotInstallDIR/etc/grid-security/vomsdir/vomsdir
-touch /home/dirac/PilotInstallDIR/etc/grid-security/vomses/vomses
-
-cd /home/dirac/PilotInstallDIR
+# Copy over the pilot proxy
+cp /ca/certs/pilot_proxy /tmp/x509up_u$UID
 
 eval "${PILOT_DOWNLOAD_COMMAND}"
 
 echo "${PILOT_JSON}" > pilot.json
+jq < pilot.json
 
 if command -v python &> /dev/null; then
   py='python'
@@ -36,7 +35,5 @@ elif command -v python2 &> /dev/null; then
   py='python2'
 fi
 
-more pilot.json | jq
-
 # shellcheck disable=SC2086
 $py ${PILOT_INSTALLATION_COMMAND}

tests/Integration/all_integration_pilot_tests.sh

@@ -8,13 +8,13 @@
 echo -e '****************************************'
 echo -e '********' "workflow tests" '********\n'
 
-source PilotInstallDIR/bashrc
+source bashrc
 
 THIS_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )"
 echo -e "THIS_DIR=${THIS_DIR}" |& tee -a pilotTestOutputs.txt
 
-cp PilotInstallDIR/pilot.cfg "${THIS_DIR}"
-cp PilotInstallDIR/pilot.cfg .
+cp pilot.cfg "${THIS_DIR}"
+cp pilot.cfg .
 
 echo -e "*** $(date -u)  Getting a non privileged user\n" |& tee -a pilotTestOutputs.txt
 dirac-admin-get-proxy "/C=ch/O=DIRAC/OU=DIRAC CI/CN=ciuser" dirac_user -o /DIRAC/Security/UseServerCertificate=True --cfg pilot.cfg --out=/tmp/x509up_u${UID} -ddd

tests/Jenkins/dirac-cfg-update.py

@@ -18,7 +18,7 @@
 #
 # === optional environment variables:
 #
-# WORKSPACE (set by Jenkins, normally. If not there, will be $PWD)
+# WORKSPACE (/home/dirac)
 # DEBUG (set it to whatever value to turn on debug messages)
 #
 # DIRAC_RELEASE (for installing a specific release)
@@ -40,8 +40,6 @@
 # ~/TestCode
 # ~/ServerInstallDIR
 # ~/ClientInstallDIR
-# ~/PilotInstallDIR
-
 
 # Def of environment variables:
 
@@ -67,8 +65,6 @@ mkdir -p "$WORKSPACE/ServerInstallDIR" # Where servers are installed
 SERVERINSTALLDIR=${_}
 mkdir -p "$WORKSPACE/ClientInstallDIR" # Where clients are installed
 CLIENTINSTALLDIR=${_}
-mkdir -p "$WORKSPACE/PilotInstallDIR" # Where pilots run
-PILOTINSTALLDIR=${_}
 
 # Location of the CFG file to be used (this can be replaced by the extensions)
 INSTALL_CFG_FILE="${TESTCODE}/DIRAC/tests/Jenkins/install.cfg"
@@ -407,6 +403,10 @@ fullInstallDIRAC() {
 
   echo "==> Restarting Configuration Server"
   dirac-restart-component Configuration Server -o /DIRAC/Security/UseServerCertificate=True ${DEBUG}
+
+  echo 'Generate a pilot proxy, to be used by the pilot'
+  dirac-proxy-init -g pilot -C /ca/certs/pilot.pem -K /ca/certs/pilot.key ${DEBUG}
+  mv /tmp/x509up_u$UID /ca/certs/pilot_proxy
 }
 
 

tests/Jenkins/dirac-refresh-cs.py

@@ -12,7 +12,7 @@ LocalInstallation
   #LogLevel of the installed components
   LogLevel = DEBUG
 
-  AdminUserName = adminusername
+  AdminUserName = ciuser
   #  DN of the Admin user certificate (default: None )
   #  In order the find out the DN that needs to be included in the Configuration for a given
   #  host or user certificate the following command can be used::