Merge branch 'main' into feature/support-http3

ls1intum · Feb 2, 2024 · 93d0b12 · 93d0b12
2 parents bebae62 + d444a75
commit 93d0b12
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 7 deletions.
diff --git a/galaxy.yml b/galaxy.yml
@@ -1,7 +1,7 @@
 namespace: ls1intum
 name: artemis
 
-version: 0.12.0
+version: 0.13.0
 
 readme: README.md
 

diff --git a/roles/artemis/README.md b/roles/artemis/README.md
@@ -115,9 +115,7 @@ Athena configuration:
 athena:
   url:
   secret:
-  modules:
-    text: # e.g. module_text_cofee or module_text_llm
-    programming: # e.g. module_programming_themisml or module_programming_llm
+  restricted-modules: # optional parameter to restrict access to specific modules, e.g. module_text_llm,module_programming_llm
 ```
 ---
 

diff --git a/roles/artemis/templates/application-prod.yml.j2 b/roles/artemis/templates/application-prod.yml.j2
@@ -181,6 +181,8 @@ artemis:
 {% if continuous_integration.localci is defined %}
   continuous-integration:
     artemis-authentication-token-value: "demo"
+    specify-concurrent-builds: true
+    concurrent-build-size: 4
 {% endif %}
 
 
@@ -203,9 +205,7 @@ artemis:
   athena:
     url: {{ athena.url }}
     secret: {{ athena.secret }}
-    modules:
-      text: {{ athena.modules.text }}
-      programming: {{ athena.modules.programming }}
+    restricted-modules: {{ athena.restricted-modules }}
 {% endif %}
 
 {% if apollon_url is defined %}

diff --git a/roles/artemis/templates/artemis.service.j2 b/roles/artemis/templates/artemis.service.j2
@@ -13,8 +13,10 @@ ExecStart=/usr/bin/java \
     -Dfile.encoding=UTF-8 \
     -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 \
     -XX:+ShowCodeDetailsInExceptionMessages \
+    -XX:+HeapDumpOnOutOfMemoryError \
     --add-modules java.se \
     --add-exports java.base/jdk.internal.ref=ALL-UNNAMED \
     --add-exports java.naming/com.sun.jndi.ldap=ALL-UNNAMED \