From 980cd532e64cec22f92952c8f8a1fa79c08c71cc Mon Sep 17 00:00:00 2001
From: Chris Burr <christopher.burr@cern.ch>
Date: Tue, 22 Nov 2022 14:49:47 +0100
Subject: [PATCH] test: Run pilot tests against both master and devel

---
 .github/workflows/pilotWrapper.yml                           | 5 ++++-
 .../Test_GenerateAndExecutePilotWrapper.py                   | 3 ++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/pilotWrapper.yml b/.github/workflows/pilotWrapper.yml
index ce293d55001..aceea705f60 100644
--- a/.github/workflows/pilotWrapper.yml
+++ b/.github/workflows/pilotWrapper.yml
@@ -15,6 +15,9 @@ jobs:
           - 2.7.13
           - 3.6.8
           - 3.9.4
+        pilot_branch:
+          - master
+          - devel
 
     steps:
     - uses: actions/checkout@v2
@@ -28,4 +31,4 @@ jobs:
       run: |
         cp tests/Integration/WorkloadManagementSystem/Test_GenerateAndExecutePilotWrapper.py .
         eval "$(conda shell.bash hook)" && conda activate python_${{ matrix.python }}
-        python Test_GenerateAndExecutePilotWrapper.py file://${{ github.workspace }}/src/DIRAC/WorkloadManagementSystem/Utilities/PilotWrapper.py
+        python Test_GenerateAndExecutePilotWrapper.py file://${{ github.workspace }}/src/DIRAC/WorkloadManagementSystem/Utilities/PilotWrapper.py ${{ matrix.pilot_branch }}
diff --git a/tests/Integration/WorkloadManagementSystem/Test_GenerateAndExecutePilotWrapper.py b/tests/Integration/WorkloadManagementSystem/Test_GenerateAndExecutePilotWrapper.py
index 1f391935691..fe8a65d3351 100644
--- a/tests/Integration/WorkloadManagementSystem/Test_GenerateAndExecutePilotWrapper.py
+++ b/tests/Integration/WorkloadManagementSystem/Test_GenerateAndExecutePilotWrapper.py
@@ -41,6 +41,7 @@
     rf = url_library_urlopen(sys.argv[1], context=context)
 else:
     rf = url_library_urlopen(sys.argv[1])
+pilotBranch = sys.argv[2]
 
 with open("PilotWrapper.py", "wb") as pj:
     pj.write(rf.read())
@@ -53,7 +54,7 @@
 
 res = pilotWrapperScript(
     pilotOptions="--setup=CI -N ce.dirac.org -Q DIRACQUEUE -n DIRAC.CI.ORG --pythonVersion=3 --debug",
-    location="diracproject.web.cern.ch/diracproject/tars/Pilot/DIRAC/master/,wrong.cern.ch",
+    location="diracproject.web.cern.ch/diracproject/tars/Pilot/DIRAC/" + pilotBranch + "/,wrong.cern.ch",
 )
 
 with open("pilot-wrapper.sh", "wb") as pj: