Skip to content

Commit 035de22

Browse files
fstagnifstagni
committed
feat: added parameter for specifying the dirac-architecture script to use
1 parent aa95e04 commit 035de22

File tree

5 files changed

+26
-17
lines changed

5 files changed

+26
-17
lines changed

‎.github/workflows/integration.yml

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ jobs:
1111
dirac_branch:
1212
- rel-v8r0
1313
- integration
14+
1415
pilot_schema:
1516
- pilot_oldSchema.json
1617
- pilot_newSchema.json
@@ -50,7 +51,7 @@ jobs:
5051
g_job="testintegrationworkflow${GITHUB_JOB//-/}"
5152
pilotUUID="${g_job//_/}""$(shuf -i 2000-65000 -n 1)"
5253
pilotUUID=$(echo $pilotUUID | rev | cut -c 1-32 | rev)
53-
python dirac-pilot.py --modules https://github.com/DIRACGrid/DIRAC.git:::DIRAC:::${{ matrix.dirac_branch }} -M 1 -S DIRAC-Certification -N jenkins.cern.ch -Q jenkins-queue_not_important -n DIRAC.Jenkins.ch --cert --certLocation=${GITHUB_WORKSPACE}/Pilot/etc/grid-security --wnVO=${{ matrix.VO }} --pilotUUID="${pilotUUID}" --debug
54+
python dirac-pilot.py --modules https://github.com/DIRACGrid/DIRAC.git:::DIRAC:::${{ matrix.dirac_branch }} -M 1 -S DIRAC-Certification -N jenkins.cern.ch -Q jenkins-queue_not_important -n DIRAC.Jenkins.ch --architectureScript="dirac-apptainer-exec dirac-platform" --cert --certLocation=${GITHUB_WORKSPACE}/Pilot/etc/grid-security --wnVO=${{ matrix.VO }} --pilotUUID="${pilotUUID}" --debug
5455
5556
5657
integration-cvmfs:
@@ -107,7 +108,7 @@ jobs:
107108
g_job="testintegrationworkflow${GITHUB_JOB//-/}"
108109
pilotUUID="${g_job//_/}""$(shuf -i 2000-65000 -n 1)"
109110
pilotUUID=$(echo $pilotUUID | rev | cut -c 1-32 | rev)
110-
python dirac-pilot.py -M 1 -S DIRAC-Certification -N jenkins.cern.ch -Q jenkins-queue_not_important -n DIRAC.Jenkins.ch --preinstalledEnvPrefix=/cvmfs/dirac.egi.eu/dirac --wnVO=dteam --cert --certLocation=${GITHUB_WORKSPACE}/Pilot/etc/grid-security --pilotUUID="${pilotUUID}" --debug
111+
python dirac-pilot.py -M 1 -S DIRAC-Certification -N jenkins.cern.ch -Q jenkins-queue_not_important -n DIRAC.Jenkins.ch --architectureScript=dirac-platform --preinstalledEnvPrefix=/cvmfs/dirac.egi.eu/dirac --wnVO=dteam --cert --certLocation=${GITHUB_WORKSPACE}/Pilot/etc/grid-security --pilotUUID="${pilotUUID}" --debug
111112
112113
113114
integration-cvmfs_no_env_CEs:
@@ -155,7 +156,7 @@ jobs:
155156
g_job="testintegrationworkflow${GITHUB_JOB//-/}"
156157
pilotUUID="${g_job//_/}""$(shuf -i 2000-65000 -n 1)"
157158
pilotUUID=$(echo $pilotUUID | rev | cut -c 1-32 | rev)
158-
python dirac-pilot.py -M 1 -S DIRAC-Certification -N ${{ matrix.ce }} -Q jenkins-queue_not_important -n DIRAC.Jenkins.ch --preinstalledEnvPrefix=/cvmfs/dirac.egi.eu/dirac --cert --certLocation=${GITHUB_WORKSPACE}/Pilot/etc/grid-security --wnVO=dteam -o cvmfsOnly --pilotUUID="${pilotUUID}" --debug
159+
python dirac-pilot.py -M 1 -S DIRAC-Certification -N ${{ matrix.ce }} -Q jenkins-queue_not_important -n DIRAC.Jenkins.ch --preinstalledEnvPrefix=/cvmfs/dirac.egi.eu/dirac --architectureScript="dirac-apptainer-exec dirac-platform" --cert --certLocation=${GITHUB_WORKSPACE}/Pilot/etc/grid-security --wnVO=dteam -o cvmfsOnly --pilotUUID="${pilotUUID}" --debug
159160
160161
161162
matching:
@@ -362,7 +363,7 @@ jobs:
362363
g_job="testintegrationworkflow${GITHUB_JOB//-/}"
363364
pilotUUID="${g_job//_/}""$(shuf -i 2000-65000 -n 1)"
364365
pilotUUID=$(echo $pilotUUID | rev | cut -c 1-32 | rev)
365-
python dirac-pilot.py -M 1 -S DIRAC-Certification -N jenkins-lhcb.cern.ch -Q jenkins-queue_not_important -n DIRAC.Jenkins.ch -e LHCb -l LHCb -E LHCbPilot --cert --certLocation=${GITHUB_WORKSPACE}/Pilot/etc/grid-security --wnVO=LHCb -o lbRunOnly --pilotUUID="${pilotUUID}" --debug
366+
python dirac-pilot.py -M 1 -S DIRAC-Certification -N jenkins-lhcb.cern.ch -Q jenkins-queue_not_important -n DIRAC.Jenkins.ch -e LHCb -l LHCb -E LHCbPilot --architectureScript=dirac-architecture --cert --certLocation=${GITHUB_WORKSPACE}/Pilot/etc/grid-security --wnVO=LHCb -o lbRunOnly --pilotUUID="${pilotUUID}" --debug
366367
367368
ext-lhcb_integration_dirac_installer_no_env:
368369
runs-on: ubuntu-latest
@@ -458,4 +459,4 @@ jobs:
458459
g_job="testintegrationworkflow${GITHUB_JOB//-/}"
459460
pilotUUID="${g_job//_/}""$(shuf -i 2000-65000 -n 1)"
460461
pilotUUID=$(echo $pilotUUID | rev | cut -c 1-32 | rev)
461-
python dirac-pilot.py -M 1 -S DIRAC-Certification -N jenkins-lhcb.cern.ch -Q jenkins-queue_not_important -n DIRAC.Jenkins.ch -e LHCb -l LHCb -E LHCbPilot --preinstalledEnvPrefix=/cvmfs/lhcb.cern.ch/lhcbdirac/ --cert --certLocation=${GITHUB_WORKSPACE}/Pilot/etc/grid-security --wnVO=LHCb -o cvmfsOnly --pilotUUID="${pilotUUID}" --debug
462+
python dirac-pilot.py -M 1 -S DIRAC-Certification -N jenkins-lhcb.cern.ch -Q jenkins-queue_not_important -n DIRAC.Jenkins.ch -e LHCb -l LHCb -E LHCbPilot --preinstalledEnvPrefix=/cvmfs/lhcb.cern.ch/lhcbdirac/ --architectureScript="dirac-apptainer-exec dirac-architecture" --cert --certLocation=${GITHUB_WORKSPACE}/Pilot/etc/grid-security --wnVO=LHCb -o cvmfsOnly --pilotUUID="${pilotUUID}" --debug

