From feaae6c1ec90252fa4a1597e3f81920bc2f1a540 Mon Sep 17 00:00:00 2001 From: haiyuan zhang Date: Thu, 20 May 2021 11:02:32 +0800 Subject: [PATCH 1/3] disable tlsv1_1 in app gateway test. --- tests/integration/targets/azure_rm_appgateway/tasks/main.yml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/tests/integration/targets/azure_rm_appgateway/tasks/main.yml b/tests/integration/targets/azure_rm_appgateway/tasks/main.yml index eda8dba8b..ecb810ab0 100644 --- a/tests/integration/targets/azure_rm_appgateway/tasks/main.yml +++ b/tests/integration/targets/azure_rm_appgateway/tasks/main.yml @@ -34,6 +34,7 @@ policy_name: ssl_policy20150501 disabled_ssl_protocols: - tls_v1_0 + - tls_v1_1 cipher_suites: - tls_ecdhe_ecdsa_with_aes_256_gcm_sha384 authentication_certificates: @@ -124,6 +125,7 @@ policy_name: ssl_policy20150501 disabled_ssl_protocols: - tls_v1_0 + - tls_v1_1 cipher_suites: - tls_ecdhe_ecdsa_with_aes_256_gcm_sha384 authentication_certificates: @@ -209,6 +211,7 @@ policy_name: ssl_policy20150501 disabled_ssl_protocols: - tls_v1_0 + - tls_v1_1 cipher_suites: - tls_ecdhe_ecdsa_with_aes_256_gcm_sha384 authentication_certificates: @@ -296,6 +299,7 @@ policy_name: ssl_policy20150501 disabled_ssl_protocols: - tls_v1_0 + - tls_v1_1 cipher_suites: - tls_ecdhe_ecdsa_with_aes_256_gcm_sha384 authentication_certificates: @@ -381,6 +385,7 @@ policy_name: ssl_policy20150501 disabled_ssl_protocols: - tls_v1_0 + - tls_v1_1 cipher_suites: - tls_ecdhe_ecdsa_with_aes_256_gcm_sha384 authentication_certificates: From 4de60668aa9d24aff0143a317b9e9adba741dea6 Mon Sep 17 00:00:00 2001 From: haiyuan zhang Date: Thu, 20 May 2021 14:29:50 +0800 Subject: [PATCH 2/3] fix sanity test issue in azure_rm_adapplication --- plugins/modules/azure_rm_adapplication.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/modules/azure_rm_adapplication.py b/plugins/modules/azure_rm_adapplication.py index 7d5e51299..478601d7a 100644 --- a/plugins/modules/azure_rm_adapplication.py +++ b/plugins/modules/azure_rm_adapplication.py @@ -409,7 +409,7 @@ def __init__(self): identifier_uris=dict(type='list', elements='str'), key_type=dict(type='str', default='AsymmetricX509Cert', choices=['AsymmetricX509Cert', 'Password', 'Symmetric']), key_usage=dict(type='str', default='Verify', choices=['Sign', 'Verify']), - key_value=dict(type='str'), + key_value=dict(type='str', no_log=True), native_app=dict(type='bool'), oauth2_allow_implicit_flow=dict(type='bool'), optional_claims=dict(type='list', elements='dict', options=optional_claims_spec), From 884c3a60e84262e58f289cee162e66796bf64ce3 Mon Sep 17 00:00:00 2001 From: haiyuan zhang Date: Thu, 20 May 2021 15:36:45 +0800 Subject: [PATCH 3/3] prolong integration test timeout to 90 minutes. --- tests/utils/ado/ado.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/utils/ado/ado.sh b/tests/utils/ado/ado.sh index b918a3c86..4d666dced 100755 --- a/tests/utils/ado/ado.sh +++ b/tests/utils/ado/ado.sh @@ -56,7 +56,7 @@ mkdir -p shippable/testresults pip install -I -r "${TEST_DIR}/requirements-azure.txt" pip install -I -r "${TEST_DIR}/sanity-requirements-azure.txt" -timeout=60 +timeout=90 if [ "$4" = "all" ] then