chore: add windows, monitoring and base test configs (#1899)

This commit is contained in:
David Justice 2019-09-04 21:42:42 -07:00 коммит произвёл GitHub
Родитель ce4fa09ebe
Коммит 8b535e2d5c
Не найден ключ, соответствующий данной подписи
Идентификатор ключа GPG: 4AEE18F83AFDEB23
20 изменённых файлов: 833 добавлений и 78 удалений

33
Jenkinsfile поставляемый
Просмотреть файл

@ -1,13 +1,13 @@
import groovy.json.*
def defaultEnv = [
fork: "${params.FORK}",
branch: "${params.BRANCH}",
regions: "${params.REGIONS}",
cleanupOnExit: true,
upgradeCluster: false,
createVNet: false,
scaleCluster: false,
FORK: "${params.FORK}",
BRANCH: "${params.BRANCH}",
REGION_OPTIONS: "${params.REGIONS}",
CLEANUP_ON_EXIT: true,
UPGRADE_CLUSTER: false,
CREATE_VNET: false,
SCALE_CLUSTER: false,
]
def k8sVersions = ["1.12", "1.13", "1.14", "1.15", "1.16"]
@ -17,7 +17,7 @@ def testConfigs = []
stage ("build binary") {
node {
retry(5){
sh("sudo rm -rf ./bin ./_output ./_logs")
sh("sudo rm -rf ./*")
checkout scm
}
@ -39,7 +39,7 @@ stage ("build binary") {
stage ("discover tests") {
node {
retry(5){
sh("sudo rm -rf ./bin ./_output ./_logs")
sh("sudo rm -rf ./*")
checkout scm
}
@ -79,17 +79,10 @@ stage ("discover tests") {
def jobSpecificEnv = (jobCfg.env == null) ? defaultEnv.clone() : defaultEnv + jobCfg.env
// set environment variables needed for the test script
def envVars = [
"ORCHESTRATOR_RELEASE=${version}",
"API_MODEL_INPUT=${JsonOutput.toJson(jobCfg.apiModel)}",
"FORK=${jobSpecificEnv.fork}",
"BRANCH=${jobSpecificEnv.branch}",
"REGION_OPTIONS=${jobSpecificEnv.regions}",
"CLEANUP_ON_EXIT=${jobSpecificEnv.cleanupOnExit}",
"UPGRADE_CLUSTER=${jobSpecificEnv.upgradeCluster}",
"CREATE_VNET=${jobSpecificEnv.createVNet}",
"SCALE_CLUSTER=${jobSpecificEnv.scaleCluster}",
]
withEnv(envVars) {
ORCHESTRATOR_RELEASE: "${version}",
API_MODEL_INPUT: "${JsonOutput.toJson(jobCfg.apiModel)}",
] + jobSpecificEnv
withEnv(envVars.collect{ k, v -> "${k}=${v}" }) {
// define any sensitive data needed for the test script
def creds = [
string(credentialsId: 'AKS_ENGINE_TENANT_ID', variable: 'TENANT_ID'),

Просмотреть файл

@ -1,6 +1,6 @@
{
"env": {
"createVNet": true
"CREATE_VNET": true
},
"apiModel": {
"apiVersion": "vlabs",

Просмотреть файл

@ -1,69 +1,21 @@
{
"env": {
"createVNet": true
},
"env": {},
"apiModel": {
"apiVersion": "vlabs",
"properties": {
"orchestratorProfile": {
"orchestratorType": "Kubernetes",
"kubernetesConfig": {
"clusterSubnet": "10.239.0.0/16",
"addons": [
{
"name": "aad-pod-identity",
"enabled": true
},
{
"name": "cluster-autoscaler",
"enabled": true
},
{
"name": "tiller",
"enabled": true
},
{
"name": "kubernetes-dashboard",
"enabled": true
},
{
"name": "rescheduler",
"enabled": true
}
],
"loadBalancerSku": "Standard",
"excludeMasterFromStandardLB": true
}
"orchestratorType": "Kubernetes"
},
"masterProfile": {
"count": 3,
"count": 1,
"dnsPrefix": "",
"vmSize": "Standard_D2_v3",
"OSDiskSizeGB": 200,
"vnetSubnetId": "/subscriptions/SUB_ID/resourceGroups/RG_NAME/providers/Microsoft.Network/virtualNetworks/VNET_NAME/subnets/SUBNET_NAME",
"firstConsecutiveStaticIP": "10.239.255.239",
"vnetCidr": "10.239.0.0/16",
"availabilityZones": [
"1"
]
"vmSize": "Standard_D2_v3"
},
"agentPoolProfiles": [
{
"name": "pool1",
"count": 4,
"vmSize": "Standard_D2_v3",
"OSDiskSizeGB": 200,
"storageProfile": "ManagedDisks",
"diskSizesGB": [
128
],
"availabilityProfile": "VirtualMachineScaleSets",
"vnetSubnetId": "/subscriptions/SUB_ID/resourceGroups/RG_NAME/providers/Microsoft.Network/virtualNetworks/VNET_NAME/subnets/SUBNET_NAME",
"availabilityZones": [
"1",
"2"
],
"scaleSetPriority": "Low"
"name": "agentpool1",
"count": 2,
"vmSize": "Standard_D2_v3"
}
],
"linuxProfile": {

Просмотреть файл

@ -0,0 +1,46 @@
{
"env": {},
"apiModel": {
"apiVersion": "vlabs",
"properties": {
"orchestratorProfile": {
"orchestratorType": "Kubernetes",
"kubernetesConfig": {
"addons": [
{
"name": "container-monitoring",
"enabled": true
}
]
}
},
"masterProfile": {
"count": 1,
"dnsPrefix": "",
"vmSize": "Standard_DS2_v2"
},
"agentPoolProfiles": [
{
"name": "agentpool",
"count": 3,
"vmSize": "Standard_DS2_v2",
"availabilityProfile": "VirtualMachineScaleSets"
}
],
"linuxProfile": {
"adminUsername": "azureuser",
"ssh": {
"publicKeys": [
{
"keyData": ""
}
]
}
},
"servicePrincipalProfile": {
"clientId": "",
"secret": ""
}
}
}
}

Просмотреть файл

@ -0,0 +1,85 @@
{
"env": {
"CREATE_VNET": true
},
"apiModel": {
"apiVersion": "vlabs",
"properties": {
"orchestratorProfile": {
"orchestratorType": "Kubernetes",
"kubernetesConfig": {
"clusterSubnet": "10.239.0.0/16",
"addons": [
{
"name": "aad-pod-identity",
"enabled": true
},
{
"name": "cluster-autoscaler",
"enabled": true
},
{
"name": "tiller",
"enabled": true
},
{
"name": "kubernetes-dashboard",
"enabled": true
},
{
"name": "rescheduler",
"enabled": true
}
],
"loadBalancerSku": "Standard",
"excludeMasterFromStandardLB": true
}
},
"masterProfile": {
"count": 3,
"dnsPrefix": "",
"vmSize": "Standard_D2_v3",
"OSDiskSizeGB": 200,
"vnetSubnetId": "/subscriptions/SUB_ID/resourceGroups/RG_NAME/providers/Microsoft.Network/virtualNetworks/VNET_NAME/subnets/SUBNET_NAME",
"firstConsecutiveStaticIP": "10.239.255.239",
"vnetCidr": "10.239.0.0/16",
"availabilityZones": [
"1"
]
},
"agentPoolProfiles": [
{
"name": "pool1",
"count": 4,
"vmSize": "Standard_D2_v3",
"OSDiskSizeGB": 200,
"storageProfile": "ManagedDisks",
"diskSizesGB": [
128
],
"availabilityProfile": "VirtualMachineScaleSets",
"vnetSubnetId": "/subscriptions/SUB_ID/resourceGroups/RG_NAME/providers/Microsoft.Network/virtualNetworks/VNET_NAME/subnets/SUBNET_NAME",
"availabilityZones": [
"1",
"2"
],
"scaleSetPriority": "Low"
}
],
"linuxProfile": {
"adminUsername": "azureuser",
"ssh": {
"publicKeys": [
{
"keyData": ""
}
]
}
},
"servicePrincipalProfile": {
"clientId": "",
"secret": ""
}
}
}
}

Просмотреть файл

@ -1,6 +1,6 @@
{
"env": {
"regions": "westus2,southcentralus"
"REGION_OPTIONS": "westus2,southcentralus"
},
"apiModel": {
"apiVersion": "vlabs",

Просмотреть файл

@ -0,0 +1,55 @@
{
"env": {},
"apiModel": {
"apiVersion": "vlabs",
"properties": {
"orchestratorProfile": {
"orchestratorType": "Kubernetes",
"orchestratorRelease": "1.12",
"kubernetesConfig": {
"networkPlugin": "cilium",
"networkPolicy": "cilium",
"apiServerConfig": {
"--enable-admission-plugins": "NamespaceLifecycle,LimitRanger,ServiceAccount,DefaultStorageClass,DefaultTolerationSeconds,MutatingAdmissionWebhook,ValidatingAdmissionWebhook,ResourceQuota,AlwaysPullImages"
},
"addons": [
{
"name": "tiller",
"enabled": true
},
{
"name": "ip-masq-agent",
"enabled": false
}
]
}
},
"masterProfile": {
"count": 1,
"dnsPrefix": "",
"vmSize": "Standard_D2_v2"
},
"agentPoolProfiles": [
{
"name": "agent1",
"count": 2,
"vmSize": "Standard_D2_v2"
}
],
"linuxProfile": {
"adminUsername": "azureuser",
"ssh": {
"publicKeys": [
{
"keyData": ""
}
]
}
},
"servicePrincipalProfile": {
"clientId": "",
"secret": ""
}
}
}
}

Просмотреть файл

@ -1,6 +1,6 @@
{
"env": {
"createVNet": true
"CREATE_VNET": true
},
"apiModel": {
"apiVersion": "vlabs",

Просмотреть файл

@ -0,0 +1,45 @@
{
"env": {},
"options": {
"allowedOrchestratorVersions": ["1.14"]
},
"apiModel": {
"apiVersion": "vlabs",
"properties": {
"orchestratorProfile": {
"orchestratorType": "Kubernetes",
"kubernetesConfig": {
"networkPolicy": "calico",
"networkPlugin": "azure"
}
},
"masterProfile": {
"count": 1,
"dnsPrefix": "",
"vmSize": "Standard_DS2_v2"
},
"agentPoolProfiles": [
{
"name": "agentpool1",
"count": 3,
"vmSize": "Standard_DS2_v2",
"availabilityProfile": "AvailabilitySet"
}
],
"linuxProfile": {
"adminUsername": "azureuser",
"ssh": {
"publicKeys": [
{
"keyData": ""
}
]
}
},
"servicePrincipalProfile": {
"clientId": "",
"secret": ""
}
}
}
}

Просмотреть файл

@ -0,0 +1,40 @@
{
"env": {},
"apiModel": {
"apiVersion": "vlabs",
"properties": {
"orchestratorProfile": {
"orchestratorType": "Kubernetes"
},
"masterProfile": {
"count": 1,
"dnsPrefix": "",
"vmSize": "Standard_D2_v2"
},
"agentPoolProfiles": [
{
"name": "agentpool1",
"count": 3,
"vmSize": "Standard_D2_v2"
}
],
"linuxProfile": {
"adminUsername": "azureuser",
"ssh": {
"publicKeys": [
{
"keyData": ""
}
]
}
},
"featureFlags": {
"BlockOutboundInternet": true
},
"servicePrincipalProfile": {
"clientId": "",
"secret": ""
}
}
}
}

Просмотреть файл

@ -0,0 +1,40 @@
{
"env": {},
"apiModel": {
"apiVersion": "vlabs",
"properties": {
"orchestratorProfile": {
"orchestratorType": "Kubernetes",
"kubernetesConfig": {
"etcdVersion": "3.3.1"
}
},
"masterProfile": {
"count": 1,
"dnsPrefix": "",
"vmSize": "Standard_D2_v2"
},
"agentPoolProfiles": [
{
"name": "agentpool1",
"count": 3,
"vmSize": "Standard_D2_v2"
}
],
"linuxProfile": {
"adminUsername": "azureuser",
"ssh": {
"publicKeys": [
{
"keyData": ""
}
]
}
},
"servicePrincipalProfile": {
"clientId": "",
"secret": ""
}
}
}
}

Просмотреть файл

@ -0,0 +1,71 @@
{
"env": {
"CREATE_VNET": true
},
"apiModel": {
"apiVersion": "vlabs",
"properties": {
"orchestratorProfile": {
"orchestratorType": "Kubernetes",
"kubernetesConfig": {
"clusterSubnet": "10.239.0.0/16",
"addons": [
{
"name": "aad-pod-identity",
"enabled": true
},
{
"name": "tiller",
"enabled": true
},
{
"name": "kubernetes-dashboard",
"enabled": true
},
{
"name": "rescheduler",
"enabled": true
}
]
}
},
"masterProfile": {
"count": 1,
"dnsPrefix": "",
"vmSize": "Standard_D2_v2",
"OSDiskSizeGB": 200,
"vnetSubnetId": "/subscriptions/SUB_ID/resourceGroups/RG_NAME/providers/Microsoft.Network/virtualNetworks/VNET_NAME/subnets/SUBNET_NAME",
"firstConsecutiveStaticIP": "10.239.255.239",
"vnetCidr": "10.239.0.0/16"
},
"agentPoolProfiles": [
{
"name": "agent1",
"count": 3,
"vmSize": "Standard_D2_v2",
"OSDiskSizeGB": 200,
"storageProfile": "StorageAccount",
"diskSizesGB": [
128
],
"availabilityProfile": "AvailabilitySet",
"vnetSubnetId": "/subscriptions/SUB_ID/resourceGroups/RG_NAME/providers/Microsoft.Network/virtualNetworks/VNET_NAME/subnets/SUBNET_NAME"
}
],
"linuxProfile": {
"adminUsername": "azureuser",
"ssh": {
"publicKeys": [
{
"keyData": ""
}
]
}
},
"servicePrincipalProfile": {
"clientId": "",
"secret": ""
}
}
}
}

Просмотреть файл

@ -0,0 +1,39 @@
{
"env": {},
"apiModel": {
"apiVersion": "vlabs",
"properties": {
"orchestratorProfile": {
"orchestratorType": "Kubernetes",
},
"masterProfile": {
"count": 3,
"dnsPrefix": "",
"vmSize": "Standard_D2_v2",
"availabilityProfile": "VirtualMachineScaleSets"
},
"agentPoolProfiles": [
{
"name": "agentpool1",
"count": 3,
"vmSize": "Standard_D2_v2",
"availabilityProfile": "VirtualMachineScaleSets"
}
],
"linuxProfile": {
"adminUsername": "azureuser",
"ssh": {
"publicKeys": [
{
"keyData": ""
}
]
}
},
"servicePrincipalProfile": {
"clientId": "",
"secret": ""
}
}
}
}

Просмотреть файл

@ -0,0 +1,46 @@
{
"env": {},
"apiModel": {
"apiVersion": "vlabs",
"properties": {
"orchestratorProfile": {
"orchestratorType": "Kubernetes",
},
"masterProfile": {
"count": 1,
"dnsPrefix": "",
"vmSize": "Standard_D2_v2"
},
"agentPoolProfiles": [
{
"name": "agentwin",
"count": 3,
"vmSize": "Standard_D2_v2",
"osType": "Windows",
"acceleratedNetworkingEnabledWindows": true,
"availabilityProfile": "AvailabilitySet"
}
],
"windowsProfile": {
"adminUsername": "azureuser",
"adminPassword": "replacepassword1234$",
"enableAutomaticUpdates": false,
"sshEnabled": true
},
"linuxProfile": {
"adminUsername": "azureuser",
"ssh": {
"publicKeys": [
{
"keyData": ""
}
]
}
},
"servicePrincipalProfile": {
"clientId": "",
"secret": ""
}
}
}
}

Просмотреть файл

@ -0,0 +1,49 @@
{
"env": {},
"apiModel": {
"apiVersion": "vlabs",
"properties": {
"orchestratorProfile": {
"orchestratorType": "Kubernetes",
},
"masterProfile": {
"count": 1,
"dnsPrefix": "",
"vmSize": "Standard_D2_v2"
},
"agentPoolProfiles": [
{
"name": "linuxpool1",
"count": 3,
"vmSize": "Standard_D2_v2"
},
{
"name": "agentwin",
"count": 3,
"vmSize": "Standard_D2_v2",
"osType": "Windows"
}
],
"windowsProfile": {
"adminUsername": "azureuser",
"adminPassword": "replacepassword1234$",
"enableAutomaticUpdates": false,
"sshEnabled": true
},
"linuxProfile": {
"adminUsername": "azureuser",
"ssh": {
"publicKeys": [
{
"keyData": ""
}
]
}
},
"servicePrincipalProfile": {
"clientId": "",
"secret": ""
}
}
}
}

Просмотреть файл

@ -0,0 +1,85 @@
{
"env": {
"CREATE_VNET": true
},
"apiModel": {
"apiVersion": "vlabs",
"properties": {
"orchestratorProfile": {
"orchestratorType": "Kubernetes",
"kubernetesConfig": {
"clusterSubnet": "10.239.0.0/16",
"addons": [
{
"name": "aad-pod-identity",
"enabled": true
},
{
"name": "cluster-autoscaler",
"enabled": true
},
{
"name": "tiller",
"enabled": true
},
{
"name": "kubernetes-dashboard",
"enabled": true
},
{
"name": "rescheduler",
"enabled": true
}
]
}
},
"masterProfile": {
"count": 3,
"dnsPrefix": "",
"vmSize": "Standard_D2_v2",
"OSDiskSizeGB": 200,
"vnetSubnetId": "/subscriptions/SUB_ID/resourceGroups/RG_NAME/providers/Microsoft.Network/virtualNetworks/VNET_NAME/subnets/SUBNET_NAME",
"firstConsecutiveStaticIP": "10.239.255.239",
"vnetCidr": "10.239.0.0/16"
},
"agentPoolProfiles": [
{
"name": "agent1",
"count": 3,
"vmSize": "Standard_D2_v2",
"osType": "Windows",
"OSDiskSizeGB": 200,
"storageProfile": "ManagedDisks",
"diskSizesGB": [
128,
128,
128,
128
],
"availabilityProfile": "VirtualMachineScaleSets",
"vnetSubnetId": "/subscriptions/SUB_ID/resourceGroups/RG_NAME/providers/Microsoft.Network/virtualNetworks/VNET_NAME/subnets/SUBNET_NAME"
}
],
"linuxProfile": {
"adminUsername": "azureuser",
"ssh": {
"publicKeys": [
{
"keyData": ""
}
]
}
},
"windowsProfile": {
"adminUsername": "azureuser",
"adminPassword": "replacepassword1234$",
"enableAutomaticUpdates": false,
"sshEnabled": true
},
"servicePrincipalProfile": {
"clientId": "",
"secret": ""
}
}
}
}

Просмотреть файл

@ -0,0 +1,53 @@
{
"env": {
"REGION_OPTIONS": "westus",
"WINDOWS_NODE_IMAGE_NAME": "WS2019-1908",
"WINDOWS_NODE_IMAGE_RESOURCE_GROUP": "acse-test-infrastructure"
},
"apiModel": {
"apiVersion": "vlabs",
"properties": {
"orchestratorProfile": {
"orchestratorType": "Kubernetes",
},
"masterProfile": {
"count": 1,
"dnsPrefix": "",
"vmSize": "Standard_D2_v2"
},
"agentPoolProfiles": [
{
"name": "linuxpool1",
"count": 1,
"vmSize": "Standard_D2_v2"
},
{
"name": "agentwin",
"count": 3,
"vmSize": "Standard_D2_v2",
"osType": "Windows"
}
],
"windowsProfile": {
"adminUsername": "azureuser",
"adminPassword": "replacepassword1234$",
"enableAutomaticUpdates": false,
"sshEnabled": true
},
"linuxProfile": {
"adminUsername": "azureuser",
"ssh": {
"publicKeys": [
{
"keyData": ""
}
]
}
},
"servicePrincipalProfile": {
"clientId": "",
"secret": ""
}
}
}
}

Просмотреть файл

@ -0,0 +1,48 @@
{
"env": {},
"apiModel": {
"apiVersion": "vlabs",
"properties": {
"orchestratorProfile": {
"orchestratorType": "Kubernetes",
"orchestratorRelease": "1.14",
"kubernetesConfig": {
"networkPlugin": "kubenet"
}
},
"masterProfile": {
"count": 1,
"dnsPrefix": "",
"vmSize": "Standard_D2_v2"
},
"agentPoolProfiles": [
{
"name": "agentwin",
"count": 3,
"vmSize": "Standard_D2_v2",
"osType": "Windows"
}
],
"windowsProfile": {
"adminUsername": "azureuser",
"adminPassword": "replacepassword1234$",
"enableAutomaticUpdates": false,
"sshEnabled": true
},
"linuxProfile": {
"adminUsername": "azureuser",
"ssh": {
"publicKeys": [
{
"keyData": ""
}
]
}
},
"servicePrincipalProfile": {
"clientId": "",
"secret": ""
}
}
}
}

Просмотреть файл

@ -0,0 +1,56 @@
{
"env": {
"REGION_OPTIONS": "westus",
"WINDOWS_NODE_IMAGE_NAME": "AKS-Engine-WS2019",
"WINDOWS_NODE_IMAGE_RESOURCE_GROUP": "acse-test-infrastructure",
"WINDOWS_NODE_IMAGE_GALLERY": "akse_test_images",
"WINDOWS_NODE_IMAGE_SUBSCRIPTION_ID": "3014546b-7d1c-4f80-8523-f24a9976fe6a",
"WINDOWS_NODE_IMAGE_VERSION": "17763.678.190826"
},
"apiModel": {
"apiVersion": "vlabs",
"properties": {
"orchestratorProfile": {
"orchestratorType": "Kubernetes",
},
"masterProfile": {
"count": 1,
"dnsPrefix": "",
"vmSize": "Standard_D2_v2"
},
"agentPoolProfiles": [
{
"name": "linuxpool1",
"count": 1,
"vmSize": "Standard_D2_v2"
},
{
"name": "agentwin",
"count": 3,
"vmSize": "Standard_D2_v2",
"osType": "Windows"
}
],
"windowsProfile": {
"adminUsername": "azureuser",
"adminPassword": "replacepassword1234$",
"enableAutomaticUpdates": false,
"sshEnabled": true
},
"linuxProfile": {
"adminUsername": "azureuser",
"ssh": {
"publicKeys": [
{
"keyData": ""
}
]
}
},
"servicePrincipalProfile": {
"clientId": "",
"secret": ""
}
}
}
}

Просмотреть файл

@ -0,0 +1,52 @@
{
"env": {
"REGION_OPTIONS": "westus",
"WINDOWS_NODE_VHD_URL": "https://aksenginee2etestimages.blob.core.windows.net/vhds/WS2019-1908.vhd"
},
"apiModel": {
"apiVersion": "vlabs",
"properties": {
"orchestratorProfile": {
"orchestratorType": "Kubernetes",
},
"masterProfile": {
"count": 1,
"dnsPrefix": "",
"vmSize": "Standard_D2_v2"
},
"agentPoolProfiles": [
{
"name": "linuxpool1",
"count": 3,
"vmSize": "Standard_D2_v2"
},
{
"name": "agentwin",
"count": 3,
"vmSize": "Standard_D2_v2",
"osType": "Windows"
}
],
"windowsProfile": {
"adminUsername": "azureuser",
"adminPassword": "replacepassword1234$",
"enableAutomaticUpdates": false,
"sshEnabled": true
},
"linuxProfile": {
"adminUsername": "azureuser",
"ssh": {
"publicKeys": [
{
"keyData": ""
}
]
}
},
"servicePrincipalProfile": {
"clientId": "",
"secret": ""
}
}
}
}