From 10d7376091a90211a93e0dd0301959f933133c41 Mon Sep 17 00:00:00 2001
From: ryandawsonuk <rd@seldon.io>
Date: Mon, 12 Aug 2019 19:15:16 +0100
Subject: [PATCH] rebase against master

---
 notebooks/server_examples.ipynb             | 7 ++++---
 testing/scripts/test_prepackaged_servers.py | 6 +++---
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/notebooks/server_examples.ipynb b/notebooks/server_examples.ipynb
index 3f0a0a3112..efffb9bb80 100644
--- a/notebooks/server_examples.ipynb
+++ b/notebooks/server_examples.ipynb
@@ -723,19 +723,20 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 5,
+   "execution_count": 16,
    "metadata": {},
    "outputs": [
     {
      "name": "stdout",
      "output_type": "stream",
      "text": [
-      "deployment \"wines-default-057e362\" successfully rolled out\r\n"
+      "Waiting for deployment \"mnist-default-808f52c\" rollout to finish: 0 of 1 updated replicas are available...\n",
+      "deployment \"mnist-default-808f52c\" successfully rolled out\n"
      ]
     }
    ],
    "source": [
-    "!kubectl rollout status deploy/mnist-default-d53c803"
+    "!kubectl rollout status deploy/mnist-default-808f52c"
    ]
   },
   {
diff --git a/testing/scripts/test_prepackaged_servers.py b/testing/scripts/test_prepackaged_servers.py
index 10d1f0b895..67b9d22a70 100644
--- a/testing/scripts/test_prepackaged_servers.py
+++ b/testing/scripts/test_prepackaged_servers.py
@@ -32,7 +32,7 @@ class TestPrepackSkLearn(object):
     def test_sklearn(self):
         run("kubectl delete sdep --all", shell=True)
         run("kubectl apply -f ../../servers/sklearnserver/samples/iris.yaml", shell=True, check=True)
-        wait_for_rollout("iris-default")
+        wait_for_rollout("iris-default-8bb3ef6")
         wait_for_status("sklearn")
         print("Initial request")
         sc = SeldonClient(deployment_name="sklearn",namespace="seldon")
@@ -45,7 +45,7 @@ def test_sklearn(self):
     def test_tfserving(self):
         run("kubectl delete sdep --all", shell=True)
         run("kubectl apply -f ../../servers/tfserving/samples/mnist_rest.yaml", shell=True, check=True)
-        wait_for_rollout("mnist-default")
+        wait_for_rollout("mnist-default-808f52c")
         wait_for_status("tfserving")
         print("Initial request")
         sc = SeldonClient(deployment_name="tfserving",namespace="seldon")
@@ -58,7 +58,7 @@ def test_tfserving(self):
     def test_xgboost(self):
         run("kubectl delete sdep --all", shell=True)
         run("kubectl apply -f ../../servers/xgboostserver/samples/iris.yaml", shell=True, check=True)
-        wait_for_rollout("iris-default")
+        wait_for_rollout("iris-default-5299e79")
         wait_for_status("xgboost")
         print("Initial request")
         sc = SeldonClient(deployment_name="xgboost",namespace="seldon")