enabled 'keyvaultcerts' tests for swarmmode

examples/keyvaultcerts/swarmmode.json

@@ -41,7 +41,19 @@
             "keyData": ""
           }
         ]
-      }
+      },
+      "secrets":[
+        {
+          "sourceVault":{
+            "id":""
+          },
+          "vaultCertificates":[
+            {
+              "certificateUrl" :""
+            }
+          ]
+        }
+	    ]
     }
   }
-}
+}

test/acsengine-ci.groovy

@@ -40,8 +40,8 @@ node {
                   env.INSTANCE_NAME_PREFIX = "acs-ci"
                   env.ORCHESTRATOR = "${ORCHESTRATOR}"
                   env.CLUSTER_DEFINITION="examples/${ORCHESTRATOR}.json"
-                  env.CLUSTER_SERVICE_PRINCIPAL_CLIENT_ID="${SERVICE_PRINCIPAL_CLIENT_ID}"
-                  env.CLUSTER_SERVICE_PRINCIPAL_CLIENT_SECRET="${SERVICE_PRINCIPAL_CLIENT_SECRET}"
+                  env.CLUSTER_SERVICE_PRINCIPAL_CLIENT_ID="${CLUSTER_SERVICE_PRINCIPAL_CLIENT_ID}"
+                  env.CLUSTER_SERVICE_PRINCIPAL_CLIENT_SECRET="${CLUSTER_SERVICE_PRINCIPAL_CLIENT_SECRET}"
 
                   env.LOCATION = "${LOCATION}"
                   env.RESOURCE_GROUP = "test-acs-ci-${ORCHESTRATOR}-${env.LOCATION}-${env.BUILD_NUMBER}"

test/acsengine-features.groovy

@@ -34,8 +34,8 @@ node {
                 env.TENANT_ID="${TENANT_ID}"
                 env.SUBSCRIPTION_ID="${SUBSCRIPTION_ID}"
                 env.LOCATION = "${LOCATION}"
-                env.CLUSTER_SERVICE_PRINCIPAL_CLIENT_ID="${SERVICE_PRINCIPAL_CLIENT_ID}"
-                env.CLUSTER_SERVICE_PRINCIPAL_CLIENT_SECRET="${SERVICE_PRINCIPAL_CLIENT_SECRET}"
+                env.CLUSTER_SERVICE_PRINCIPAL_CLIENT_ID="${CLUSTER_SERVICE_PRINCIPAL_CLIENT_ID}"
+                env.CLUSTER_SERVICE_PRINCIPAL_CLIENT_SECRET="${CLUSTER_SERVICE_PRINCIPAL_CLIENT_SECRET}"
 
                 sh("printf 'acs-features-test%x' \$(date '+%s') > INSTANCE_NAME_PREFIX")
                 prefix = readFile('INSTANCE_NAME_PREFIX').trim()

test/acsengine-svc.groovy

@@ -50,8 +50,8 @@ uksouth ukwest"
                 sh("printf 'acs-test%x' \$(date '+%s') > INSTANCE_NAME")
                 env.INSTANCE_NAME = readFile('INSTANCE_NAME').trim()
                 env.CLUSTER_DEFINITION="examples/${ORCHESTRATOR}.json"
-                env.CLUSTER_SERVICE_PRINCIPAL_CLIENT_ID="${SERVICE_PRINCIPAL_CLIENT_ID}"
-                env.CLUSTER_SERVICE_PRINCIPAL_CLIENT_SECRET="${SERVICE_PRINCIPAL_CLIENT_SECRET}"
+                env.CLUSTER_SERVICE_PRINCIPAL_CLIENT_ID="${CLUSTER_SERVICE_PRINCIPAL_CLIENT_ID}"
+                env.CLUSTER_SERVICE_PRINCIPAL_CLIENT_SECRET="${CLUSTER_SERVICE_PRINCIPAL_CLIENT_SECRET}"
                 sh('./test/step.sh generate_template')
               }