From bf170e1db1b34a5f16a4ce60b973e2de2796e9c3 Mon Sep 17 00:00:00 2001 From: tanjunchen Date: Wed, 8 Apr 2020 17:46:01 +0800 Subject: [PATCH] /test/e2e/apimachinery/:fix bug --- test/e2e/apimachinery/aggregator.go | 4 +++- test/e2e/apimachinery/crd_conversion_webhook.go | 7 +++++-- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/test/e2e/apimachinery/aggregator.go b/test/e2e/apimachinery/aggregator.go index 5bfd2923a7e..a708ae1ed4e 100644 --- a/test/e2e/apimachinery/aggregator.go +++ b/test/e2e/apimachinery/aggregator.go @@ -274,10 +274,12 @@ func TestSampleAPIServer(f *framework.Framework, aggrclient *aggregatorclient.Cl } deployment, err := client.AppsV1().Deployments(namespace).Create(context.TODO(), d, metav1.CreateOptions{}) framework.ExpectNoError(err, "creating deployment %s in namespace %s", deploymentName, namespace) + err = e2edeployment.WaitForDeploymentRevisionAndImage(client, namespace, deploymentName, "1", image) framework.ExpectNoError(err, "waiting for the deployment of image %s in %s in %s to complete", image, deploymentName, namespace) + err = e2edeployment.WaitForDeploymentRevisionAndImage(client, namespace, deploymentName, "1", etcdImage) - framework.ExpectNoError(err, "waiting for the deployment of image %s in %s to complete", etcdImage, deploymentName, namespace) + framework.ExpectNoError(err, "waiting for the deployment of image %s in %s in %s to complete", etcdImage, deploymentName, namespace) // kubectl create -f service.yaml serviceLabels := map[string]string{"apiserver": "true"} diff --git a/test/e2e/apimachinery/crd_conversion_webhook.go b/test/e2e/apimachinery/crd_conversion_webhook.go index 28da7ae89c6..414b961e4c6 100644 --- a/test/e2e/apimachinery/crd_conversion_webhook.go +++ b/test/e2e/apimachinery/crd_conversion_webhook.go @@ -338,11 +338,14 @@ func deployCustomResourceWebhookAndService(f *framework.Framework, image string, } deployment, err := client.AppsV1().Deployments(namespace).Create(context.TODO(), d, metav1.CreateOptions{}) framework.ExpectNoError(err, "creating deployment %s in namespace %s", deploymentCRDName, namespace) + ginkgo.By("Wait for the deployment to be ready") + err = e2edeployment.WaitForDeploymentRevisionAndImage(client, namespace, deploymentCRDName, "1", image) - framework.ExpectNoError(err, "waiting for the deployment of image %s in %s in %s to complete", image, deploymentName, namespace) + framework.ExpectNoError(err, "waiting for the deployment of image %s in %s in %s to complete", image, deploymentCRDName, namespace) + err = e2edeployment.WaitForDeploymentComplete(client, deployment) - framework.ExpectNoError(err, "waiting for the deployment status valid", image, deploymentCRDName, namespace) + framework.ExpectNoError(err, "waiting for %s deployment status valid", deploymentCRDName) ginkgo.By("Deploying the webhook service")