Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[9.0] integration tests: bumping versions (and using el9-dirac as default) #7513

Merged
merged 1 commit into from
Mar 20, 2024
+10 −15
Merged

[9.0] integration tests: bumping versions (and using el9-dirac as default) #7513

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .github/workflows/integration.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,8 +31,8 @@ jobs:
matrix:
# TEST_NAME is a dummy variable used to make it easier to read the web interface
include:
- TEST_NAME: "MariaDB 10.6, elasticsearch:7.9.1"
ARGS: MYSQL_VER=mariadb:10.6.3 ES_VER=elasticsearch:7.9.1
- TEST_NAME: "MariaDB 10.6, elasticsearch:7.9.1, cc7"
ARGS: MYSQL_VER=mariadb:10.6.3 ES_VER=elasticsearch:7.9.1 HOST_OS=cc7
- TEST_NAME: "DIPS"
ARGS: TEST_HTTPS=No
- TEST_NAME: "Force DEncode"
Expand Down
8 changes: 4 additions & 4 deletions integration_tests.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,9 +22,9 @@
from typer import colors as c

# Editable configuration
DEFAULT_HOST_OS = "cc7"
DEFAULT_MYSQL_VER = "mysql:8.0"
DEFAULT_ES_VER = "opensearchproject/opensearch:2.1.0"
DEFAULT_HOST_OS = "el9"
DEFAULT_MYSQL_VER = "mysql:8.0.36"
DEFAULT_ES_VER = "opensearchproject/opensearch:2.11.1"
DEFAULT_IAM_VER = "indigoiam/iam-login-service:v1.8.0"
FEATURE_VARIABLES = {
"DIRACOSVER": "master",
Expand Down Expand Up @@ -245,7 +245,7 @@ def prepare_environment(
uid = str(os.getuid())
ret = subprocess.run(cmd + ["groupadd", "--gid", gid, "dirac"], check=False)
if ret.returncode != 0:
typer.secho(f"Failed to add add group dirac with id={gid}", fg=c.YELLOW)
typer.secho(f"Failed to add group dirac with id={gid}", fg=c.YELLOW)
subprocess.run(
cmd
+ [
Expand Down
3 changes: 3 additions & 0 deletions tests/CI/docker-compose.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,6 +101,8 @@ services:
- DIRACX_CONFIG_BACKEND_URL=git+file:///cs_store/initialRepo
- DIRACX_SERVICE_AUTH_TOKEN_KEY=file:///signing-key/rs256.key
pull_policy: always
command: ["sleep", "infinity"]
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Reference about this: issue is described in moby/moby#42275 and seems like moby/moby#42275 (comment) would contain some good suggestions, but just ran into other issues. The above is a hack/workaround.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

you may want to add that comment directly into the docker-compose file, it's very useful !



dirac-client:
image: ${CI_REGISTRY_IMAGE}/${HOST_OS}-dirac
Expand All @@ -112,6 +114,7 @@ services:
ulimits:
nofile: 8192
pull_policy: always
command: ["sleep", "infinity"]

diracx-init-key:
image: ghcr.io/diracgrid/diracx/secret-generation:latest
Expand Down
8 changes: 0 additions & 8 deletions tests/CI/envs/elasticsearch:6.6.0.env
View file
Open in desktop

This file was deleted.

0 ...vs/opensearchproject/opensearch:2.1.0.env → ...s/opensearchproject/opensearch:2.11.1.env
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion tests/Jenkins/utilities.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -125,7 +125,7 @@ findServices(){
ServicestoExclude=' '
fi

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