From 23a3bc9b7645d46a9302769401119173362a4ad1 Mon Sep 17 00:00:00 2001 From: Fred-sun Date: Fri, 19 Jun 2020 15:38:50 +0800 Subject: [PATCH 1/5] Update azure_rm_aks relate file --- plugins/modules/azure_rm_aks.py | 2 ++ requirements-azure.txt | 2 +- tests/integration/targets/azure_rm_aks/aliases | 2 +- 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/plugins/modules/azure_rm_aks.py b/plugins/modules/azure_rm_aks.py index 299f8d9ab..97e5feeae 100644 --- a/plugins/modules/azure_rm_aks.py +++ b/plugins/modules/azure_rm_aks.py @@ -377,6 +377,8 @@ def create_addon_dict(addon): addon = addon or dict() for key in addon.keys(): result[key] = addon[key].config + if result[key] is None: + result[key] = {} result[key]['enabled'] = addon[key].enabled return result diff --git a/requirements-azure.txt b/requirements-azure.txt index 6df1a4e82..88f4ce389 100644 --- a/requirements-azure.txt +++ b/requirements-azure.txt @@ -10,7 +10,7 @@ azure-mgmt-cdn==3.0.0 azure-mgmt-compute==10.0.0 azure-mgmt-containerinstance==1.4.0 azure-mgmt-containerregistry==2.0.0 -azure-mgmt-containerservice==4.4.0 +azure-mgmt-containerservice==9.1.0 azure-mgmt-dns==2.1.0 azure-mgmt-keyvault==1.1.0 azure-mgmt-marketplaceordering==0.1.0 diff --git a/tests/integration/targets/azure_rm_aks/aliases b/tests/integration/targets/azure_rm_aks/aliases index ef0e2ed4e..3b050cbc1 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 From 981339a7edc269d6f3d9425b89797578746d0764 Mon Sep 17 00:00:00 2001 From: Fred-sun Date: Fri, 19 Jun 2020 16:14:02 +0800 Subject: [PATCH 2/5] update task yaml --- .../targets/azure_rm_aks/tasks/main.yml | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/tests/integration/targets/azure_rm_aks/tasks/main.yml b/tests/integration/targets/azure_rm_aks/tasks/main.yml index f4b5e36d2..a1a494c96 100644 --- a/tests/integration/targets/azure_rm_aks/tasks/main.yml +++ b/tests/integration/targets/azure_rm_aks/tasks/main.yml @@ -1,5 +1,6 @@ - set_fact: rpfx: "{{ resource_group | hash('md5') | truncate(8, True, '') }}" + noderpfx: "{{ resource_group | hash('md5') | truncate(4, True, '') }}" - name: Find available k8s version azure_rm_aksversion_info: @@ -27,7 +28,7 @@ enable_auto_scaling: True max_count: 3 min_count: 1 - node_resource_group: nodetest + node_resource_group: "node{{ noderpfx }}" enable_rbac: yes check_mode: yes @@ -63,7 +64,7 @@ enable_auto_scaling: True max_count: 3 min_count: 1 - node_resource_group: nodetest + node_resource_group: "node{{ noderpfx }}" enable_rbac: yes register: output @@ -105,7 +106,7 @@ enable_auto_scaling: True max_count: 3 min_count: 1 - node_resource_group: nodetest + node_resource_group: "node{{ noderpfx }}" enable_rbac: yes register: output @@ -137,7 +138,7 @@ count: 1 vm_size: Standard_DS1_v2 type: VirtualMachineScaleSets - node_resource_group: nodetest + node_resource_group: "node{{ noderpfx }}" addon: http_application_routing: {} network_profile: @@ -171,7 +172,7 @@ count: 1 vm_size: Standard_DS1_v2 type: VirtualMachineScaleSets - node_resource_group: nodetest + node_resource_group: "node{{ noderpfx }}" addon: http_application_routing: {} network_profile: @@ -204,7 +205,7 @@ enable_auto_scaling: True max_count: 6 min_count: 3 - node_resource_group: nodetest + node_resource_group: "node{{ noderpfx }}" enable_rbac: yes register: output @@ -235,7 +236,7 @@ enable_auto_scaling: True max_count: 6 min_count: 3 - node_resource_group: nodetest + node_resource_group: "node{{ noderpfx }}" enable_rbac: yes register: output From 17a5855c18d4adabbefae94028786b5e0af037a5 Mon Sep 17 00:00:00 2001 From: Fred-sun Date: Wed, 24 Jun 2020 14:58:35 +0800 Subject: [PATCH 3/5] resolve conflict --- tests/utils/ado/ado.sh | 16 ---------------- 1 file changed, 16 deletions(-) diff --git a/tests/utils/ado/ado.sh b/tests/utils/ado/ado.sh index eb0d238f0..43438a115 100755 --- a/tests/utils/ado/ado.sh +++ b/tests/utils/ado/ado.sh @@ -60,22 +60,6 @@ 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 2a2f9768a920d452137ada22cc55fbe09f4764e2 Mon Sep 17 00:00:00 2001 From: Fred-sun Date: Wed, 24 Jun 2020 15:05:44 +0800 Subject: [PATCH 4/5] revert ado.sh --- tests/utils/ado/ado.sh | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/tests/utils/ado/ado.sh b/tests/utils/ado/ado.sh index 43438a115..cb8c5f33c 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 43e260aec4f3980dd85da300858eab8892d6745d Mon Sep 17 00:00:00 2001 From: Fred-sun Date: Wed, 24 Jun 2020 15:08:45 +0800 Subject: [PATCH 5/5] add whitespace --- 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 cb8c5f33c..eb0d238f0 100755 --- a/tests/utils/ado/ado.sh +++ b/tests/utils/ado/ado.sh @@ -72,7 +72,7 @@ else echo "PASS" else echo "disabled" >> "${TEST_DIR}"/tests/integration/targets/"${item}"/aliases - fi + fi done fi