fix(e2e): remove keyvault tests from feature validation (for now) (#1155

)

* fix(e2e): remove keyvault tests from feature validation (for now)

* fix(docs): apply CI badge in correct README

* fix(ci): don't run e2e on master since we run full suite

* ref(e2e): use a different subscription for feature validation tests

* chore(ci): store e2e logs as test artifacts

.circleci/config.yml

@@ -37,6 +37,8 @@ jobs:
       - run:
           name: e2e tests
           command: make bootstrap build test-e2e
+      - store_artifacts:
+          path: /go/src/github.com/Azure/acs-engine/_logs
   master:
     working_directory: /go/src/github.com/Azure/acs-engine
     docker:
@@ -53,9 +55,16 @@ jobs:
           echo 'export STAGE_TIMEOUT_MIN=30' >> $BASH_ENV
           echo 'export NUM_OF_RETRIES=2' >> $BASH_ENV
           echo 'export TEST_CONFIG=test/acse-conf/acse-feature-validation.json' >> $BASH_ENV
+          echo 'export SUBSCRIPTION_ID=${SUBSCRIPTION_ID_FEATURE_VALIDATION}' >> $BASH_ENV
+          echo 'export SERVICE_PRINCIPAL_CLIENT_ID=${SERVICE_PRINCIPAL_CLIENT_ID_FEATURE_VALIDATION}' >> $BASH_ENV
+          echo 'export SERVICE_PRINCIPAL_CLIENT_SECRET=${SERVICE_PRINCIPAL_CLIENT_SECRET_FEATURE_VALIDATION}' >> $BASH_ENV
+          echo 'export CLUSTER_SERVICE_PRINCIPAL_CLIENT_ID=${CLUSTER_SERVICE_PRINCIPAL_CLIENT_ID_FEATURE_VALIDATION}' >> $BASH_ENV
+          echo 'export CLUSTER_SERVICE_PRINCIPAL_CLIENT_SECRET=${CLUSTER_SERVICE_PRINCIPAL_CLIENT_SECRET_FEATURE_VALIDATION}' >> $BASH_ENV
       - run:
           name: Feature validation tests
           command: make bootstrap build test-e2e
+      - store_artifacts:
+          path: /go/src/github.com/Azure/acs-engine/_logs
 
 workflows:
   version: 2
@@ -67,6 +76,9 @@ workflows:
       - e2e:
           requires:
             - e2e-hold
+          filters:
+            branches:
+              ignore: /master/
       - master:
           filters:
             branches:

README.md

@@ -1,5 +1,6 @@
 # Microsoft Azure Container Service Engine - Builds Docker Enabled Clusters
 [![Coverage Status](https://coveralls.io/repos/github/Azure/acs-engine/badge.svg?branch=master)](https://coveralls.io/github/Azure/acs-engine?branch=master)
+[![CircleCI](https://circleci.com/gh/Azure/acs-engine/tree/master.svg?style=svg)](https://circleci.com/gh/Azure/acs-engine/tree/master)
 
 ## Overview
 

docs/README.md

@@ -1,5 +1,4 @@
 # Microsoft Azure Container Service Engine - Builds Docker Enabled Clusters
-[![CircleCI](https://circleci.com/gh/Azure/acs-engine/tree/master.svg?style=svg)](https://circleci.com/gh/Azure/acs-engine/tree/master)
 
 ## Overview
 

test/acse-conf/acse-feature-validation.json

@@ -56,14 +56,6 @@
       "cluster_definition": "disks-storageaccount/swarmmode.json",
       "location": "centralus"
     },
-    {
-      "cluster_definition": "keyvaultcerts/swarm-windows.json",
-      "location": "westus"
-    },
-    {
-      "cluster_definition": "keyvaultcerts/swarmmode.json",
-      "location": "westus"
-    },
     {
       "cluster_definition": "kubernetesversions/kubernetes1.5.7.json",
       "location": "centralus"