diff --git a/.github/workflows/socbed-systemtest-dev.yml b/.github/workflows/socbed-systemtest-dev.yml index 2b288e2..7d236fd 100644 --- 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 index b8159c5..4793b27 100644 --- a/provisioning/packer/attacker.json +++ b/provisioning/packer/attacker.json @@ -96,7 +96,7 @@ { "expect_disconnect": "true", "script": "./post_install/attacker_setup.sh", - "timeout": "2m", + "timeout": "5m", "type": "shell" }, { @@ -104,7 +104,7 @@ "-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 index 97449d5..fccbd68 100644 --- 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(