Merge pull request #788 from joelanford/ansible-e2e-ownerref

* test/ansible-operator/Dockerfile: fix e2e ownerref issue
* hack/tests/e2e-ansible.sh: adding test to ensure garbage-collection succeeds

Author: joelanford

hack/tests/e2e-ansible.sh

@@ -73,7 +73,18 @@ then
 fi
 
 kubectl delete -f ${DIR2}/deploy/crds/ansible_v1alpha1_memcached_cr.yaml --wait=true
-kubectl logs deployment/memcached-operator | grep "this is a finalizer"
+if ! kubectl logs deployment/memcached-operator | grep "this is a finalizer";
+then
+    kubectl logs deployment/memcached-operator
+    exit 1
+fi
+
+# The deployment should get garbage collected, so we expect to fail getting the deployment.
+if ! timeout 20s bash -c -- "while kubectl get deployment ${memcached_deployment}; do sleep 1; done";
+then
+    kubectl logs deployment/memcached-operator
+    exit 1
+fi
 
 popd
 popd

test/ansible-operator/Dockerfile

@@ -1,10 +1,13 @@
 FROM ansible/ansible-runner
 
+RUN yum remove -y ansible python-idna
+RUN pip uninstall ansible-runner -y
+
 RUN pip install --upgrade setuptools
-RUN pip install urllib3==1.23
-RUN pip install openshift ansible-runner-http
+RUN pip install ansible ansible-runner openshift kubernetes ansible-runner-http
 
-RUN echo "localhost ansible_connection=local" > /etc/ansible/hosts \
+RUN mkdir -p /etc/ansible \
+    && echo "localhost ansible_connection=local" > /etc/ansible/hosts \
     && echo '[defaults]' > /etc/ansible/ansible.cfg \
     && echo 'roles_path = /opt/ansible/roles' >> /etc/ansible/ansible.cfg \
     && echo 'library = /usr/share/ansible/openshift' >> /etc/ansible/ansible.cfg