Merge branch 'main' into feat/jenkins-stateless-integration

Author: bensofficial

requirements.txt

@@ -1,30 +1,31 @@
-ansible==11.4.0
-ansible-compat==25.1.4
-ansible-core==2.18.4
-ansible-lint==25.1.3
-attrs==25.3.0
-black==25.1.0
-bracex==2.5.post1
-cffi==1.17.1
-click==8.1.8
-cryptography==44.0.2
-filelock==3.18.0
-importlib_metadata==8.6.1
+ansible==13.4.0
+ansible-compat==25.12.1
+ansible-core==2.20.3
+ansible-lint==26.3.0
+attrs==25.4.0
+black==26.1.0
+bracex==2.6
+cffi==2.0.0
+click==8.3.1
+cryptography==46.0.5
+distro==1.9.0
+filelock==3.25.0
 Jinja2==3.1.6
-jsonschema==4.23.0
-jsonschema-specifications==2024.10.1
-MarkupSafe==3.0.2
-mypy-extensions==1.0.0
-packaging==24.2
-pathspec==0.12.1
-platformdirs==4.3.7
-pycparser==2.22
-PyYAML==6.0.2
-referencing==0.36.2
-resolvelib==1.0.1
-rpds-py==0.24.0
-ruamel.yaml==0.18.10
+jsonschema==4.26.0
+jsonschema-specifications==2025.9.1
+MarkupSafe==3.0.3
+mypy_extensions==1.1.0
+packaging==26.0
+pathspec==1.0.4
+platformdirs==4.9.2
+pycparser==3.0
+pytokens==0.4.1
+PyYAML==6.0.3
+referencing==0.37.0
+resolvelib==1.2.1
+rpds-py==0.30.0
+ruamel.yaml==0.19.1
+ruamel.yaml.clib==0.2.15
 subprocess-tee==0.4.2
-wcmatch==10.0
-yamllint==1.37.0
-zipp==3.21.0
+wcmatch==10.1
+yamllint==1.38.0

roles/artemis/defaults/main.yml

@@ -1,4 +1,6 @@
 ---
+ansible_managed: "Ansible managed: Do not make changes here - they will be overwritten."
+
 artemis_version: # Set to version or local path to war file for non-docker installation and docker tag for docker version
 is_testserver: false
 is_multinode_install: false
@@ -347,15 +349,12 @@ artemis_spring_profile_athena: "{% if athena is defined and athena is not none %
 artemis_spring_profile_apollon: "{% if apollon_url is defined and apollon_url is not none %},apollon{% endif %}"
 artemis_spring_profile_scheduling: "{% if node_id is defined and node_id == 1 %},scheduling{% endif %}"
 artemis_spring_profile_docker: "{% if use_docker %},docker{% endif %}"
-artemis_spring_profile_iris: "{% if iris is defined and iris is not none %},iris{% endif %}"
 artemis_spring_profile_aeolus: "{% if aeolus is defined and aeolus is not none %},aeolus{% endif %}"
 artemis_spring_profile_atlas: "{% if atlas is defined and atlas is not none %},atlas{% endif %}"
-artemis_spring_profile_lti: "{% if lti.oauth_secret is defined and lti.oauth_secret is not none %},lti{% endif %}"
 
 artemis_spring_profile_core: "{% if artemis_computed_is_core_node %},core{{ artemis_spring_profile_ldap }}{{ artemis_spring_profile_version_control
   }}{{ artemis_spring_profile_continuous_integration }}{{ artemis_spring_profile_athena }}{{ artemis_spring_profile_apollon }}{{ artemis_spring_profile_scheduling }}{{ artemis_spring_profile_docker
-  }}{{ artemis_spring_profile_iris }}{{ artemis_spring_profile_aeolus }}{{ artemis_spring_profile_atlas }}{{ artemis_spring_profile_lti
-  }}{% endif %}"
+  }}{{ artemis_spring_profile_aeolus }}{{ artemis_spring_profile_atlas }}{% endif %}"
 artemis_spring_profile_buildagent: "{% if continuous_integration.localci is defined and continuous_integration.localci is not none %}{% if continuous_integration.localci.is_build_agent
   is defined and continuous_integration.localci.is_build_agent is not none and continuous_integration.localci.is_build_agent %},buildagent{% endif %}{% endif %}"
 

