diff --git a/Makefile b/Makefile index 696a073a..a32370f0 100644 --- a/Makefile +++ b/Makefile @@ -45,13 +45,10 @@ test: build-test-container test-in-container test-doc-examples centos-ci-test: install-test-requirements build-test-container test-in-container test-in-container: - @# use it like this: `make test-in-container TEST_TARGET=tests/integration/test_utils.py`k - docker run --net=host --rm -v /dev:/dev:ro -v /var/lib/docker:/var/lib/docker:ro --security-opt label=disable --cap-add SYS_ADMIN -e KUBECONFIG=/var/lib/origin/openshift.local.config/master/admin.kubeconfig -v /var/lib/origin/openshift.local.config/master/admin.kubeconfig:/var/lib/origin/openshift.local.config/master/admin.kubeconfig -ti -v /var/run/docker.sock:/var/run/docker.sock -v $(CURDIR):/src -v $(CURDIR)/pytest-container.ini:/src/pytest.ini $(TEST_IMAGE_NAME) /bin/bash -c "oc login 127.0.0.1:8443 -u system:admin --config=/var/lib/origin/openshift.local.config/master/admin.kubeconfig --insecure-skip-tls-verify && make exec-test TEST_TARGET=$(TEST_TARGET)" - -test-k8s-minikube: build-test-container + @# use it like this: `make test-in-container TEST_TARGET=tests/integration/test_utils.py` $(eval kubedir := $(shell mktemp -d /tmp/tmp.conu-kube-XXXXX)) sed -e s#"${HOME}"#/root#g ${HOME}/.kube/config > $(kubedir)/config - docker run --net=host --rm -v /dev:/dev:ro -v /var/lib/docker:/var/lib/docker:ro --security-opt label=disable --cap-add SYS_ADMIN -ti -v /var/run/docker.sock:/var/run/docker.sock -v $(CURDIR):/src -v $(CURDIR)/pytest-container.ini:/src/pytest.ini -v ${HOME}/.minikube:/root/.minikube -v $(kubedir):/root/.kube $(TEST_IMAGE_NAME) make exec-test TEST_TARGET=tests/integration/test_k8s.py + docker run --net=host --rm -v /dev:/dev:ro -v /var/lib/docker:/var/lib/docker:ro --security-opt label=disable --cap-add SYS_ADMIN -ti -v /var/run/docker.sock:/var/run/docker.sock -v $(CURDIR):/src -v $(CURDIR)/pytest-container.ini:/src/pytest.ini -v ${HOME}/.minikube:/root/.minikube -v $(kubedir):/root/.kube $(TEST_IMAGE_NAME) make exec-test test-in-vm: vagrant up --provision diff --git a/test-requirements.sh b/test-requirements.sh index f742b2a0..bc4c3d21 100755 --- a/test-requirements.sh +++ b/test-requirements.sh @@ -15,7 +15,7 @@ fi setenforce 0 systemctl start docker curl -Lo minikube https://storage.googleapis.com/minikube/releases/latest/minikube-linux-amd64 && chmod +x minikube -curl -Lo kubectl https://storage.googleapis.com/kubernetes-release/release/v1.10.0/bin/linux/amd64/kubectl && chmod +x kubectl && sudo mv kubectl /usr/local/bin/ +curl -Lo kubectl https://storage.googleapis.com/kubernetes-release/release/v1.10.0/bin/linux/amd64/kubectl && chmod +x kubectl && mv kubectl /usr/local/bin/ export MINIKUBE_WANTUPDATENOTIFICATION=false @@ -26,4 +26,4 @@ mkdir -p $HOME/.kube touch $HOME/.kube/config export KUBECONFIG=$HOME/.kube/config -./minikube start --vm-driver=none --extra-config=apiserver.admission-control="" --extra-config=kubelet.cgroup-driver=systemd +./minikube start --vm-driver=none --extra-config=apiserver.admission-control="" --extra-config=kubelet.cgroup-driver=systemd --kubernetes-version=v1.10.0 diff --git a/tests/integration/test_k8s.py b/tests/integration/test_k8s.py index f82fe84e..8f6ca1ba 100644 --- a/tests/integration/test_k8s.py +++ b/tests/integration/test_k8s.py @@ -18,8 +18,6 @@ Tests for Kubernetes backend """ -import pytest - from conu import DockerBackend from conu.backend.k8s.backend import K8sBackend from conu.backend.k8s.pod import PodPhase @@ -32,7 +30,6 @@ urllib3.disable_warnings(urllib3.exceptions.InsecureRequestWarning) -@pytest.mark.xfail def test_pod(): with K8sBackend() as k8s_backend: @@ -52,7 +49,6 @@ def test_pod(): k8s_backend.delete_namespace(namespace) -@pytest.mark.xfail def test_database_deployment(): with K8sBackend() as k8s_backend: @@ -90,7 +86,6 @@ def test_database_deployment(): k8s_backend.delete_namespace(namespace) -@pytest.mark.xfail def test_list_pods(): with K8sBackend() as k8s_backend: @@ -127,7 +122,6 @@ def test_list_services(): k8s_backend.delete_namespace(namespace) -@pytest.mark.xfail def test_list_deployments(): with K8sBackend() as k8s_backend: