Skip to content

Commit eca8d6a

Browse files
committed
fix: remove DIRAC setup
1 parent a2e3fb0 commit eca8d6a

File tree

3 files changed

+30
-40
lines changed

3 files changed

+30
-40
lines changed

diracx-cli/tests/legacy/cs_sync/integration_test.cfg

Lines changed: 15 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -9,21 +9,18 @@ DIRAC
99
}
1010
Setups
1111
{
12-
dirac-JenkinsSetup
13-
{
14-
Accounting = Production
15-
Configuration = Production
16-
DataManagement = Production
17-
Framework = Production
18-
Monitoring = Production
19-
RequestManagement = Production
20-
ResourceStatus = Production
21-
StorageManagement = Production
22-
Production = Production
23-
Transformation = Production
24-
WorkloadManagement = Production
25-
Tornado = Production
26-
}
12+
Accounting = Production
13+
Configuration = Production
14+
DataManagement = Production
15+
Framework = Production
16+
Monitoring = Production
17+
RequestManagement = Production
18+
ResourceStatus = Production
19+
StorageManagement = Production
20+
Production = Production
21+
Transformation = Production
22+
WorkloadManagement = Production
23+
Tornado = Production
2724
}
2825
}
2926
DiracX
@@ -1195,8 +1192,7 @@ Systems
11951192
Backend = local
11961193
MaxSandboxSizeMiB = 10
11971194
SandboxPrefix = Sandbox
1198-
#@@-prod - /C=ch/O=DIRAC/OU=DIRAC CI/CN=ciuser - 2023-10-02 12:36:08
1199-
BasePath = dirac-JenkinsSetup/sandboxes
1195+
BasePath = sandboxes
12001196
DelayedExternalDeletion = True
12011197
Authorization
12021198
{
@@ -1206,7 +1202,6 @@ Systems
12061202
Default = authenticated
12071203
}
12081204
}
1209-
#@@-prod - /C=ch/O=DIRAC/OU=DIRAC CI/CN=ciuser - 2023-10-02 12:36:08
12101205
LogLevel = DEBUG
12111206
}
12121207
TornadoWMSAdministrator
@@ -1249,7 +1244,7 @@ Systems
12491244
SandboxStore
12501245
{
12511246
#@@-prod - /C=ch/O=DIRAC/OU=DIRAC CI/CN=ciuser - 2023-10-02 12:36:08
1252-
BasePath = dirac-JenkinsSetup/sandboxes
1247+
BasePath = sandboxes
12531248
#@@-prod - /C=ch/O=DIRAC/OU=DIRAC CI/CN=ciuser - 2023-10-02 12:36:08
12541249
LogLevel = DEBUG
12551250
}
@@ -1749,7 +1744,7 @@ Resources
17491744
#@@-prod - /C=ch/O=DIRAC/OU=DIRAC CI/CN=ciuser - 2023-10-02 12:36:08
17501745
Access = remote
17511746
#@@-prod - /C=ch/O=DIRAC/OU=DIRAC CI/CN=ciuser - 2023-10-02 12:36:08
1752-
Path = dirac-JenkinsSetup/sandboxes
1747+
Path = sandboxes
17531748
}
17541749
}
17551750
#@@-prod - /C=ch/O=DIRAC/OU=DIRAC CI/CN=ciuser - 2023-10-02 12:36:08

diracx-cli/tests/legacy/cs_sync/integration_test.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -177,7 +177,7 @@ Resources:
177177
DIP:
178178
Access: remote
179179
Host: localhost
180-
Path: dirac-JenkinsSetup/sandboxes
180+
Path: sandboxes
181181
Port: '9196'
182182
Protocol: dips
183183
ProtocolName: DIP
@@ -817,7 +817,7 @@ Systems:
817817
Default: authenticated
818818
Port: '9171'
819819
SandboxStore:
820-
BasePath: dirac-JenkinsSetup/sandboxes
820+
BasePath: sandboxes
821821
LogLevel: DEBUG
822822
TornadoJobManager:
823823
Authorization:
@@ -844,7 +844,7 @@ Systems:
844844
FileTransfer:
845845
Default: authenticated
846846
Backend: local
847-
BasePath: dirac-JenkinsSetup/sandboxes
847+
BasePath: sandboxes
848848
DelayedExternalDeletion: 'True'
849849
LocalSE: ProductionSandboxSE
850850
LogLevel: DEBUG

diracx-cli/tests/legacy/cs_sync/integration_test_secret.cfg

Lines changed: 12 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@ LocalInstallation
55
InstallType = server
66
TargetPath = /home/dirac/ServerInstallDIR
77
SiteName = DIRAC.Jenkins.ch
8-
Setup = dirac-JenkinsSetup
98
InstanceName = Production
109
VirtualOrganization = vo
1110
SkipCADownload = True
@@ -67,29 +66,25 @@ LocalInstallation
6766
}
6867
DIRAC
6968
{
70-
Setup = dirac-JenkinsSetup
7169
VirtualOrganization = vo
7270
Hostname = server
7371
Security
7472
{
7573
}
7674
Setups
7775
{
78-
dirac-JenkinsSetup
79-
{
80-
Configuration = Production
81-
Accounting = Production
82-
DataManagement = Production
83-
Framework = Production
84-
Monitoring = Production
85-
RequestManagement = Production
86-
ResourceStatus = Production
87-
StorageManagement = Production
88-
Production = Production
89-
Transformation = Production
90-
WorkloadManagement = Production
91-
Tornado = Production
92-
}
76+
Configuration = Production
77+
Accounting = Production
78+
DataManagement = Production
79+
Framework = Production
80+
Monitoring = Production
81+
RequestManagement = Production
82+
ResourceStatus = Production
83+
StorageManagement = Production
84+
Production = Production
85+
Transformation = Production
86+
WorkloadManagement = Production
87+
Tornado = Production
9388
}
9489
Configuration
9590
{

0 commit comments

Comments
 (0)