Merge pull request #11261 from mfojtik/deployment-flakes

Merged by openshift-bot
openshift · Oct 10, 2016 · 606716e · 606716e
2 parents e76e0e8 + 57833ac
commit 606716e
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 6 deletions.
diff --git a/test/extended/testdata/deployments/deployment-simple.yaml b/test/extended/testdata/deployments/deployment-simple.yaml
@@ -23,13 +23,15 @@ spec:
         name: deployment-simple
     spec:
       containers:
-      - image: "docker.io/openshift/deployment-example:v1"
+      - image: "docker.io/centos:centos7"
         imagePullPolicy: IfNotPresent
+        command:
+          - /bin/sleep
+          - infinity
         name: myapp
         readinessProbe:
-          httpGet:
-            path: /
-            port: 8080
-            scheme: HTTP
+          exec:
+            command:
+            - uptime
   triggers:
   - type: ConfigChange
diff --git a/test/extended/testdata/deployments/failing-pre-hook.yaml b/test/extended/testdata/deployments/failing-pre-hook.yaml
@@ -21,7 +21,10 @@ spec:
         name: hook
     spec:
       containers:
-      - image: "docker.io/openshift/deployment-example:v1"
+      - image: "docker.io/centos:centos7"
+        command:
+          - /bin/sleep
+          - infinity
         name: myapp
   triggers:
   - type: ConfigChange