From 8ad4dc385b98f9c71666490e580ac1f3c59af953 Mon Sep 17 00:00:00 2001 From: Mark Rossetti Date: Tue, 24 Sep 2019 16:51:25 -0700 Subject: [PATCH] ci: Win CSE benchmark tests (#2023) * 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 a6205540e0688c444063e58b085aecf97d9f342f. * renaming test file --- Jenkinsfile | 7 ++- .../windows/cse_benchmark_aks_vhds.json | 57 +++++++++++++++++++ .../windows/cse_benchmark_win_vhds.json | 57 +++++++++++++++++++ 3 files changed, 119 insertions(+), 2 deletions(-) create mode 100644 test/e2e/test_cluster_configs/windows/cse_benchmark_aks_vhds.json create mode 100644 test/e2e/test_cluster_configs/windows/cse_benchmark_win_vhds.json diff --git a/Jenkinsfile b/Jenkinsfile index 0e6a516efc..a8b044d513 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -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}") { @@ -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') ] diff --git a/test/e2e/test_cluster_configs/windows/cse_benchmark_aks_vhds.json b/test/e2e/test_cluster_configs/windows/cse_benchmark_aks_vhds.json new file mode 100644 index 0000000000..cf3ed4bf56 --- /dev/null +++ b/test/e2e/test_cluster_configs/windows/cse_benchmark_aks_vhds.json @@ -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": "" + } + } + } +} \ No newline at end of file diff --git a/test/e2e/test_cluster_configs/windows/cse_benchmark_win_vhds.json b/test/e2e/test_cluster_configs/windows/cse_benchmark_win_vhds.json new file mode 100644 index 0000000000..927392f31d --- /dev/null +++ b/test/e2e/test_cluster_configs/windows/cse_benchmark_win_vhds.json @@ -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": "" + } + } + } +} \ No newline at end of file