Skip to content

Commit

Permalink
test: fixed version of new schema, added as variable to matrix
Browse files Browse the repository at this point in the history
  • Loading branch information
@fstagni
fstagni committed Oct 12, 2023
1 parent f18ac29 commit 5e465f7
Show file tree
Hide file tree
Showing 2 changed files with 40 additions and 145 deletions.
15 changes: 9 additions & 6 deletions .github/workflows/integration.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,9 @@ jobs:
dirac_version:
- rel-v8r0
- integration
pilot_schema:
- pilot_oldSchema.json
- pilot_newSchema.json

container: python:${{ matrix.python }}-slim

Expand All @@ -34,7 +37,7 @@ jobs:
- name: tests
run: |
cd Pilot
cp ../tests/CI/pilot_oldSchema.json pilot.json
cp ../tests/CI/${{ matrix.pilot_schema }} pilot.json
sed -i "s/VAR_JENKINS_SITE/DIRAC.Jenkins.ch/g" pilot.json
sed -i "s/VAR_JENKINS_CE/jenkins.cern.ch/g" pilot.json
sed -i "s/VAR_JENKINS_QUEUE/jenkins-queue_not_important/g" pilot.json
Expand Down Expand Up @@ -73,7 +76,7 @@ jobs:
DIRAC_VOMSES: /cvmfs/grid.cern.ch/etc/grid-security/vomses
run: |
cd Pilot
cp ../tests/CI/pilot_oldSchema.json pilot.json
cp ../tests/CI/${{ matrix.pilot_schema }} pilot.json
sed -i "s/VAR_JENKINS_SITE/DIRAC.Jenkins.ch/g" pilot.json
sed -i "s/VAR_JENKINS_CE/jenkins.cern.ch/g" pilot.json
sed -i "s/VAR_JENKINS_QUEUE/jenkins-queue_not_important/g" pilot.json
Expand Down Expand Up @@ -112,7 +115,7 @@ jobs:
- name: tests
run: |
cd Pilot
cp ../tests/CI/pilot_oldSchema.json pilot.json
cp ../tests/CI/${{ matrix.pilot_schema }} pilot.json
sed -i "s/VAR_JENKINS_SITE/DIRAC.Jenkins.ch/g" pilot.json
sed -i "s/VAR_JENKINS_CE/jenkins-full.cern.ch/g" pilot.json
sed -i "s/VAR_JENKINS_QUEUE/jenkins-queue_not_important/g" pilot.json
Expand Down Expand Up @@ -151,7 +154,7 @@ jobs:
DIRAC_VOMSES: /cvmfs/grid.cern.ch/etc/grid-security/vomses
run: |
cd Pilot
cp ../tests/CI/pilot_oldSchema.json pilot.json
cp ../tests/CI/${{ matrix.pilot_schema }} pilot.json
sed -i "s/VAR_JENKINS_SITE/DIRAC.Jenkins.ch/g" pilot.json
sed -i "s/VAR_JENKINS_CE/jenkins-full.cern.ch/g" pilot.json
sed -i "s/VAR_JENKINS_QUEUE/jenkins-queue_not_important/g" pilot.json
Expand Down Expand Up @@ -201,7 +204,7 @@ jobs:
cd Pilot
export VO_LHCB_SW_DIR=${GITHUB_WORKSPACE}/Pilot
curl https://lhcbdirac.s3.cern.ch/Pilot3/LHCbPilotCommands.py -o LHCbPilotCommands.py
cp ../tests/CI/pilot_oldSchema.json pilot.json
cp ../tests/CI/${{ matrix.pilot_schema }} pilot.json
sed -i "s/VAR_JENKINS_SITE/DIRAC.Jenkins.ch/g" pilot.json
sed -i "s/VAR_JENKINS_CE/jenkins-lhcb.cern.ch/g" pilot.json
sed -i "s/VAR_JENKINS_QUEUE/jenkins-queue_not_important/g" pilot.json
Expand Down Expand Up @@ -243,7 +246,7 @@ jobs:
cd Pilot
export VO_LHCB_SW_DIR=${GITHUB_WORKSPACE}/Pilot
curl https://lhcbdirac.s3.cern.ch/Pilot3/LHCbPilotCommands.py -o LHCbPilotCommands.py
cp ../tests/CI/pilot_oldSchema.json pilot.json
cp ../tests/CI/${{ matrix.pilot_schema }} pilot.json
sed -i "s/VAR_JENKINS_SITE/DIRAC.Jenkins.ch/g" pilot.json
sed -i "s/VAR_JENKINS_CE/jenkins-lhcb.cern.ch/g" pilot.json
sed -i "s/VAR_JENKINS_QUEUE/jenkins-queue_not_important/g" pilot.json
Expand Down
170 changes: 31 additions & 139 deletions tests/CI/pilot_newSchema.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -79,156 +79,48 @@
"GridCEType": "LHCbD"
}
},
"GenericPilotDNs": [],
"Defaults": {
"EMail": {
"Production": "[email protected]",
"Logging": "[email protected]"
},
"InputDataPolicy": {
"Default": "DIRAC.WorkloadManagementSystem.Client.DownloadInputData"
},
"DataManagement": {
"ForceSingleSitePerSE": "False",
"AccessProtocols": "srm, root, dips",
"RegistrationProtocols": "srm, dips, root",
"ThirdPartyProtocols": "srm, dips, root",
"WriteProtocols": "srm, root, dips",
"UseCatalogPFN": "False"
},
"Shifter": {
"GridPPLogManager": {
"User": "diracpilottest.grid.hep.ph.ic.ac.uk",
"Group": "gridpp_user"
}
},
"Pilot": {
"RemoteLogging": "False",
"Commands": {
"TEST": [
"CheckWorkerNode",
"InstallDIRAC",
"ConfigureBasics",
"CheckCECapabilities",
"CheckWNCapabilities",
"ConfigureSite",
"ConfigureArchitecture",
"ConfigureCPURequirements"
],
"TEST-MP": [
"CheckWorkerNode",
"InstallDIRAC",
"ConfigureBasics",
"CheckCECapabilities",
"CheckWNCapabilities",
"ConfigureSite",
"ConfigureArchitecture",
"ConfigureCPURequirements"
],
"TEST-FULL": [
"CheckWorkerNode",
"InstallDIRAC",
"ConfigureBasics",
"CheckCECapabilities",
"CheckWNCapabilities",
"ConfigureSite",
"ConfigureArchitecture",
"ConfigureCPURequirements",
"LaunchAgent"
],
"LHCb": [
"CheckWorkerNode",
"LHCbInstallDIRAC",
"LHCbConfigureBasics",
"RegisterPilot",
"CheckCECapabilities",
"LHCbAddCVMFSTags",
"CheckWNCapabilities",
"LHCbConfigureSite",
"LHCbConfigureArchitecture",
"LHCbConfigureCPURequirements"
],
"LHCbD": [
"CheckWorkerNode",
"InstallDIRAC",
"LHCbConfigureBasics",
"RegisterPilot",
"CheckCECapabilities",
"LHCbAddCVMFSTags",
"CheckWNCapabilities",
"LHCbConfigureSite",
"LHCbConfigureArchitecture",
"LHCbConfigureCPURequirements"
]
"TEST": "CheckWorkerNode, InstallDIRAC, ConfigureBasics, RegisterPilot, CheckCECapabilities, CheckWNCapabilities, ConfigureSite, ConfigureArchitecture, ConfigureCPURequirements",
"TEST-MP": "CheckWorkerNode, InstallDIRAC, ConfigureBasics, RegisterPilot, CheckCECapabilities, CheckWNCapabilities, ConfigureSite, ConfigureArchitecture, ConfigureCPURequirements",
"TEST-FULL": "CheckWorkerNode, InstallDIRAC, ConfigureBasics, RegisterPilot, CheckCECapabilities, CheckWNCapabilities, ConfigureSite, ConfigureArchitecture, ConfigureCPURequirements, LaunchAgent",
"LHCb": "CheckWorkerNode, LHCbInstallDIRAC, LHCbConfigureBasics, RegisterPilot, CheckCECapabilities, LHCbAddCVMFSTags, CheckWNCapabilities, LHCbConfigureSite, LHCbConfigureArchitecture, LHCbConfigureCPURequirements",
"LHCbD": "CheckWorkerNode, InstallDIRAC, LHCbConfigureBasics, RegisterPilot, CheckCECapabilities, LHCbAddCVMFSTags, CheckWNCapabilities, LHCbConfigureSite, LHCbConfigureArchitecture, LHCbConfigureCPURequirements"
}
}
},
"gridpp": {
"DIRAC-Certification": {
"Pilot": {
"Version": "VAR_DIRAC_VERSION",
"Extensions": "None",
"CheckVersion": "False",
"pilotFileServer": "lbvobox70.cern.ch:8443",
"pilotRepoBranch": "does_not_matter",
"pilotRepo": "https://github.com/does_not_matter/Pilot.git",
"GenericPilotGroup": "gridpp_pilot",
"GenericPilotDN": "VAR_USERDN_GRIDPP",
"RemoteLogging": "True",
"RemoteLoggerURL": "https://lbvobox70.cern.ch:8443/WorkloadManagement/TornadoPilotLogging",
"UploadSE": "UKI-LT2-IC-HEP-disk",
"UploadPath": "/gridpp/pilotlogs/",
"LoggingShifterName": "GridPPLogManager",
"PilotLogLevel": "DEBUG"
},
"Shifter": {
"SAMManager": {
"User": "diracpilottest.grid.hep.ph.ic.ac.uk",
"Group": "gridpp_user"
},
"ProductionManager": {
"User": "diracpilottest.grid.hep.ph.ic.ac.uk",
"Group": "gridpp_user"
},
"DataManager": {
"User": "diracpilottest.grid.hep.ph.ic.ac.uk",
"Group": "gridpp_user"
}
},
"Services": {
"Catalogs": {
"CatalogList": "FileCatalog",
"FileCatalog": {
"Status": "Active",
"AccessType": "ReadWrite"
},
"ICRucioFileCatalog": {
"AccessType": "Read-Write",
"Status": "Active",
"Master": "True"
}
},
"JobMonitoring": {
"usePilotsLoggingFlag": "True",
"DownloadLocation": "https://lbvobox70.cern.ch:8444/WorkloadManagement/TornadoPilotLogging"
}
}
"Pilot": {
"Version": "VAR_DIRAC_VERSION",
"Extensions": "None",
"CheckVersion": "False",
"pilotFileServer": "lbvobox70.cern.ch:8443",
"pilotRepoBranch": "does_not_matter",
"pilotRepo": "https://github.com/does_not_matter/Pilot.git",
"GenericPilotGroup": "gridpp_pilot",
"GenericPilotDN": "VAR_USERDN_GRIDPP",
"RemoteLogging": "True",
"RemoteLoggerURL": "https://lbvobox70.cern.ch:8443/WorkloadManagement/TornadoPilotLogging",
"UploadSE": "UKI-LT2-IC-HEP-disk",
"UploadPath": "/gridpp/pilotlogs/",
"LoggingShifterName": "GridPPLogManager",
"PilotLogLevel": "DEBUG"
}
},
"dteam": {
"DIRAC-Certification": {
"Pilot": {
"Version": "VAR_DIRAC_VERSION",
"CheckVersion": "True",
"pilotFileServer": "lbvobox70.cern.ch:8443",
"pilotRepoBranch": "should_not_matter",
"pilotRepo": "https://github.com/should_not_matter/Pilot.git",
"GenericPilotGroup": "dteam_pilot",
"GenericPilotDN": "VAR_USERDN",
"RemoteLogging": "False",
"RemoteLoggerURL": "https://lbvobox70.cern.ch:8443/WorkloadManagement/TornadoPilotLogging",
"PilotLogLevel": "DEBUG"
}
"Pilot": {
"Version": "VAR_DIRAC_VERSION",
"CheckVersion": "True",
"pilotFileServer": "lbvobox70.cern.ch:8443",
"pilotRepoBranch": "should_not_matter",
"pilotRepo": "https://github.com/should_not_matter/Pilot.git",
"GenericPilotGroup": "dteam_pilot",
"GenericPilotDN": "VAR_USERDN",
"RemoteLogging": "False",
"RemoteLoggerURL": "https://lbvobox70.cern.ch:8443/WorkloadManagement/TornadoPilotLogging",
"PilotLogLevel": "DEBUG"
}
},
"ConfigurationServers": [
Expand Down

0 comments on commit 5e465f7

Please sign in to comment.