From 993071dd6463eaf54caef5a0e4788bc9f266c34c Mon Sep 17 00:00:00 2001 From: Justin Santa Barbara Date: Thu, 29 Jan 2015 09:52:18 -0500 Subject: [PATCH] Add aws to some e2e tests --- test/e2e/kubelet_sends_events.go | 2 +- test/e2e/private.go | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/test/e2e/kubelet_sends_events.go b/test/e2e/kubelet_sends_events.go index b0e8b4b98ca..2b9da6b428c 100644 --- a/test/e2e/kubelet_sends_events.go +++ b/test/e2e/kubelet_sends_events.go @@ -32,7 +32,7 @@ import ( // TestKubeletSendsEvent checks that kubelets and scheduler send events about pods scheduling and running. func TestKubeletSendsEvent(c *client.Client) bool { provider := testContext.provider - if len(provider) > 0 && provider != "gce" && provider != "gke" { + if len(provider) > 0 && provider != "gce" && provider != "gke" && provider != "aws" { glog.Infof("skipping TestKubeletSendsEvent on cloud provider %s", provider) return true } diff --git a/test/e2e/private.go b/test/e2e/private.go index baa721e507d..94076f69beb 100644 --- a/test/e2e/private.go +++ b/test/e2e/private.go @@ -29,8 +29,8 @@ import ( // with the TestBasicImage test. This test is only supported // for the providers GCE and GKE. func TestPrivate(c *client.Client) bool { - if testContext.provider != "gce" && testContext.provider != "gke" { - glog.Infof("Skipping test private which is only supported for providers gce and gke (not %s)", testContext.provider) + if testContext.provider != "gce" && testContext.provider != "gke" && testContext.provider != "aws" { + glog.Infof("Skipping test private which is only supported for providers gce, gke and aws (not %s)", testContext.provider) return true } glog.Info("Calling out to TestBasic")