From 8352abe42808dc7f9c59115ef4c3133b3c4ece92 Mon Sep 17 00:00:00 2001
From: Sergey Dudoladov <sergey.dudoladov@zalando.de>
Date: Thu, 2 May 2019 15:06:59 +0200
Subject: [PATCH] fetch image name from docker

---
 e2e/tests/test_smoke.py | 15 ++++++++-------
 requirements.txt        |  2 +-
 2 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/e2e/tests/test_smoke.py b/e2e/tests/test_smoke.py
index 98506a9ee..8c2843390 100755
--- a/e2e/tests/test_smoke.py
+++ b/e2e/tests/test_smoke.py
@@ -2,8 +2,8 @@ import unittest
 import time
 import timeout_decorator
 import subprocess
-import git
 import warnings
+import docker
 
 from kubernetes import client, config, utils
 
@@ -39,9 +39,10 @@ class SmokeTestCase(unittest.TestCase):
         for filename in ["configmap.yaml", "postgres-operator.yaml"]:
             utils.create_from_yaml(k8s_api.k8s_client, "manifests/" + filename)
 
-        # submit the most recent operator image built locally; see VERSION in Makefile
-        # TODO properly fetch the recent image tag from the local Docker
-        version = git.Repo(".").git.describe("--tags", "--always", "--dirty")
+        # submit the most recent operator image built locally
+        # HACK assumes "images lists" returns the most recent image at index 0
+        docker_client = docker.from_env()
+        image = docker_client.images.list(name="registry.opensource.zalan.do/acid/postgres-operator")[0].tags[0]
         body = {
             "spec": {
                 "template": {
@@ -49,7 +50,7 @@ class SmokeTestCase(unittest.TestCase):
                         "containers": [
                             {
                               "name": "postgres-operator",
-                              "image": "registry.opensource.zalan.do/acid/postgres-operator:" + version
+                              "image": image
                             }
                         ]
                     }
@@ -88,7 +89,7 @@ class SmokeTestCase(unittest.TestCase):
         Utils.wait_for_pg_to_scale(k8s, 3, self.RETRY_TIMEOUT_SEC)
         self.assertEqual(3, Utils.count_pods_with_label(k8s, labels))
 
-        # NB `kind` pods may stuck in the Terminating state for a few minutes
+        # TODO `kind` pods may stuck in the Terminating state for a few minutes; reproduce/file a bug report
         Utils.wait_for_pg_to_scale(k8s, 2, self.RETRY_TIMEOUT_SEC)
         self.assertEqual(2, Utils.count_pods_with_label(k8s, labels))
 
@@ -116,7 +117,7 @@ class Utils:
             pods = k8s_api.core_v1.list_namespaced_pod('default', label_selector=pod_labels).items
             if pods:
                 pod_phase = pods[0].status.phase
-            print(f"Wait for the pod '{pod_labels}' to start. Current pod phase: " + pod_phase)
+            print(f"Wait for the pod '{pod_labels}' to start. Current pod phase: {pod_phase}")
             time.sleep(retry_timeout_sec)
 
     @staticmethod
diff --git a/requirements.txt b/requirements.txt
index 9e9957e7a..40fb9efa1 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,4 +1,4 @@
 kubernetes
 flake8
-gitpython
 timeout_decorator
+docker