public_git
/
postgres-operator
mirror of https://github.com/zalando/postgres-operator.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

fetch image name from docker

This commit is contained in:
Sergey Dudoladov 2019-05-02 15:06:59 +02:00
parent 1ced414985
commit 8352abe428
2 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
e2e/tests/test_smoke.py
View File

@ -2,8 +2,8 @@ import unittest
import time import time
import timeout_decorator import timeout_decorator
import subprocess import subprocess
import git
import warnings import warnings
import docker
from kubernetes import client, config, utils from kubernetes import client, config, utils
@ -39,9 +39,10 @@ class SmokeTestCase(unittest.TestCase):
for filename in ["configmap.yaml", "postgres-operator.yaml"]: for filename in ["configmap.yaml", "postgres-operator.yaml"]:
utils.create_from_yaml(k8s_api.k8s_client, "manifests/" + filename) utils.create_from_yaml(k8s_api.k8s_client, "manifests/" + filename)
# submit the most recent operator image built locally; see VERSION in Makefile # submit the most recent operator image built locally
# TODO properly fetch the recent image tag from the local Docker # HACK assumes "images lists" returns the most recent image at index 0
version = git.Repo(".").git.describe("--tags", "--always", "--dirty") docker_client = docker.from_env()
image = docker_client.images.list(name="registry.opensource.zalan.do/acid/postgres-operator")[0].tags[0]
body = { body = {
"spec": { "spec": {
"template": { "template": {
@ -49,7 +50,7 @@ class SmokeTestCase(unittest.TestCase):
"containers": [ "containers": [
{ {
"name": "postgres-operator", "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) Utils.wait_for_pg_to_scale(k8s, 3, self.RETRY_TIMEOUT_SEC)
self.assertEqual(3, Utils.count_pods_with_label(k8s, labels)) 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) Utils.wait_for_pg_to_scale(k8s, 2, self.RETRY_TIMEOUT_SEC)
self.assertEqual(2, Utils.count_pods_with_label(k8s, labels)) 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 pods = k8s_api.core_v1.list_namespaced_pod('default', label_selector=pod_labels).items
if pods: if pods:
pod_phase = pods[0].status.phase 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) time.sleep(retry_timeout_sec)
@staticmethod @staticmethod

2
requirements.txt
View File

@ -1,4 +1,4 @@
kubernetes kubernetes
flake8 flake8
gitpython
timeout_decorator timeout_decorator
docker