From 019d94e849ec15d6459b4dbddd1a0c90da51a791 Mon Sep 17 00:00:00 2001 From: marosset Date: Mon, 23 Sep 2019 22:11:34 +0000 Subject: [PATCH 1/6] adding benchmark tests for windows cse's --- Jenkinsfile | 9 ++- .../windows/cse_benchmark.json | 56 +++++++++++++++++++ .../windows/cse_benchmark_aks_vhds.json | 56 +++++++++++++++++++ 3 files changed, 118 insertions(+), 3 deletions(-) create mode 100644 test/e2e/test_cluster_configs/windows/cse_benchmark.json create mode 100644 test/e2e/test_cluster_configs/windows/cse_benchmark_aks_vhds.json diff --git a/Jenkinsfile b/Jenkinsfile index 0e6a516efc..05421597db 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') ] @@ -76,7 +79,7 @@ def runJobWithEnvironment(jobCfg, jobName, version) { try { echo "EXECUTOR_NUMBER :: $EXECUTOR_NUMBER" echo "NODE_NAME :: $NODE_NAME" - sh "./test/e2e/cluster.sh" + //sh "./test/e2e/cluster.sh" } finally { sh "./test/e2e/jenkins_reown.sh" } diff --git a/test/e2e/test_cluster_configs/windows/cse_benchmark.json b/test/e2e/test_cluster_configs/windows/cse_benchmark.json new file mode 100644 index 0000000000..15e1e8aa0a --- /dev/null +++ b/test/e2e/test_cluster_configs/windows/cse_benchmark.json @@ -0,0 +1,56 @@ +{ + "env": { + "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 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..97efeef623 --- /dev/null +++ b/test/e2e/test_cluster_configs/windows/cse_benchmark_aks_vhds.json @@ -0,0 +1,56 @@ +{ + "env": { + "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 From fd4622f8777ae0c75c97d18f818bf52a14d1242c Mon Sep 17 00:00:00 2001 From: marosset Date: Tue, 24 Sep 2019 04:11:09 +0000 Subject: [PATCH 2/6] fixup! adding benchmark tests for windows cse's --- Jenkinsfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Jenkinsfile b/Jenkinsfile index 05421597db..a8b044d513 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -79,7 +79,7 @@ def runJobWithEnvironment(jobCfg, jobName, version) { try { echo "EXECUTOR_NUMBER :: $EXECUTOR_NUMBER" echo "NODE_NAME :: $NODE_NAME" - //sh "./test/e2e/cluster.sh" + sh "./test/e2e/cluster.sh" } finally { sh "./test/e2e/jenkins_reown.sh" } From a6205540e0688c444063e58b085aecf97d9f342f Mon Sep 17 00:00:00 2001 From: marosset Date: Tue, 24 Sep 2019 17:11:39 +0000 Subject: [PATCH 3/6] TEMP - remove throttle while testing --- Jenkinsfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index a8b044d513..0e173ab33e 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -171,7 +171,7 @@ stage ("discover tests") { } stage ("AKS Engine E2E Tests") { - throttle(['k8s-matrix']) { + // throttle(['k8s-matrix']) { parallel tasks - } + //} } From d2169275de3cf5296c0288a8e20644689dee8fa4 Mon Sep 17 00:00:00 2001 From: marosset Date: Tue, 24 Sep 2019 22:25:28 +0000 Subject: [PATCH 4/6] Updating cse benchmark jobs to onl target k8s 1.16 --- test/e2e/test_cluster_configs/windows/cse_benchmark.json | 1 + .../e2e/test_cluster_configs/windows/cse_benchmark_aks_vhds.json | 1 + 2 files changed, 2 insertions(+) diff --git a/test/e2e/test_cluster_configs/windows/cse_benchmark.json b/test/e2e/test_cluster_configs/windows/cse_benchmark.json index 15e1e8aa0a..927392f31d 100644 --- a/test/e2e/test_cluster_configs/windows/cse_benchmark.json +++ b/test/e2e/test_cluster_configs/windows/cse_benchmark.json @@ -1,5 +1,6 @@ { "env": { + "allowedOrchestratorVersions": ["1.16"], "SKIP_TEST": "true" }, "options": { 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 index 97efeef623..cf3ed4bf56 100644 --- a/test/e2e/test_cluster_configs/windows/cse_benchmark_aks_vhds.json +++ b/test/e2e/test_cluster_configs/windows/cse_benchmark_aks_vhds.json @@ -1,5 +1,6 @@ { "env": { + "allowedOrchestratorVersions": ["1.16"], "SKIP_TEST": "true" }, "options": { From 64ec9f87c0070047f51d7832f17e29774cb953ef Mon Sep 17 00:00:00 2001 From: marosset Date: Tue, 24 Sep 2019 22:25:54 +0000 Subject: [PATCH 5/6] Revert "TEMP - remove throttle while testing" This reverts commit a6205540e0688c444063e58b085aecf97d9f342f. --- Jenkinsfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 0e173ab33e..a8b044d513 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -171,7 +171,7 @@ stage ("discover tests") { } stage ("AKS Engine E2E Tests") { - // throttle(['k8s-matrix']) { + throttle(['k8s-matrix']) { parallel tasks - //} + } } From d9643c2b2e9830456c69b10885f0e1b6004c699c Mon Sep 17 00:00:00 2001 From: marosset Date: Tue, 24 Sep 2019 22:29:48 +0000 Subject: [PATCH 6/6] renaming test file --- .../windows/{cse_benchmark.json => cse_benchmark_win_vhds.json} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename test/e2e/test_cluster_configs/windows/{cse_benchmark.json => cse_benchmark_win_vhds.json} (100%) diff --git a/test/e2e/test_cluster_configs/windows/cse_benchmark.json b/test/e2e/test_cluster_configs/windows/cse_benchmark_win_vhds.json similarity index 100% rename from test/e2e/test_cluster_configs/windows/cse_benchmark.json rename to test/e2e/test_cluster_configs/windows/cse_benchmark_win_vhds.json