@@ -59,17 +59,14 @@ jobs:
5959 pilotUUID=$(echo $pilotUUID | rev | cut -c 1-32 | rev)
6060 X509_USER_PROXY=$pilot_proxy_file python dirac-pilot.py --modules https://github.com/DIRACGrid/DIRAC.git:::DIRAC:::${{ matrix.dirac_branch }} -M 1 -S DIRAC-Certification -N jenkins.cern.ch -Q jenkins-queue_not_important -n DIRAC.Jenkins.ch --wnVO=${{ matrix.VO }} --pilotUUID="${pilotUUID}" --debug
6161
62- release_prod_pre-cvmfs_CEs :
62+ release_cvmfs_CEs :
6363 runs-on : ubuntu-latest
6464
6565 strategy :
6666 matrix :
6767 pilot_schema :
6868 - pilot_oldSchema.json
6969 - pilot_newSchema.json
70- dirac_version :
71- - prod
72- - old
7370 ce :
7471 - jenkins.cern.ch
7572 - jenkins-singularity.cern.ch
9895 echo "$HOSTKEY_BASE64" | base64 --decode > ${GITHUB_WORKSPACE}/Client/etc/grid-security/hostkey.pem
9996 chmod 440 ${GITHUB_WORKSPACE}/Client/etc/grid-security/hostcert.pem
10097 chmod 400 ${GITHUB_WORKSPACE}/Client/etc/grid-security/hostkey.pem
101- if [ "${{ matrix.dirac_version }}" == "prod" ]; then
102- version=$(curl -s "https://api.github.com/repos/DIRACGrid/DIRAC/releases" | jq -r '.[].tag_name' | sort -V | grep 'v9' | tail -n 1)
103- else
104- version=$(curl -s "https://api.github.com/repos/DIRACGrid/DIRAC/releases" | jq -r '.[].tag_name' | sort -V | grep 'v8' | tail -n 1)
105- fi
98+ version=$(curl -s "https://api.github.com/repos/DIRACGrid/DIRAC/releases" | jq -r '.[].tag_name' | sort -V | grep 'v9' | tail -n 1)
10699 source /cvmfs/dirac.egi.eu/dirac/${version}/Linux-x86_64/diracosrc
107100 pilot_proxy_file=$(mktemp)
108101 dirac-configure --ConfigurationServer=https://lbcertifdirac70.cern.ch:9135/Configuration/Server --UseServerCertificate -o /DIRAC/Security/CertFile=${GITHUB_WORKSPACE}/Client/etc/grid-security/hostcert.pem -o /DIRAC/Security/KeyFile=${GITHUB_WORKSPACE}/Client/etc/grid-security/hostkey.pem --SkipCADownload -O config.cfg
@@ -172,18 +165,14 @@ jobs:
172165 pilotUUID=$(echo $pilotUUID | rev | cut -c 1-32 | rev)
173166 X509_USER_PROXY=$pilot_proxy_file python dirac-pilot.py --modules https://github.com/DIRACGrid/DIRAC.git:::DIRAC:::integration -M 1 -N jenkins-full.cern.ch -Q jenkins-queue_not_important -n DIRAC.Jenkins.ch --wnVO=dteam --pilotUUID="${pilotUUID}" --debug
174167
175- release_prod_pre-cvmfs_matching :
168+ release_cvmfs_matching :
176169 runs-on : ubuntu-latest
177170
178171 strategy :
179172 matrix :
180173 VO :
181174 - dteam
182175 - gridpp
183- dirac_version :
184- - prod
185- - old
186-
187176 steps :
188177 - uses : actions/checkout@v4
189178 - uses : cvmfs-contrib/github-action-cvmfs@v3
@@ -206,11 +195,7 @@ jobs:
206195 chmod 440 ${GITHUB_WORKSPACE}/Client/etc/grid-security/hostcert.pem
207196 chmod 400 ${GITHUB_WORKSPACE}/Client/etc/grid-security/hostkey.pem
208197 cd ${GITHUB_WORKSPACE}/Pilot
209- if [ "${{ matrix.dirac_version }}" == "prod" ]; then
210- version=$(curl -s "https://api.github.com/repos/DIRACGrid/DIRAC/releases" | jq -r '.[].tag_name' | sort -V | grep 'v9' | tail -n 1)
211- else
212- version=$(curl -s "https://api.github.com/repos/DIRACGrid/DIRAC/releases" | jq -r '.[].tag_name' | sort -V | grep 'v8' | tail -n 1)
213- fi
198+ version=$(curl -s "https://api.github.com/repos/DIRACGrid/DIRAC/releases" | jq -r '.[].tag_name' | sort -V | grep 'v9' | tail -n 1)
214199 source /cvmfs/dirac.egi.eu/dirac/${version}/Linux-x86_64/diracosrc
215200 pilot_proxy_file=$(mktemp)
216201 dirac-configure --ConfigurationServer=https://lbcertifdirac70.cern.ch:9135/Configuration/Server --UseServerCertificate -o /DIRAC/Security/CertFile=${GITHUB_WORKSPACE}/Client/etc/grid-security/hostcert.pem -o /DIRAC/Security/KeyFile=${GITHUB_WORKSPACE}/Client/etc/grid-security/hostkey.pem --SkipCADownload -O config.cfg
0 commit comments