feat: fully removed dirac-install and python2 DIRAC client installations

test: install voms-clients
DIRACGrid · Jun 27, 2023 · a5cd7bc · a5cd7bc
1 parent 3ecba7c
commit a5cd7bc
Show file tree

Hide file tree

Showing 6 changed files with 21 additions and 2,008 deletions.
diff --git a/.github/workflows/basic.yml b/.github/workflows/basic.yml
@@ -54,16 +54,16 @@ jobs:
       matrix:
         python: 
           - 2.7.18
-          - 3.6.8
           - 3.9.4
 
-    container: python:${{ matrix.python }}-slim
+    container: python:${{ matrix.python }}
     steps:
     - uses: actions/checkout@v3
     - name: Installing dependencies
       run: |
         python -m pip install pytest mock
-        sudo apt install voms-clients
+        apt update
+        apt install -y voms-clients
     - name: Run pytest
       run: pytest
 

diff --git a/Jenkinsfile b/Jenkinsfile
@@ -5,15 +5,15 @@ This is customized pipeline for running on jenkins-dirac.web.cern.ch
 */
 
 
-properties([parameters([string(name: 'projectVersion', defaultValue: '8.1.0a11', description: 'The DIRAC version to install. Use py2 or py3 syntax'),
+properties([parameters([string(name: 'projectVersion', defaultValue: '8.1.0a14', description: 'The DIRAC version to install'),
                         string(name: 'Pilot_repo', defaultValue: 'DIRACGrid', description: 'The Pilot repo'),
                         string(name: 'Pilot_branch', defaultValue: 'devel', description: 'The Pilot branch'),
                         string(name: 'DIRAC_test_repo', defaultValue: 'DIRACGrid', description: 'The DIRAC repo to use for getting the test code'),
                         string(name: 'DIRAC_test_branch', defaultValue: 'integration', description: 'The DIRAC branch to use for getting the test code'),
                         string(name: 'JENKINS_CE', defaultValue: 'jenkins.cern.ch', description: 'The CE definition to use (of DIRAC.Jenkins.ch, see CS for others)'),
                         string(name: 'modules', defaultValue: '', description: 'to override what is installed, e.g. with https://github.com/$DIRAC_test_repo/DIRAC.git:::DIRAC:::$DIRAC_test_branch'),
                         string(name: 'pip_install_options', defaultValue: '', description: 'options to pip install (e.g. --index-url=https://lhcb-repository.web.cern.ch/repository/pypi/simple)'),
-                        string(name: 'pilot_options', defaultValue: '', description: 'any pilot option, e.g. --pythonVersion=2'),
+                        string(name: 'pilot_options', defaultValue: '', description: 'any pilot option'),
                         string(name: 'CSURL', defaultValue: 'https://lbcertifdirac70.cern.ch:9135/Configuration/Server', description: 'URL for CS'),
                         string(name: 'DIRACSETUP', defaultValue: 'DIRAC-Certification', description: 'DIRAC setup'),
                         string(name: 'PILOTJSON', defaultValue: 'pilot_oldSchema.json', description: 'other option: pilot_newSchema.json'),