From bfd3127754ef443733ce4e3e88965b6d6ecef310 Mon Sep 17 00:00:00 2001 From: Fred-sun Date: Wed, 24 Jun 2020 14:13:20 +0800 Subject: [PATCH 1/4] resolve conflict file --- pr-pipelines.yml | 60 ++++++++++++++++++++++++++++++++++++++++++ tests/utils/ado/ado.sh | 16 +++++++++++ 2 files changed, 76 insertions(+) diff --git a/pr-pipelines.yml b/pr-pipelines.yml index 53e5806fe..a9eee9306 100644 --- a/pr-pipelines.yml +++ b/pr-pipelines.yml @@ -13,6 +13,66 @@ parameters: values: - "2.9.0" - "2.9.9" +- name: MODULE_NAME + displayName: 'Test Module' + type: string + default: 'all' + values: + - 'all' + - "azure_rm_acs" + - "azure_rm_aks" + - "azure_rm_appgateway" + - "azure_rm_appserviceplan" + - "azure_rm_automationaccount" + - "azure_rm_autoscale" + - "azure_rm_availabilityset" + - "azure_rm_azurefirewall" + - "azure_rm_batchaccount" + - "azure_rm_cdnprofile" + - "azure_rm_containerinstance" + - "azure_rm_containerregistry" + - "azure_rm_cosmosdbaccount" + - "azure_rm_deployment" + - "azure_rm_dnsrecordset" + - "azure_rm_dnszone" + - "azure_rm_functionapp" + - "azure_rm_gallery" + - "azure_rm_hdinsightcluster" + - "azure_rm_image" + - "azure_rm_iothub" + - "azure_rm_keyvault" + - "azure_rm_keyvaultkey" + - "azure_rm_keyvaultsecret" + - "azure_rm_loadbalancer" + - "azure_rm_manageddisk" + - "azure_rm_mariadbserver" + - "azure_rm_monitorlogprofile" + - "azure_rm_mysqlserver" + - "azure_rm_networkinterface" + - "azure_rm_postgresqlserver" + - "azure_rm_publicipaddress" + - "azure_rm_rediscache" + - "azure_rm_resource" + - "azure_rm_resourcegroup" + - "azure_rm_routetable" + - "azure_rm_securitygroup" + - "azure_rm_servicebus" + - "azure_rm_sqlserver" + - "azure_rm_storageaccount" + - "azure_rm_storageblob" + - "azure_rm_subnet" + - "azure_rm_trafficmanagerprofile" + - "azure_rm_virtualmachine" + - "azure_rm_virtualmachineextension" + - "azure_rm_virtualmachineimage_info" + - "azure_rm_virtualmachinescaleset" + - "azure_rm_virtualnetwork" + - "azure_rm_virtualnetworkgateway" + - "azure_rm_virtualnetworkeepring" + - "azure_rm_webapp" + - "azure_rm_workspace" + - "inventory_azure" + - "setup_azure" trigger: none diff --git a/tests/utils/ado/ado.sh b/tests/utils/ado/ado.sh index 43438a115..eb0d238f0 100755 --- a/tests/utils/ado/ado.sh +++ b/tests/utils/ado/ado.sh @@ -60,6 +60,22 @@ fi timeout=60 +test_list=("azure_rm_acs" "azure_rm_aks" "azure_rm_appgateway" "azure_rm_appserviceplan" "azure_rm_automationaccount" "azure_rm_autoscale" "azure_rm_availabilityset" "azure_rm_azurefirewall" "azure_rm_batchaccount" "azure_rm_cdnprofile" "azure_rm_containerinstance" "azure_rm_containerregistry" "azure_rm_cosmosdbaccount" "azure_rm_deployment" "azure_rm_dnsrecordset" "azure_rm_dnszone" "azure_rm_functionapp" "azure_rm_gallery" "azure_rm_hdinsightcluster" "azure_rm_image" "azure_rm_iothub" "azure_rm_keyvault" "azure_rm_keyvaultkey" "azure_rm_keyvaultsecret" "azure_rm_loadbalancer" "azure_rm_manageddisk" "azure_rm_mariadbserver" "azure_rm_monitorlogprofile" "azure_rm_mysqlserver" "azure_rm_networkinterface" "azure_rm_postgresqlserver" "azure_rm_publicipaddress" "azure_rm_rediscache" "azure_rm_resource" "azure_rm_resourcegroup" "azure_rm_routetable" "azure_rm_securitygroup" "azure_rm_servicebus" "azure_rm_sqlserver" "azure_rm_storageaccount" "azure_rm_storageblob" "azure_rm_subnet" "azure_rm_trafficmanagerprofile" "azure_rm_virtualmachine" "azure_rm_virtualmachineextension" "azure_rm_virtualmachineimage_info" "azure_rm_virtualmachinescaleset" "azure_rm_virtualnetwork" "azure_rm_virtualnetworkgateway" "azure_rm_virtualnetworkpeering" "azure_rm_webapp" "azure_rm_workspace" "inventory_azure" "setup_azure" "azure_rm_acs" "azure_rm_aks" "azure_rm_appgateway" "azure_rm_appserviceplan" "azure_rm_automationaccount" "azure_rm_autoscale" "azure_rm_availabilityset" "azure_rm_azurefirewall" "azure_rm_batchaccount" "azure_rm_cdnprofile" "azure_rm_containerinstance" "azure_rm_containerregistry" "azure_rm_cosmosdbaccount" "azure_rm_deployment" "azure_rm_dnsrecordset" "azure_rm_dnszone" "azure_rm_functionapp" "azure_rm_gallery" "azure_rm_hdinsightcluster" "azure_rm_image" "azure_rm_iothub" "azure_rm_keyvault" "azure_rm_keyvaultkey" "azure_rm_keyvaultsecret" "azure_rm_loadbalancer" "azure_rm_manageddisk" "azure_rm_mariadbserver" "azure_rm_monitorlogprofile" "azure_rm_mysqlserver" "azure_rm_networkinterface" "azure_rm_postgresqlserver" "azure_rm_publicipaddress" "azure_rm_rediscache" "azure_rm_resource" "azure_rm_resourcegroup" "azure_rm_routetable" "azure_rm_securitygroup" "azure_rm_servicebus" "azure_rm_sqlserver" "azure_rm_storageaccount" "azure_rm_storageblob" "azure_rm_subnet" "azure_rm_trafficmanagerprofile" "azure_rm_virtualmachine" "azure_rm_virtualmachineextension" "azure_rm_virtualmachineimage_info" "azure_rm_virtualmachinescaleset" "azure_rm_virtualnetwork" "azure_rm_virtualnetworkgateway" "azure_rm_virtualnetworkpeering" "azure_rm_webapp" "azure_rm_workspace" "inventory_azure" "setup_azure") +if [ "$2" = "all" ] +then + echo "All module need test" +else + for item in ${test_list[*]} + do + if [ "${item}" = "$2" ] + then + echo "PASS" + else + echo "disabled" >> "${TEST_DIR}"/tests/integration/targets/"${item}"/aliases + fi + done +fi + ansible-test env --dump --show --timeout "${timeout}" --color -v cat <> "${TEST_DIR}"/tests/integration/cloud-config-azure.ini From 318608310fe7413f3ead3cd87274a01aa6b1ae69 Mon Sep 17 00:00:00 2001 From: Fred-sun Date: Fri, 19 Jun 2020 11:25:34 +0800 Subject: [PATCH 2/4] update new --- tests/integration/targets/azure_rm_aks/aliases | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/tests/integration/targets/azure_rm_aks/aliases b/tests/integration/targets/azure_rm_aks/aliases index e340069a0..b7f83fab8 100644 --- a/tests/integration/targets/azure_rm_aks/aliases +++ b/tests/integration/targets/azure_rm_aks/aliases @@ -1,3 +1,4 @@ cloud/azure unsupported -destructive \ No newline at end of file +destructive +shippable/azure/group6 From f7a010d3abfe44e3b475b804ec360b8e7d450062 Mon Sep 17 00:00:00 2001 From: Fred-sun Date: Fri, 19 Jun 2020 11:52:52 +0800 Subject: [PATCH 3/4] udpate new --- tests/integration/targets/azure_rm_aks/aliases | 1 - 1 file changed, 1 deletion(-) diff --git a/tests/integration/targets/azure_rm_aks/aliases b/tests/integration/targets/azure_rm_aks/aliases index b7f83fab8..3b050cbc1 100644 --- a/tests/integration/targets/azure_rm_aks/aliases +++ b/tests/integration/targets/azure_rm_aks/aliases @@ -1,4 +1,3 @@ cloud/azure -unsupported destructive shippable/azure/group6 From dcfee43cbca053062d736ed2ea677d067ea9bfa1 Mon Sep 17 00:00:00 2001 From: Fred-sun Date: Fri, 19 Jun 2020 15:18:27 +0800 Subject: [PATCH 4/4] revert --- tests/integration/targets/azure_rm_aks/aliases | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/integration/targets/azure_rm_aks/aliases b/tests/integration/targets/azure_rm_aks/aliases index 3b050cbc1..ef0e2ed4e 100644 --- a/tests/integration/targets/azure_rm_aks/aliases +++ b/tests/integration/targets/azure_rm_aks/aliases @@ -1,3 +1,3 @@ cloud/azure +unsupported destructive -shippable/azure/group6