Skip to content
This repository has been archived by the owner on Oct 24, 2023. It is now read-only.

Commit

Permalink
ci: Win CSE benchmark tests (#2023)
Browse files Browse the repository at this point in the history
* adding benchmark tests for windows cse's

* fixup! adding benchmark tests for windows cse's

* TEMP - remove throttle while testing

* Updating cse benchmark jobs to onl target k8s 1.16

* Revert "TEMP - remove throttle while testing"

This reverts commit a620554.

* renaming test file
  • Loading branch information
marosset authored and acs-bot committed Sep 24, 2019
1 parent 50d8411 commit 8ad4dc3
Show file tree
Hide file tree
Showing 3 changed files with 119 additions and 2 deletions.
7 changes: 5 additions & 2 deletions Jenkinsfile
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,7 @@ def taskForCreateJob(jobCfg, jobName, version) {

def runJobWithEnvironment(jobCfg, jobName, version) {
def jobSpecificEnv = defaultEnv + jobCfg.env
def opts = jobCfg.options
return {
node {
ws("${env.JOB_NAME}-${jobName}") {
Expand All @@ -64,10 +65,12 @@ def runJobWithEnvironment(jobCfg, jobName, version) {
] + jobSpecificEnv
withEnv(envVars.collect{ k, v -> "${k}=${v}" }) {
// define any sensitive data needed for the test script
def clientIdOverride = opts.clientId ? opts.clientId : 'AKS_ENGINE_3014546b_CLIENT_ID'
def clientSecretOverride = opts.clientSecret ? opts.clientSecret : 'AKS_ENGINE_3014546b_CLIENT_SECRET'
def creds = [
string(credentialsId: 'AKS_ENGINE_TENANT_ID', variable: 'TENANT_ID'),
string(credentialsId: 'AKS_ENGINE_3014546b_CLIENT_ID', variable: 'CLIENT_ID'),
string(credentialsId: 'AKS_ENGINE_3014546b_CLIENT_SECRET', variable: 'CLIENT_SECRET'),
string(credentialsId: clientIdOverride, variable: 'CLIENT_ID'),
string(credentialsId: clientSecretOverride, variable: 'CLIENT_SECRET'),
string(credentialsId: 'LOG_ANALYTICS_WORKSPACE_KEY', variable: 'LOG_ANALYTICS_WORKSPACE_KEY')
]

Expand Down
57 changes: 57 additions & 0 deletions test/e2e/test_cluster_configs/windows/cse_benchmark_aks_vhds.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,57 @@
{
"env": {
"allowedOrchestratorVersions": ["1.16"],
"SKIP_TEST": "true"
},
"options": {
"clientId": "AKS_ENGINE_9251926c_CLIENT_ID",
"clientSecret": "AKS_ENGINE_9251926c_CLIENT_SECRET"
},
"apiModel": {
"apiVersion": "vlabs",
"properties": {
"orchestratorProfile": {
"orchestratorType": "Kubernetes"
},
"masterProfile": {
"count": 1,
"dnsPrefix": "",
"vmSize": "Standard_D2_v3"
},
"agentPoolProfiles": [
{
"name": "agentwin",
"count": 3,
"vmSize": "Standard_D2_v3",
"availabilityProfile": "AvailabilitySet",
"osType": "Windows",
"storageProfile": "ManagedDisks"
}
],
"windowsProfile": {
"adminUsername": "azureuser",
"adminPassword": "replacepassword1234$",
"enableAutomaticUpdates": false,
"sshEnabled": true,
"windowsPublisher": "microsoft-aks",
"windowsOffer": "aks-windows",
"windowsSku": "2019-datacenter-core-smalldisk",
"imageVersion": "latest"
},
"linuxProfile": {
"adminUsername": "azureuser",
"ssh": {
"publicKeys": [
{
"keyData": ""
}
]
}
},
"servicePrincipalProfile": {
"clientId": "",
"secret": ""
}
}
}
}
57 changes: 57 additions & 0 deletions test/e2e/test_cluster_configs/windows/cse_benchmark_win_vhds.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,57 @@
{
"env": {
"allowedOrchestratorVersions": ["1.16"],
"SKIP_TEST": "true"
},
"options": {
"clientId": "AKS_ENGINE_e7b1dca4_CLIENT_ID",
"clientSecret": "AKS_ENGINE_e7b1dca4_CLIENT_SECRET"
},
"apiModel": {
"apiVersion": "vlabs",
"properties": {
"orchestratorProfile": {
"orchestratorType": "Kubernetes"
},
"masterProfile": {
"count": 1,
"dnsPrefix": "",
"vmSize": "Standard_D2_v3"
},
"agentPoolProfiles": [
{
"name": "agentwin",
"count": 3,
"vmSize": "Standard_D2_v3",
"availabilityProfile": "AvailabilitySet",
"osType": "Windows",
"storageProfile": "ManagedDisks"
}
],
"windowsProfile": {
"adminUsername": "azureuser",
"adminPassword": "replacepassword1234$",
"enableAutomaticUpdates": false,
"sshEnabled": true,
"windowsPublisher": "MicrosoftWindowsServer",
"windowsOffer": "WindowsServer",
"windowsSku": "2019-Datacenter-Core-with-Containers-smalldisk",
"imageVersion": "latest"
},
"linuxProfile": {
"adminUsername": "azureuser",
"ssh": {
"publicKeys": [
{
"keyData": ""
}
]
}
},
"servicePrincipalProfile": {
"clientId": "",
"secret": ""
}
}
}
}

0 comments on commit 8ad4dc3

Please sign in to comment.