github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-09-14 13:45:06 +00:00
Code Issues Projects Releases Wiki Activity

Make label and deployment name in deployment e2e test unique

Browse Source
This commit is contained in:
Janet Kuo
2015-12-16 18:47:50 -08:00
parent 1a8f96231a
commit bd1200ba66
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
test/e2e/deployment.go
View File

@@ -190,9 +190,9 @@ func testRollingUpdateDeploymentEvents(f *Framework) {
ns := f.Namespace.Name
c := f.Client
// Create nginx pods.
deploymentPodLabels := map[string]string{"name": "sample-pod"}
deploymentPodLabels := map[string]string{"name": "sample-pod-2"}
rcPodLabels := map[string]string{
"name": "sample-pod",
"name": "sample-pod-2",
"pod": "nginx",
}
rcName := "nginx-controller"
@@ -224,14 +224,14 @@ func testRollingUpdateDeploymentEvents(f *Framework) {
Expect(c.ReplicationControllers(ns).Delete(rcName)).NotTo(HaveOccurred())
}()
// Verify that the required pods have come up.
err = verifyPods(c, ns, "sample-pod", false, 1)
err = verifyPods(c, ns, "sample-pod-2", false, 1)
if err != nil {
Logf("error in waiting for pods to come up: %s", err)
Expect(err).NotTo(HaveOccurred())
}
// Create a deployment to delete nginx pods and instead bring up redis pods.
deploymentName := "redis-deployment"
deploymentName := "redis-deployment-2"
Logf("Creating deployment %s", deploymentName)
newDeployment := extensions.Deployment{
ObjectMeta: api.ObjectMeta{