test: extend LHCb test

DIRACGrid · Oct 27, 2023 · e59a299 · e59a299
1 parent 2c9fff1
commit e59a299
Show file tree

Hide file tree

Showing 3 changed files with 74 additions and 4 deletions.
diff --git a/.github/workflows/integration.yml b/.github/workflows/integration.yml
@@ -262,6 +262,15 @@ jobs:
   ext-lhcb_integration_dirac_installer_no_env:
     runs-on: ubuntu-latest
 
+    strategy:
+      matrix:
+        pilot_schema:
+          - pilot_oldSchema.json
+          - pilot_newSchema.json
+        ce:
+          - jenkins-lhcb-d.cern.ch
+          - jenkins-lhcb-dd.cern.ch
+
     steps:
       - uses: actions/checkout@v4
       - uses: cvmfs-contrib/github-action-cvmfs@v3
@@ -283,11 +292,51 @@ jobs:
       - name: tests
         run: |
           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_CE/${{ matrix.ce }}/g" pilot.json
+          sed -i "s/VAR_JENKINS_QUEUE/jenkins-queue_not_important/g" pilot.json
+          sed -i "s/VAR_DIRAC_VERSION/v11.0.20/g" pilot.json
+          sed -i "s#VAR_CS#https://lbcertifdirac70.cern.ch:9135/Configuration/Server#g" pilot.json
+          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
+          sed -i "s#VAR_USERDN_GRIDPP#${DIRACUSERDN_GRIDPP}#g" pilot.json
+          python dirac-pilot.py -M 1 -S DIRAC-Certification -N ${{ matrix.ce }} -Q jenkins-queue_not_important -n DIRAC.Jenkins.ch -e LHCb -l LHCb -E LHCbPilot --preinstalledEnvPrefix=/cvmfs/lhcb.cern.ch/lhcbdirac/ --cert --certLocation=${GITHUB_WORKSPACE}/Pilot/etc/grid-security --debug
+
+  ext-lhcb_integration_dirac_installer_no_env_devel:
+    runs-on: ubuntu-latest
+
+    strategy:
+      matrix:
+        pilot_schema:
+          - pilot_oldSchema.json
+          - pilot_newSchema.json
+
+    steps:
+      - uses: actions/checkout@v4
+      - uses: cvmfs-contrib/github-action-cvmfs@v3
+
+      - name: Test CernVM-FS
+        run: ls /cvmfs/lhcb.cern.ch
+
+      - name: Retrieve the secret and decode it to a file
+        env:
+          HOSTCERT_BASE64: ${{ secrets.HOSTCERT_BASE64 }}
+          HOSTKEY_BASE64: ${{ secrets.HOSTKEY_BASE64 }}
+        run: |
+          cd Pilot
+          mkdir -p etc/grid-security/
+          echo "$HOSTCERT_BASE64" | base64 --decode > etc/grid-security/hostcert.pem
+          echo "$HOSTKEY_BASE64" | base64 --decode > etc/grid-security/hostkey.pem
+          chmod 440 etc/grid-security/hostcert.pem
+          chmod 400 etc/grid-security/hostkey.pem
+      - name: tests
+        run: |
+          cd Pilot
+          curl https://gitlab.cern.ch/fstagni/LHCbPilot/-/raw/refactor_1/LHCbPilot/LHCbPilotCommands.py -o LHCbPilotCommands.py
+          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-d.cern.ch/g" pilot.json
           sed -i "s/VAR_JENKINS_QUEUE/jenkins-queue_not_important/g" pilot.json
           sed -i "s/VAR_DIRAC_VERSION/v11.0.20/g" pilot.json
           sed -i "s#VAR_CS#https://lbcertifdirac70.cern.ch:9135/Configuration/Server#g" pilot.json

diff --git a/tests/CI/pilot_newSchema.json b/tests/CI/pilot_newSchema.json
@@ -77,6 +77,10 @@
 		"jenkins-lhcb-d.cern.ch": {
 			"Site": "VAR_JENKINS_SITE",
 			"GridCEType": "LHCbD"
+		},
+		"jenkins-lhcb-dd.cern.ch": {
+			"Site": "VAR_JENKINS_SITE",
+			"GridCEType": "LHCbDD"
 		}	  
 	},
 	"Defaults": {
@@ -87,7 +91,8 @@
 				"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"
+				"LHCbD": "CheckWorkerNode, InstallDIRAC, LHCbConfigureBasics, RegisterPilot, CheckCECapabilities, LHCbAddCVMFSTags, CheckWNCapabilities, LHCbConfigureSite, LHCbConfigureArchitecture, LHCbConfigureCPURequirements",
+				"LHCbDD": "CheckWorkerNode, InstallDIRAC, ConfigureBasics, RegisterPilot, CheckCECapabilities, LHCbAddCVMFSTags, CheckWNCapabilities, ConfigureSite, LHCbConfigureArchitecture, ConfigureCPURequirements"
 		    }
 		}
 	},

diff --git a/tests/CI/pilot_oldSchema.json b/tests/CI/pilot_oldSchema.json
@@ -60,6 +60,18 @@
           "LHCbConfigureSite",
           "LHCbConfigureArchitecture",
           "LHCbConfigureCPURequirements"
+        ],
+        "LHCbDD": [
+          "CheckWorkerNode",
+          "InstallDIRAC",
+          "ConfigureBasics",
+          "RegisterPilot",
+          "CheckCECapabilities",
+          "LHCbAddCVMFSTags",
+          "CheckWNCapabilities",
+          "ConfigureSite",
+          "LHCbConfigureArchitecture",
+          "ConfigureCPURequirements"
         ]
       },
       "Logging": {
@@ -178,6 +190,10 @@
     "jenkins-lhcb-d.cern.ch": {
       "Site": "VAR_JENKINS_SITE",
       "GridCEType": "LHCbD"
+    },
+    "jenkins-lhcb-dd.cern.ch": {
+      "Site": "VAR_JENKINS_SITE",
+      "GridCEType": "LHCbDD"
     }
   },
   "DefaultSetup": "DIRAC-Certification"