roles/artemis/templates/artemis-docker.sh.j2

@@ -6,6 +6,7 @@ PROJECT_DIR="{{ artemis_working_directory }}/Artemis/docker"
 {% set multi_node_compose_file = "test-server-multi-node-" + artemis_database_type + "-localci.yml" %}
 
 COMPOSE_FILE="{% if is_multinode_install is defined and is_multinode_install %}{{ multi_node_compose_file }}{% elif continuous_integration.localci is defined %}{{ localci_compose_file }}{% else %}{{ default_compose_file }}{% endif %}"
+DOCKER_IMAGE_ENV_FILE="{{ artemis_working_directory }}/Artemis/.env"
 ENV_FILE="{{ artemis_working_directory }}/docker.env"
 {% if continuous_integration.localci is defined %}
 export DOCKER_GROUP_ID=$(getent group docker | cut -d: -f3)
@@ -33,10 +34,10 @@ function start {
     rm -rf Artemis
     git clone https://github.com/ls1intum/Artemis.git -b "$pr_branch" Artemis
     sed -i "s/ARTEMIS_DOCKER_TAG=.*/ARTEMIS_DOCKER_TAG='$pr_tag'/g" $ENV_FILE
-    docker compose --project-directory "$PROJECT_DIR" -f "$PROJECT_DIR/$COMPOSE_FILE" --env-file "$ENV_FILE" up -d --pull always --no-build --remove-orphans
+    docker compose --project-directory "$PROJECT_DIR" -f "$PROJECT_DIR/$COMPOSE_FILE" --env-file "$DOCKER_IMAGE_ENV_FILE" --env-file "$ENV_FILE" up -d --pull always --no-build --remove-orphans
 
     # Reload Nginx configuration as Nginx may still be running from a previous start. This is necessary to apply the new configuration.
-    docker compose --project-directory "$PROJECT_DIR" -f "$PROJECT_DIR/$COMPOSE_FILE" --env-file "$ENV_FILE" exec nginx nginx -s reload || true
+    docker compose --project-directory "$PROJECT_DIR" -f "$PROJECT_DIR/$COMPOSE_FILE" --env-file "$DOCKER_IMAGE_ENV_FILE" --env-file "$ENV_FILE" exec nginx nginx -s reload || true
 }
 
 function stop {
@@ -45,10 +46,10 @@ function stop {
     echo "Stopping Artemis"
 
     # Get all docker-compose services that are not called nginx.
-    services=$(docker compose --project-directory "$PROJECT_DIR" -f "$PROJECT_DIR/$COMPOSE_FILE" --env-file "$ENV_FILE" ps --services)
+    services=$(docker compose --project-directory "$PROJECT_DIR" -f "$PROJECT_DIR/$COMPOSE_FILE" --env-file "$DOCKER_IMAGE_ENV_FILE" --env-file "$ENV_FILE" ps --services)
     artemis_services=$(echo "$services" | grep -v "^nginx")
 
-    docker compose --project-directory "$PROJECT_DIR" -f "$PROJECT_DIR/$COMPOSE_FILE" --env-file "$ENV_FILE" stop $artemis_services
+    docker compose --project-directory "$PROJECT_DIR" -f "$PROJECT_DIR/$COMPOSE_FILE" --env-file "$DOCKER_IMAGE_ENV_FILE" --env-file "$ENV_FILE" stop $artemis_services
 }
 
 function restart {
@@ -58,18 +59,18 @@ function restart {
 
 function artemis_logs {
     # Get all docker-compose services matching artemis-app* to be multi-node and single-node compatible.
-    services=$(docker compose --project-directory "$PROJECT_DIR" -f "$PROJECT_DIR/$COMPOSE_FILE" --env-file "$ENV_FILE" ps --services)
+    services=$(docker compose --project-directory "$PROJECT_DIR" -f "$PROJECT_DIR/$COMPOSE_FILE" --env-file "$DOCKER_IMAGE_ENV_FILE" --env-file "$ENV_FILE" ps --services)
     artemis_services=$(echo "$services" | grep "^artemis-app")
 
-    docker compose --project-directory "$PROJECT_DIR" -f "$PROJECT_DIR/$COMPOSE_FILE" --env-file "$ENV_FILE" logs -f $artemis_services
+    docker compose --project-directory "$PROJECT_DIR" -f "$PROJECT_DIR/$COMPOSE_FILE" --env-file "$DOCKER_IMAGE_ENV_FILE" --env-file "$ENV_FILE" logs -f $artemis_services
 }
 
 function all_logs {
-    docker compose --project-directory "$PROJECT_DIR" -f "$PROJECT_DIR/$COMPOSE_FILE" --env-file "$ENV_FILE" logs -f
+    docker compose --project-directory "$PROJECT_DIR" -f "$PROJECT_DIR/$COMPOSE_FILE" --env-file "$DOCKER_IMAGE_ENV_FILE" --env-file "$ENV_FILE" logs -f
 }
 
 function run_docker_compose_cmd {
-    docker compose --project-directory "$PROJECT_DIR" -f "$PROJECT_DIR/$COMPOSE_FILE" --env-file "$ENV_FILE" "$@"
+    docker compose --project-directory "$PROJECT_DIR" -f "$PROJECT_DIR/$COMPOSE_FILE" --env-file "$DOCKER_IMAGE_ENV_FILE" --env-file "$ENV_FILE" "$@"
 }
 
 # read subcommand `artemis-docker subcommand server` in variable and remove base command from argument list

roles/artemis/templates/artemis.env.j2

@@ -192,8 +192,8 @@ ARTEMIS_ATHENA_SECRET='{{ athena.secret }}'
 ARTEMIS_ATLAS_ENABLED='{{ atlas.enabled }}'
 {% if atlas.atlasml is defined %}
 ARTEMIS_ATLAS_ATLASML_ENABLED='{{ atlas.atlasml.enabled }}'
-ARTEMIS_ATLAS_ATLASML_BASEURL='{{ atlas.atlasml.base-url }}'
-ARTEMIS_ATLAS_ATLASML_AUTHTOKEN='{{ atlas.atlasml.auth-token }}'
+ARTEMIS_ATLAS_ATLASML_BASEURL='{{ atlas.atlasml.base_url }}'
+ARTEMIS_ATLAS_ATLASML_AUTHTOKEN='{{ atlas.atlasml.auth_token }}'
 {% endif %}
 {% endif %}
 {% if apollon_url is defined %}

roles/artemis/templates/artemis.service.j2

@@ -14,7 +14,7 @@ ExecStart=/usr/bin/java \
     -Dsun.jnu.encoding=UTF-8 \
     -Djava.security.egd=file:/dev/./urandom \
     -Dhazelcast.slow.operation.detector.stacktrace.logging.enabled=true \
-    -Xmx{{ (artemis_system_ram_proportion * ansible_memory_mb.real.total) | int }}m \
+    -Xmx{{ (artemis_system_ram_proportion * ansible_facts.memory_mb.real.total) | int }}m \
     -XX:+ShowCodeDetailsInExceptionMessages \
     -XX:+HeapDumpOnOutOfMemoryError \
     --add-modules java.se \

roles/broker/defaults/main.yml

@@ -1,4 +1,6 @@
 ---
+ansible_managed: "Ansible managed: Do not make changes here - they will be overwritten."
+
 # user.yml task
 artemis_user_name: artemis
 artemis_user_comment: Artemis

roles/firewall/defaults/main.yml

@@ -1,4 +1,6 @@
 ---
+ansible_managed: "Ansible managed: Do not make changes here - they will be overwritten."
+
 wireguard_port: 51820
 
 firewall_hostgroup: default # Can be 'registry', 'nodes', 'proxy' or left blank for default rules

roles/proxy/defaults/main.yml

@@ -1,4 +1,6 @@
 ---
+ansible_managed: "Ansible managed: Do not make changes here - they will be overwritten."
+
 servers: []
 #   - name:
 #     ssl_certificate_path:

roles/redis/defaults/main.yml

@@ -1,3 +1,6 @@
+---
+ansible_managed: "Ansible managed: Do not make changes here - they will be overwritten."
+
 redis:
   username: artemis
   password: #FIXME

roles/registry/defaults/main.yml

@@ -1,4 +1,6 @@
 ---
+ansible_managed: "Ansible managed: Do not make changes here - they will be overwritten."
+
 # user.yml task
 artemis_user_name: artemis
 artemis_user_comment: Artemis