Skip to content

Commit c3902f8

Browse files
feat: Add new flags to support last version of pilot and debugging for diracx CI
1 parent 37d8716 commit c3902f8

File tree

2 files changed

+7
-2
lines changed

2 files changed

+7
-2
lines changed

.github/workflows/integration.yml

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ jobs:
6262
- name: Building wheels
6363
run: |
6464
# Clone diracx
65-
git clone https://github.com/Robin-Van-de-Merghel/diracx.git $GITHUB_WORKSPACE/diracx
65+
git clone --single-branch --branch robin-pilot-legacy-logging https://github.com/Robin-Van-de-Merghel/diracx.git $GITHUB_WORKSPACE/diracx
6666
6767
# Create dist dir
6868
mkdir -p $GITHUB_WORKSPACE/diracx-dist
@@ -96,3 +96,8 @@ jobs:
9696
if [ -f client-tests-failed ]; then has_error=1; echo "Client tests failed"; fi
9797
if [ -f pilot-tests-failed ]; then has_error=1; echo "pilot tests failed"; fi
9898
if [ ${has_error} = 1 ]; then exit 1; fi
99+
- name: DiracX filtered logs
100+
if: ${{ always() && contains(matrix.ARGS, 'TEST_DIRACX=Yes') }}
101+
run: |
102+
# Used to debug, and see which requests were done.
103+
docker logs diracx | grep -Fv 'GET /.well-known/openid-configuration HTTP/1.1" 200 OK'

tests/.dirac-ci-config.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ config:
44
CLIENT_UPLOAD_BASE64: SSBsaWtlIHBpenphIQo=
55
CLIENT_UPLOAD_LFN: LFN:/vo/test_lfn.txt
66
CLIENT_UPLOAD_FILE: test_lfn.txt
7-
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 --diracx_URL=http://diracx:8000/ -z
7+
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 --diracx_URL=http://diracx:8000/ -z --clientID=995ed3b9-d5bd-49d3-a7f4-7fc7dbd5a0cd
88
PILOT_JSON: "{
99
\"timestamp\": \"2023-02-13T14:34:26.725499\",
1010
\"CEs\": {

0 commit comments

Comments
 (0)