Skip to content

Commit

Permalink
Merge pull request #7882 from chrisburr/rel-v8r0-el9-test
Browse files Browse the repository at this point in the history
[8.0] Support testing v8r0 with EL9
  • Loading branch information
fstagni authored Nov 8, 2024
2 parents 69751ef + 5d44ebd commit 067d964
Show file tree
Hide file tree
Showing 3 changed files with 13 additions and 2 deletions.
3 changes: 3 additions & 0 deletions docs/diracdoctools/cmd/codeReference.py
Original file line number Diff line number Diff line change
Expand Up @@ -183,6 +183,9 @@ def getsubpackages(self, abspath, direc):
if dire.lower() == "docs" or "/docs" in dire.lower():
LOG.debug("Skipping docs directory: %s/%s", abspath, dire)
continue
if any(f.lower() in abspath.lower() for f in self.config.code_ignoreFolders):
LOG.debug("Skipping subpackages: %s/%s", abspath, dire)
continue
if os.path.exists(os.path.join(self.config.sourcePath, abspath, dire, "__init__.py")):
packages.append(os.path.join(dire))
return packages
Expand Down
10 changes: 9 additions & 1 deletion tests/CI/docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ services:
timeout: 20s
retries: 10
start_period: 60s
pull_policy: always

elasticsearch:
image: ${ES_VER}
Expand All @@ -25,6 +26,7 @@ services:
timeout: 2s
retries: 15
start_period: 60s
pull_policy: always

iam-login-service:
image: ${IAM_VER}
Expand All @@ -39,7 +41,7 @@ services:
timeout: 2s
retries: 15
start_period: 60s

pull_policy: always

# Mock of an S3 storage
s3-direct:
Expand All @@ -52,6 +54,7 @@ services:
environment:
- initialBuckets=my-first-bucket
- debug=true
pull_policy: always

dirac-server:
image: ${CI_REGISTRY_IMAGE}/${HOST_OS}-dirac
Expand All @@ -65,6 +68,9 @@ services:
condition: service_healthy
ulimits:
nofile: 8192
pull_policy: always
command: ["sleep", "infinity"] # This is necessary because of the issue described in https://github.com/moby/moby/issues/42275. What is added here is a hack/workaround.


dirac-client:
image: ${CI_REGISTRY_IMAGE}/${HOST_OS}-dirac
Expand All @@ -75,3 +81,5 @@ services:
- dirac-server
ulimits:
nofile: 8192
pull_policy: always
command: ["sleep", "infinity"] # This is necessary because of the issue described in https://github.com/moby/moby/issues/42275. What is added here is a hack/workaround.
2 changes: 1 addition & 1 deletion tests/Jenkins/utilities.sh
Original file line number Diff line number Diff line change
Expand Up @@ -125,7 +125,7 @@ findServices(){
ServicestoExclude='notExcluding'
fi

if ! cd "${SERVERINSTALLDIR}" -ne 0; then
if ! cd "${SERVERINSTALLDIR}"; then
echo 'ERROR: cannot change to ' "${SERVERINSTALLDIR}" >&2
exit 1
fi
Expand Down

0 comments on commit 067d964

Please sign in to comment.