Merge pull request #50 from fkie-cad/dev

Merge dev into main
fkie-cad · May 18, 2022 · 109cf7d · 109cf7d
2 parents 9b8756f + 14bc6e3
commit 109cf7d
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/.github/workflows/socbed-systemtest-dev.yml b/.github/workflows/socbed-systemtest-dev.yml
@@ -109,7 +109,7 @@ jobs:
       - name: Run stable system tests
         uses: nick-invision/retry@v2
         with:
-          timeout_minutes: 30
+          timeout_minutes: 45
           max_attempts: 5
           on_retry_command: ./tools/cleanup_failed_session
           command: tox -- -m "systest and not unstable"

diff --git a/provisioning/packer/attacker.json b/provisioning/packer/attacker.json
@@ -96,15 +96,15 @@
     {
       "expect_disconnect": "true",
       "script": "./post_install/attacker_setup.sh",
-      "timeout": "2m",
+      "timeout": "5m",
       "type": "shell"
     },
     {
       "extra_arguments": [
         "-i",
         "../ansible/hosts"
       ],
-      "pause_before": "2m",
+      "pause_before": "5m",
       "playbook_file": "../ansible/attacker_playbook.yml",
       "type": "ansible"
     }

diff --git a/src/systests/test_logging.py b/src/systests/test_logging.py
@@ -113,7 +113,7 @@ def check_local_log_format(self, machine, token, timeout_counter):
 
     def check_remote_log_format(self, es_query, timeout_counter):
         try_until_counter_reached(
-            lambda: self.query_elasticsearch(es_query, timeout_counter),
+            lambda: self.query_elasticsearch(es_query),
             timeout_counter,
             exception=(IndexError, TimeoutError, ConnectionRefusedError, CannotSendRequest),
             assertion_func=lambda x: self.check_elasticsearch_response(x, es_query))
@@ -149,7 +149,7 @@ def test_is_iso8601_timestamp(self):
             self.is_iso8601_timestamp(invalid_timestamp)
             for invalid_timestamp in invalid_timestamps)
 
-    def query_elasticsearch(self, es_query, timeout_counter):
+    def query_elasticsearch(self, es_query):
         headers = {"Content-type": "application/json", "Accept": "text/plain"}
         conn = HTTPConnection(f"{self.log_server.hostname}:9200")
         search_query = json.dumps(