diff --git a/.gitlab/ci/.gitlab-ci.yml b/.gitlab/ci/.gitlab-ci.yml index e555781ee8b1..67c98f93b10c 100644 --- a/.gitlab/ci/.gitlab-ci.yml +++ b/.gitlab/ci/.gitlab-ci.yml @@ -1,7 +1,7 @@ variables: - CURRENT_BRANCH_NAME: $INFRA_BRANCH + CURRENT_BRANCH_NAME: sk-csp-validation include: - file: "/.gitlab/ci/content-ci/ci/.gitlab-ci.yml" - ref: $INFRA_BRANCH + ref: sk-csp-validation project: "${CI_PROJECT_NAMESPACE}/infra" diff --git a/Packs/Base/Scripts/CommonServerPython/CommonServerPython.py b/Packs/Base/Scripts/CommonServerPython/CommonServerPython.py index 35618e1005bf..34b72a512cec 100644 --- a/Packs/Base/Scripts/CommonServerPython/CommonServerPython.py +++ b/Packs/Base/Scripts/CommonServerPython/CommonServerPython.py @@ -14379,8 +14379,8 @@ def safe_sleep(duration_seconds): run_duration = int(context.get('runDuration')) * 60 time_left = run_duration - (datetime.now() - SAFE_SLEEP_START_TIME).total_seconds() if duration_seconds > time_left: - raise ValueError("Requested a sleep of {} seconds, but time left until docker timeout is {} seconds." - .format(duration_seconds, run_duration)) + raise DemistoException("Requested a sleep of {} seconds, but time left until docker timeout is {} seconds." + .format(duration_seconds, run_duration)) else: demisto.info('Safe sleep is not supported in this server version, sleeping for the requested time.') time.sleep(duration_seconds) # pylint: disable=E9003