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

Small changes. Also use entrypoint vs cmd.

This commit is contained in:
Jan Mußler 2020-09-08 23:02:43 +02:00
parent ac32e3d522
commit 1915054e2a
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
e2e/Dockerfile
View File

@ -19,4 +19,4 @@ RUN apt-get update \
&& apt-get clean \ && apt-get clean \
&& rm -rf /var/lib/apt/lists/* && rm -rf /var/lib/apt/lists/*
CMD ["python3", "-m", "unittest", "discover", "--start-directory", ".", "-v"] ENTRYPOINT ["python3", "-m", "unittest", "discover", "--start-directory", ".", "-v"]

2
e2e/run.sh
View File

@ -55,7 +55,7 @@ function run_tests(){
# tests modify files in ./manifests, so we mount a copy of this directory done by the e2e Makefile # tests modify files in ./manifests, so we mount a copy of this directory done by the e2e Makefile
docker run --rm --network=host \ docker run -it --rm --network=host \
--mount type=bind,source="$(readlink -f ${kubeconfig_path})",target=/root/.kube/config \ --mount type=bind,source="$(readlink -f ${kubeconfig_path})",target=/root/.kube/config \
--mount type=bind,source="$(readlink -f manifests)",target=/manifests \ --mount type=bind,source="$(readlink -f manifests)",target=/manifests \
--mount type=bind,source="$(readlink -f tests)",target=/tests \ --mount type=bind,source="$(readlink -f tests)",target=/tests \

2
e2e/tests/test_e2e.py
View File

@ -10,7 +10,6 @@ import yaml
from datetime import datetime from datetime import datetime
from kubernetes import client, config from kubernetes import client, config
def to_selector(labels): def to_selector(labels):
return ",".join(["=".join(l) for l in labels.items()]) return ",".join(["=".join(l) for l in labels.items()])
@ -34,6 +33,7 @@ class EndToEndTestCase(unittest.TestCase):
In the case of test failure the cluster will stay to enable manual examination; In the case of test failure the cluster will stay to enable manual examination;
next invocation of "make test" will re-create it. next invocation of "make test" will re-create it.
''' '''
print("Test Setup being executed")
# set a single K8s wrapper for all tests # set a single K8s wrapper for all tests
k8s = cls.k8s = K8s() k8s = cls.k8s = K8s()