Skip to content

Commit c4ab3f2

Browse files
fix: Fixed CI to use sandoxes
1 parent a5a02bc commit c4ab3f2

File tree

2 files changed

+11
-2
lines changed

2 files changed

+11
-2
lines changed

tests/CI/docker-compose.yml

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -270,6 +270,7 @@ services:
270270
- DIRACX_DB_URL_SANDBOXMETADATADB=mysql+aiomysql://Dirac:Dirac@mysql/SandboxMetadataDB
271271
- DIRACX_DB_URL_PILOTAGENTSDB=mysql+aiomysql://Dirac:Dirac@mysql/PilotAgentsDB
272272
- 'DIRACX_OS_DB_PILOTLOGSDB={"sqlalchemy_dsn": "mysql+aiomysql://Dirac:Dirac@mysql/PilotLogsDB"}'
273+
- DIRACX_DB_URL_TASKQUEUEDB=mysql+aiomysql://Dirac:Dirac@mysql/TaskQueueDB
273274
- DIRACX_SERVICE_AUTH_TOKEN_KEYSTORE=file:///keystore/jwks.json
274275
- DIRACX_SERVICE_AUTH_TOKEN_ISSUER=http://diracx:8000
275276
- DIRACX_SERVICE_AUTH_ALLOWED_REDIRECTS=["http://diracx:8000/docs/oauth2-redirect"]
@@ -278,6 +279,14 @@ services:
278279
# Obtained with echo 'InsecureChangeMe' | base64 -d | openssl sha256
279280
- DIRACX_LEGACY_EXCHANGE_HASHED_API_KEY=07cddf6948d316ac9d186544dc3120c4c6697d8f994619665985c0a5bf76265a
280281
- DIRACX_SERVICE_JOBS_ENABLED=true
282+
283+
# This script monkey patches the parameter db to use a sqlite database rather
284+
# than requiring a full opensearch instance so we use a sqlalchmey dsn here
285+
- 'DIRACX_OS_DB_JOBPARAMETERSDB={"sqlalchemy_dsn": "mysql+aiomysql://Dirac:Dirac@mysql/JobParametersDB"}'
286+
- DIRACX_SANDBOX_STORE_BUCKET_NAME=sandboxes
287+
- DIRACX_SANDBOX_STORE_AUTO_CREATE_BUCKET=true
288+
- 'DIRACX_SANDBOX_STORE_S3_CLIENT_KWARGS={"endpoint_url": "http://s3-direct:9090", "aws_access_key_id": "console", "aws_secret_access_key": "console123"}'
289+
281290
ports:
282291
- 8000:8000
283292
depends_on:

tests/Jenkins/utilities.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -293,8 +293,8 @@ installDIRAC() {
293293
# Arguments: list of DiracX submodule module names to install (core, client, etc.)
294294

295295
function installDIRACX() {
296-
# Get the latest tag from GitHub
297-
latest_tag=$(curl -s "https://api.github.com/repos/DIRACGrid/diracx/releases" | jq -r '.[].tag_name' | sort -V | tail -n 1)
296+
# Get the latest tag from GitHub
297+
latest_tag=$(git ls-remote --tags https://github.com/DIRACGrid/diracx.git | awk -F/ '{print $NF}' | grep -v '{}' | sort -V | tail -n1)
298298

299299
echo "Installing from tag: $latest_tag"
300300

0 commit comments

Comments
 (0)