‎Pilot/pilotCommands.py

Lines changed: 11 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -824,16 +824,21 @@ def execute(self):
824824
cfg = []
825825
if self.pp.useServerCertificate:
826826
cfg.append("-o /DIRAC/Security/UseServerCertificate=yes")
827-
if self.pp.localConfigFile:
828-
cfg.extend(["--cfg", self.pp.localConfigFile]) # this file is as input
829827

830-
architectureCmd = "%s %s -d" % (self.pp.architectureScript, " ".join(cfg))
828+
archScript = self.pp.architectureScript
829+
if self.pp.architectureScript.split(" ")[0] == 'dirac-apptainer-exec':
830+
archScript = self.pp.architectureScript.split(" ")[1]
831+
832+
architectureCmd = "%s %s" % (archScript, " ".join(cfg))
833+
834+
if self.pp.architectureScript.split(" ")[0] == 'dirac-apptainer-exec':
835+
architectureCmd = "dirac-apptainer-exec '%s' %s" % (architectureCmd, " ".join(cfg))
831836

832837
retCode, localArchitecture = self.executeAndGetOutput(architectureCmd, self.pp.installEnv)
833838
if retCode:
834-
self.log.error("There was an error updating the platform [ERROR %d]" % retCode)
839+
self.log.error("There was an error getting the platform [ERROR %d]" % retCode)
835840
self.exitWithError(retCode)
836-
self.log.info("Architecture determined: %s" % localArchitecture.strip().split("\n")[-1])
841+
self.log.info("Architecture determined: %s" % localArchitecture.strip())
837842

838843
# standard options
839844
cfg = ["-FDMH"] # force update, skip CA checks, skip CA download, skip VOMS
@@ -846,7 +851,7 @@ def execute(self):
846851
cfg.append("-ddd")
847852

