Skip to content

Commit

Permalink
add aks test-scenarios
Browse files Browse the repository at this point in the history
add compute test-scenario

update gallery collection

update ssh public key
  • Loading branch information
ruowan committed Mar 19, 2021
1 parent b7050b7 commit e9d1158
Show file tree
Hide file tree
Showing 12 changed files with 169 additions and 42 deletions.
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
scope: ResourceGroup
testScenarios:
- description: gallerySimple1
steps:
- exampleFile: ../examples/CreateOrUpdateASimpleGallery.json
step: createOrUpdateASimpleGallery
- exampleFile: ../examples/GetAGallery.json
step: getAGallery
- exampleFile: ../examples/UpdateASimpleGallery.json
step: updateAGallery
- exampleFile: ../examples/CreateOrUpdateASimpleGalleryApplication.json
step: createGalleryApplication
- exampleFile: ../examples/ListGalleriesInAResourceGroup.json
step: listGalleriesInAResourceGroup
- exampleFile: ../examples/DeleteAGalleryApplication.json
step: deleteGalleryApplication
- exampleFile: ../examples/DeleteAGallery.json
step: deleteAGallery

Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"parameters": {
"subscriptionId": "{subscription-id}",
"resourceGroupName": "ConstosoRG",
"cloudServiceName": "{cs-name}",
"cloudServiceName": "xd",
"api-version": "2020-10-01-preview",
"parameters": {
"location": "westus",
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
scope: ResourceGroup


testScenarios:
- description: cloudService
name: cloudService
steps:
- exampleFile: ../examples/CreateCloudServiceWithSingleRole.json
step: createCloudServiceWithSingleRole
- exampleFile: ../examples/CreateCloudServiceWithMultiRole.json
step: createCloudServiceWithMultiRole
14 changes: 14 additions & 0 deletions specification/compute/resource-manager/readme.md
Original file line number Diff line number Diff line change
Expand Up @@ -810,3 +810,17 @@ input-file:
## AzureResourceSchema

See configuration in [readme.azureresourceschema.md](./readme.azureresourceschema.md)



``` yaml $(tag) == 'package-2020-10-01-preview'
test-resources:
- test: Microsoft.Compute/preview/2020-10-01-preview/test-scenarios/cloudServiceCRUD.yaml
- test: Microsoft.Compute/preview/2020-09-30/test-scenarios/galleryCRUD.yaml
```


``` yaml $(tag) == 'package-2020-09-30'
test-resources:
- test: Microsoft.Compute/preview/2020-09-30/test-scenarios/galleryCRUD.yaml
```
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
"resourceGroupName": "rg1",
"resourceName": "clustername1",
"parameters": {
"location": "location1",
"location": "eastus",
"tags": {
"tier": "production",
"archv2": ""
Expand All @@ -21,15 +21,14 @@
{
"name": "nodepool1",
"count": 3,
"vmSize": "Standard_DS1_v2",
"vmSize": "Standard_DS2_v2",
"osType": "Linux",
"type": "VirtualMachineScaleSets",
"availabilityZones": [
"1",
"2",
"3"
],
"enableNodePublicIP": true,
"mode": "System"
}
],
Expand All @@ -38,7 +37,7 @@
"ssh": {
"publicKeys": [
{
"keyData": "keydata"
"keyData": "{SSH_PUBLIC_KEY}"
}
]
}
Expand All @@ -56,29 +55,17 @@
"balance-similar-node-groups": "true",
"expander": "priority",
"max-node-provision-time": "15m",
"new-pod-scale-up-delay": "1m",
"scale-down-delay-after-add": "15m",
"scan-interval": "20s",
"skip-nodes-with-system-pods": "false"
},
"windowsProfile": {
"adminUsername": "azureuser",
"adminPassword": "replacePassword1234$"
},
"servicePrincipalProfile": {
"clientId": "clientid",
"secret": "secret"
"clientId": "40fdd0a8-9491-413f-b5dc-86da72815773",
"secret": "{{client_secret}}"
},
"addonProfiles": {},
"enableRBAC": true,
"diskEncryptionSetID": "/subscriptions/subid1/resourceGroups/rg1/providers/Microsoft.Compute/diskEncryptionSets/des",
"enablePodSecurityPolicy": true
},
"identity": {
"type": "UserAssigned",
"userAssignedIdentities": {
"/subscriptions/subid1/resourceGroups/rgName1/providers/Microsoft.ManagedIdentity/userAssignedIdentities/identity1": {}
}
"enablePodSecurityPolicy": false
}
}
},
Expand All @@ -94,7 +81,7 @@
},
"type": "Microsoft.ContainerService/ManagedClusters",
"properties": {
"provisioningState": "Succeeded",
"provisioningState": "InProgess",
"maxAgentPools": 1,
"kubernetesVersion": "1.9.6",
"dnsPrefix": "dnsprefix1",
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,50 @@
scope: ResourceGroup

prepareSteps:
- exampleFile: ../examples/ManagedClustersCreate_Update.json
step: prepareManagedCluster

requiredVariables:
- clientId
- clientSecret
- keyData

testScenarios:
- description: kubernetesCluster agentPool test
name: aksAgentPoolBasic
steps:
- exampleFile: ../examples/AgentPoolsCreate_Update.json
step: agentPoolCreate
- description: agentPool with ephemeral
name: aksAgentPoolEphemeral
variables:
agentPoolName: agentpool2
steps:
- exampleFile: ../examples/AgentPoolsCreate_Ephemeral.json
step: agentPool_Ephemeral

- description: agentPool with Spot
name: aksAgentPoolSpot
variables:
agentPoolName: agentpool3
steps:
- exampleFile: ../examples/AgentPoolsCreate_Spot.json
step: agentPool_Ephemeral

- description: agentPool with enableEncryptionAtHost.json
name: aksAgentPoolEncryptionAtHost
variables:
agentPoolName: agentpool4
steps:
- exampleFile: ../examples/AgentPoolsCreate_EnableEncryptionAtHost.json
step: agentPool_Ephemeral

- description: agentPool with customNodeConfig
name: aksAgentPoolCustomNodeConfig
variables:
agentPoolName: agentpool5
steps:
- exampleFile: ../examples/AgentPoolsCreate_CustomNodeConfig.json
step: agentPool_Ephemeral


6 changes: 6 additions & 0 deletions specification/containerservice/resource-manager/readme.md
Original file line number Diff line number Diff line change
Expand Up @@ -648,3 +648,9 @@ directive:
## AzureResourceSchema

See configuration in [readme.azureresourceschema.md](./readme.azureresourceschema.md)


``` yaml $(tag) == 'package-2020-12'
test-resources:
- test: Microsoft.ContainerService/stable/2020-12-01/test-scenarios/containerService.yaml
```
Original file line number Diff line number Diff line change
Expand Up @@ -11,28 +11,8 @@
"kind": "Storage",
"location": "eastus",
"properties": {
"isHnsEnabled": true,
"allowBlobPublicAccess": false,
"minimumTlsVersion": "TLS1_2",
"routingPreference": {
"routingChoice": "MicrosoftRouting",
"publishMicrosoftEndpoints": true,
"publishInternetEndpoints": true
},
"encryption": {
"services": {
"file": {
"keyType": "Account",
"enabled": true
},
"blob": {
"keyType": "Account",
"enabled": true
}
},
"requireInfrastructureEncryption": false,
"keySource": "Microsoft.Storage"
}
"minimumTlsVersion": "TLS1_2"
},
"tags": {
"key1": "value1",
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
{
"$schema": "https://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#",
"contentVersion": "1.0.0.1",
"parameters": {
"rgName": {
"type": "string"
},
"rgLocation": {
"type": "string"
},
"tags": {
"type": "object",
"defaultValue": {}
}
},
"variables": {},
"resources": [
{
"type": "Microsoft.Resources/resourceGroups",
"apiVersion": "2018-05-01",
"location": "[parameters('rgLocation')]",
"name": "[parameters('rgName')]",
"properties": {},
"tags": "[parameters('tags')]"
}
],
"outputs": {}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
{
"$schema": "https://schema.management.azure.com/schemas/2015-01-01/deploymentParameters.json#",
"contentVersion": "1.0.0.0",
"parameters": {
"rgName": {
"value": "ruowan-test1"
},
"rgLocation": {
"value": "eastus"
},
"tags": {
"value": {}
}
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
scope: ResourceGroup


testScenarios:
- description: storageAccount
name: testCreateStorageAccount
steps:
- exampleFile: ../examples/StorageAccountCreate.json
step: storageAccountCreate
- exampleFile: ../examples/BlobContainersPut.json
step: blobContainersPut
- exampleFile: ../examples/StorageAccountDelete.json
step: storageAccountDelete
4 changes: 4 additions & 0 deletions specification/storage/resource-manager/readme.md
Original file line number Diff line number Diff line change
Expand Up @@ -328,3 +328,7 @@ See configuration in [readme.java.md](./readme.java.md)

See configuration in [readme.azureresourceschema.md](./readme.azureresourceschema.md)

``` yaml $(tag) == 'package-2019-06'
test-resources:
- test: Microsoft.Storage/stable/2019-06-01/test-scenarios/createStorageAccount.yaml
```

0 comments on commit e9d1158

Please sign in to comment.