Skip to content

Commit

Permalink
fixes
Browse files Browse the repository at this point in the history
  • Loading branch information
liorblob committed Mar 29, 2020
1 parent 7f6198b commit 233c3ce
Show file tree
Hide file tree
Showing 4 changed files with 6 additions and 6 deletions.
2 changes: 1 addition & 1 deletion Documentation/commonServerDocs.sh
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
python ./Documentation/extract_common_server_js.py
jsdoc2md --json ./Documentation/commonServerJsDoc.js > ./Documentation/commonServerJsDoc.json
python ./Documentation/common_server_docs.py
python3 ./Documentation/common_server_docs.py
4 changes: 2 additions & 2 deletions Tests/configure_and_test_integration_instances.py
Original file line number Diff line number Diff line change
Expand Up @@ -14,11 +14,11 @@
from Tests.test_integration import __get_integration_config, __test_integration_instance, \
__disable_integrations_instances
from demisto_sdk.commands.common.tools import print_error, print_warning, print_color, LOG_COLORS, run_threads_list, \
run_command, get_last_release_version, checked_type, get_yaml, str2bool
run_command, get_last_release_version, checked_type, get_yaml, str2bool
from Tests.test_content import load_conf_files, extract_filtered_tests, ParallelPrintsManager
from demisto_sdk.commands.validate.file_validator import FilesValidator
from demisto_sdk.commands.common.constants import YML_INTEGRATION_REGEXES, INTEGRATION_REGEX, PACKS_INTEGRATION_REGEX, \
BETA_INTEGRATION_REGEX, RUN_ALL_TESTS_FORMAT
BETA_INTEGRATION_REGEX, RUN_ALL_TESTS_FORMAT
from Tests.test_content import server_version_compare
from Tests.update_content_data import update_content

Expand Down
2 changes: 1 addition & 1 deletion Tests/lastest_server_build_scripts/run_tests.sh
Original file line number Diff line number Diff line change
Expand Up @@ -13,4 +13,4 @@ DEMISTO_API_KEY=$temp
[ -n "${NIGHTLY}" ] && IS_NIGHTLY=true || IS_NIGHTLY=false

echo "Starts tests with server url - $SERVER_URL"
python ./Tests/test_content.py -k "$DEMISTO_API_KEY" -c "$CONF_PATH" -e "$SECRET_CONF_PATH" -n $IS_NIGHTLY -t "$SLACK_TOKEN" -a "$CIRCLECI_TOKEN" -b "$CIRCLE_BUILD_NUM" -g "$CIRCLE_BRANCH"
python3 ./Tests/test_content.py -k "$DEMISTO_API_KEY" -c "$CONF_PATH" -e "$SECRET_CONF_PATH" -n $IS_NIGHTLY -t "$SLACK_TOKEN" -a "$CIRCLECI_TOKEN" -b "$CIRCLE_BUILD_NUM" -g "$CIRCLE_BRANCH"
4 changes: 2 additions & 2 deletions Tests/scripts/run_tests.sh
Original file line number Diff line number Diff line change
Expand Up @@ -17,12 +17,12 @@ code_1=0
code_2=0

echo "starting configure_and_test_integration_instances"
python ./Tests/configure_and_test_integration_instances.py -u "$USERNAME" -p "$PASSWORD" -c "$CONF_PATH" -s "$SECRET_CONF_PATH" -g "$GIT_SHA1" --ami_env "$1" -n $IS_NIGHTLY
python3 ./Tests/configure_and_test_integration_instances.py -u "$USERNAME" -p "$PASSWORD" -c "$CONF_PATH" -s "$SECRET_CONF_PATH" -g "$GIT_SHA1" --ami_env "$1" -n $IS_NIGHTLY
code_1=$?

if [ $code_1 -ne 1 ] ;
then
python ./Tests/test_content.py -k "$DEMISTO_API_KEY" -c "$CONF_PATH" -e "$SECRET_CONF_PATH" -n $IS_NIGHTLY -t "$SLACK_TOKEN" -a "$CIRCLECI_TOKEN" -b "$CIRCLE_BUILD_NUM" -g "$CIRCLE_BRANCH" -m "$MEM_CHECK" --isAMI true -d "$1"
python3 ./Tests/test_content.py -k "$DEMISTO_API_KEY" -c "$CONF_PATH" -e "$SECRET_CONF_PATH" -n $IS_NIGHTLY -t "$SLACK_TOKEN" -a "$CIRCLECI_TOKEN" -b "$CIRCLE_BUILD_NUM" -g "$CIRCLE_BRANCH" -m "$MEM_CHECK" --isAMI true -d "$1"
fi

code_2=$?
Expand Down

0 comments on commit 233c3ce

Please sign in to comment.