848853
# real options added here
849-
localArchitecture = localArchitecture.strip().split("\n")[-1].strip()
854+
localArchitecture = localArchitecture.strip()
850855
cfg.append('-S "%s"' % self.pp.setup)
851856
cfg.append("-o /LocalSite/Architecture=%s" % localArchitecture)
852857

‎Pilot/pilotTools.py

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -986,6 +986,7 @@ def __init__(self):
986986
("", "pilotUUID=", "pilot UUID"),
987987
("", "preinstalledEnv=", "preinstalled pilot environment script location"),
988988
("", "preinstalledEnvPrefix=", "preinstalled pilot environment area prefix"),
989+
("", "architectureScript=", "architecture script to use"),
989990
("", "CVMFS_locations=", "comma-separated list of CVMS locations"),
990991
)
991992

@@ -1160,6 +1161,8 @@ def __initCommandLine2(self):
11601161
self.preinstalledEnv = v
11611162
elif o == "--preinstalledEnvPrefix":
11621163
self.preinstalledEnvPrefix = v
1164+
elif o == "--architectureScript":
1165+
self.architectureScript = v
11631166
elif o == "--CVMFS_locations":
11641167
self.CVMFS_locations = v.split(",")
11651168

‎tests/CI/pilot_newSchema.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -90,8 +90,8 @@
9090
"TEST": "CheckWorkerNode, InstallDIRAC, ConfigureBasics, RegisterPilot, CheckCECapabilities, CheckWNCapabilities, ConfigureSite, ConfigureArchitecture, ConfigureCPURequirements",
9191
"TEST-MP": "CheckWorkerNode, InstallDIRAC, ConfigureBasics, RegisterPilot, CheckCECapabilities, CheckWNCapabilities, ConfigureSite, ConfigureArchitecture, ConfigureCPURequirements",
9292
"TEST-FULL": "CheckWorkerNode, InstallDIRAC, ConfigureBasics, RegisterPilot, CheckCECapabilities, CheckWNCapabilities, ConfigureSite, ConfigureArchitecture, ConfigureCPURequirements, LaunchAgent",
93-
"LHCb": "CheckWorkerNode, LHCbInstallDIRAC, LHCbConfigureBasics, RegisterPilot, CheckCECapabilities, LHCbAddCVMFSTags, CheckWNCapabilities, LHCbConfigureSite, LHCbConfigureArchitecture, LHCbConfigureCPURequirements",
94-
"LHCbD": "CheckWorkerNode, InstallDIRAC, LHCbConfigureBasics, RegisterPilot, CheckCECapabilities, LHCbAddCVMFSTags, CheckWNCapabilities, LHCbConfigureSite, LHCbConfigureArchitecture, LHCbConfigureCPURequirements",
93+
"LHCb": "CheckWorkerNode, LHCbInstallDIRAC, LHCbConfigureBasics, RegisterPilot, CheckCECapabilities, LHCbAddCVMFSTags, CheckWNCapabilities, ConfigureSite, LHCbConfigureArchitecture, ConfigureCPURequirements",
94+
"LHCbD": "CheckWorkerNode, InstallDIRAC, LHCbConfigureBasics, RegisterPilot, CheckCECapabilities, LHCbAddCVMFSTags, CheckWNCapabilities, ConfigureSite, LHCbConfigureArchitecture, ConfigureCPURequirements",
9595
"LHCbDD": "CheckWorkerNode, InstallDIRAC, ConfigureBasics, RegisterPilot, CheckCECapabilities, LHCbAddCVMFSTags, CheckWNCapabilities, ConfigureSite, LHCbConfigureArchitecture, ConfigureCPURequirements"
9696
}
9797
}

‎tests/CI/pilot_oldSchema.json

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -45,9 +45,9 @@
4545
"CheckCECapabilities",
4646
"LHCbAddCVMFSTags",
4747
"CheckWNCapabilities",
48-
"LHCbConfigureSite",
48+
"ConfigureSite",
4949
"LHCbConfigureArchitecture",
50-
"LHCbConfigureCPURequirements"
50+
"ConfigureCPURequirements"
5151
],
5252
"LHCbD": [
5353
"CheckWorkerNode",
@@ -57,9 +57,9 @@
5757
"CheckCECapabilities",
5858
"LHCbAddCVMFSTags",
5959
"CheckWNCapabilities",
60-
"LHCbConfigureSite",
60+
"ConfigureSite",
6161
"LHCbConfigureArchitecture",
62-
"LHCbConfigureCPURequirements"
62+
"ConfigureCPURequirements"
6363
],
6464
"LHCbDD": [
6565
"CheckWorkerNode",

0 commit comments

Comments
 (0)