Skip to content

Commit c7abcdc

Browse files
fstagnifstagni
committed
feat: using preferredURLPattern if present
1 parent 1854581 commit c7abcdc

File tree

3 files changed

+307
-72
lines changed

3 files changed

+307
-72
lines changed

‎.github/workflows/integration.yml‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,7 @@ jobs:
5151
sed -i "s/VAR_JENKINS_QUEUE/jenkins-queue_not_important/g" pilot.json
5252
sed -i "s/VAR_DIRAC_VERSION/${{ matrix.dirac_branch }}/g" pilot.json
5353
sed -i "s#VAR_CS#https://lbcertifdirac70.cern.ch:9135/Configuration/Server#g" pilot.json
54+
sed -i "s#VAR_PREF_URL_PATTERN#.*\.cern\.ch/.*#g"
5455
sed -i "s#VAR_USERDN#/DC=ch/DC=cern/OU=Organic Units/OU=Users/CN=alboyer/CN=819281/CN=Alexandre Franck Boyer#g" pilot.json
5556
sed -i "s#VAR_USERDN_GRIDPP#${DIRACUSERDN_GRIDPP}#g" pilot.json
5657
g_job="testintegrationworkflow${GITHUB_JOB//-/}"
@@ -107,6 +108,7 @@ jobs:
107108
sed -i "s/VAR_JENKINS_QUEUE/jenkins-queue_not_important/g" pilot.json
108109
sed -i "s/VAR_DIRAC_VERSION/${version}/g" pilot.json
109110
sed -i "s#VAR_CS#https://lbcertifdirac70.cern.ch:9135/Configuration/Server#g" pilot.json
111+
sed -i "s#VAR_PREF_URL_PATTERN#.*\.cern\.ch/.*#g"
110112
sed -i "s#VAR_USERDN#/DC=ch/DC=cern/OU=Organic Units/OU=Users/CN=alboyer/CN=819281/CN=Alexandre Franck Boyer#g" pilot.json
111113
sed -i "s#VAR_USERDN_GRIDPP#${DIRACUSERDN_GRIDPP}#g" pilot.json
112114
g_job="testintegrationworkflow${GITHUB_JOB//-/}"
@@ -158,6 +160,7 @@ jobs:
158160
sed -i "s/VAR_JENKINS_QUEUE/jenkins-queue_not_important/g" pilot.json
159161
sed -i "s/VAR_DIRAC_VERSION/${version}/g" pilot.json
160162
sed -i "s#VAR_CS#https://lbcertifdirac70.cern.ch:9135/Configuration/Server#g" pilot.json
163+
sed -i "s#VAR_PREF_URL_PATTERN#.*\.cern\.ch/.*#g"
161164
sed -i "s#VAR_USERDN#/DC=ch/DC=cern/OU=Organic Units/OU=Users/CN=alboyer/CN=819281/CN=Alexandre Franck Boyer#g" pilot.json
162165
sed -i "s#VAR_USERDN_GRIDPP#${DIRACUSERDN_GRIDPP}#g" pilot.json
163166
g_job="testintegrationworkflow${GITHUB_JOB//-/}"
@@ -205,6 +208,7 @@ jobs:
205208
sed -i "s/VAR_JENKINS_QUEUE/jenkins-queue_not_important/g" pilot.json
206209
sed -i "s/VAR_DIRAC_VERSION/integration/g" pilot.json
207210
sed -i "s#VAR_CS#https://lbcertifdirac70.cern.ch:9135/Configuration/Server#g" pilot.json
211+
sed -i "s#VAR_PREF_URL_PATTERN#.*\.cern\.ch/.*#g"
208212
sed -i "s#VAR_USERDN#/DC=ch/DC=cern/OU=Organic Units/OU=Users/CN=alboyer/CN=819281/CN=Alexandre Franck Boyer#g" pilot.json
209213
sed -i "s#VAR_USERDN_GRIDPP#${DIRACUSERDN_GRIDPP}#g" pilot.json
210214
g_job="testintegrationworkflow${GITHUB_JOB//-/}"
@@ -260,6 +264,7 @@ jobs:
260264
sed -i "s/VAR_JENKINS_QUEUE/jenkins-queue_not_important/g" pilot.json
261265
sed -i "s/VAR_DIRAC_VERSION/${version}/g" pilot.json
262266
sed -i "s#VAR_CS#https://lbcertifdirac70.cern.ch:9135/Configuration/Server#g" pilot.json
267+
sed -i "s#VAR_PREF_URL_PATTERN#.*\.cern\.ch/.*#g"
263268
sed -i "s#VAR_USERDN#/DC=ch/DC=cern/OU=Organic Units/OU=Users/CN=alboyer/CN=819281/CN=Alexandre Franck Boyer#g" pilot.json
264269
sed -i "s#VAR_USERDN_GRIDPP#${DIRACUSERDN_GRIDPP}#g" pilot.json
265270
g_job="testintegrationworkflow${GITHUB_JOB//-/}"
@@ -311,6 +316,7 @@ jobs:
311316
sed -i "s/VAR_JENKINS_QUEUE/jenkins-queue_not_important/g" pilot.json
312317
sed -i "s/VAR_DIRAC_VERSION/${version}/g" pilot.json
313318
sed -i "s#VAR_CS#https://lbcertifdirac70.cern.ch:9135/Configuration/Server#g" pilot.json
319+
sed -i "s#VAR_PREF_URL_PATTERN#.*\.cern\.ch/.*#g"
314320
sed -i "s#VAR_USERDN#/DC=ch/DC=cern/OU=Organic Units/OU=Users/CN=alboyer/CN=819281/CN=Alexandre Franck Boyer#g" pilot.json
315321
sed -i "s#VAR_USERDN_GRIDPP#${DIRACUSERDN_GRIDPP}#g" pilot.json
316322
g_job="testintegrationworkflow${GITHUB_JOB//-/}"
@@ -373,6 +379,7 @@ jobs:
373379
sed -i "s/VAR_JENKINS_QUEUE/jenkins-queue_not_important/g" pilot.json
374380
sed -i "s/VAR_DIRAC_VERSION/${version}/g" pilot.json
375381
sed -i "s#VAR_CS#https://lbcertifdirac70.cern.ch:9135/Configuration/Server#g" pilot.json
382+
sed -i "s#VAR_PREF_URL_PATTERN#.*\.cern\.ch/.*#g"
376383
sed -i "s#VAR_USERDN#/DC=ch/DC=cern/OU=Organic Units/OU=Users/CN=alboyer/CN=819281/CN=Alexandre Franck Boyer#g" pilot.json
377384
sed -i "s#VAR_USERDN_GRIDPP#${DIRACUSERDN_GRIDPP}#g" pilot.json
378385
g_job="testintegrationworkflow${GITHUB_JOB//-/}"
@@ -424,6 +431,7 @@ jobs:
424431
sed -i "s/VAR_JENKINS_QUEUE/jenkins-queue_not_important/g" pilot.json
425432
sed -i "s/VAR_DIRAC_VERSION/${version}/g" pilot.json
426433
sed -i "s#VAR_CS#https://lbcertifdirac70.cern.ch:9135/Configuration/Server#g" pilot.json
434+
sed -i "s#VAR_PREF_URL_PATTERN#.*\.cern\.ch/.*#g"
427435
sed -i "s#VAR_USERDN#/DC=ch/DC=cern/OU=Organic Units/OU=Users/CN=alboyer/CN=819281/CN=Alexandre Franck Boyer#g" pilot.json
428436
sed -i "s#VAR_USERDN_GRIDPP#${DIRACUSERDN_GRIDPP}#g" pilot.json
429437
g_job="testintegrationworkflow${GITHUB_JOB//-/}"
@@ -474,6 +482,7 @@ jobs:
474482
sed -i "s/VAR_JENKINS_QUEUE/jenkins-queue_not_important/g" pilot.json
475483
sed -i "s/VAR_DIRAC_VERSION/${version}/g" pilot.json
476484
sed -i "s#VAR_CS#https://lbcertifdirac70.cern.ch:9135/Configuration/Server#g" pilot.json
485+
sed -i "s#VAR_PREF_URL_PATTERN#.*\.cern\.ch/.*#g"
477486
sed -i "s#VAR_USERDN#/DC=ch/DC=cern/OU=Organic Units/OU=Users/CN=alboyer/CN=819281/CN=Alexandre Franck Boyer#g" pilot.json
478487
sed -i "s#VAR_USERDN_GRIDPP#${DIRACUSERDN_GRIDPP}#g" pilot.json
479488
g_job="testintegrationworkflow${GITHUB_JOB//-/}"

0 commit comments

Comments
 (0)