From 7fbb234752352b06c7a35dead67f063d76aaaafd Mon Sep 17 00:00:00 2001 From: Ondra Machacek Date: Fri, 22 Mar 2019 09:25:10 +0100 Subject: [PATCH] Use minishift in CI --- .travis.yml | 6 +++--- ansible.cfg | 3 +++ test.sh | 17 +++++++++-------- 3 files changed, 15 insertions(+), 11 deletions(-) create mode 100644 ansible.cfg diff --git a/.travis.yml b/.travis.yml index 731bec7..ce2905c 100644 --- a/.travis.yml +++ b/.travis.yml @@ -12,14 +12,14 @@ install: - sudo pip install -r requirements-dev.txt jobs: include: - - stage: Tests - name: "Default (minikube with latest k8s)" + - name: "minishift" + env: CPLATFORM=minishift cache: - pip - directories: - cache - - "~/.minikube/cache" + - "~/.minishift/cache" before_script: ## FIXME Workaround for https://github.com/kubernetes/kubernetes/issues/61058 ### And https://github.com/LiliC/travis-minikube/blob/e0f26f7b388057f51a0e2558afd5f990e07b6c49/.travis.yml#L11 diff --git a/ansible.cfg b/ansible.cfg new file mode 100644 index 0000000..741ff82 --- /dev/null +++ b/ansible.cfg @@ -0,0 +1,3 @@ +[defaults] +library = /Users/omachace/workspace/ansible/lib/ansible/modules/cloud/ +module_utils = /Users/omachace/workspace/ansible/lib/ansible/module_utils/ diff --git a/test.sh b/test.sh index d524918..2bd3a1c 100644 --- a/test.sh +++ b/test.sh @@ -1,18 +1,19 @@ #!/bin/bash -echo "$(minikube ip) minikube" | sudo tee -a /etc/hosts +echo "$(minishift ip) minishift" | sudo tee -a /etc/hosts ## No HW virt -kubectl create configmap -n kubevirt kubevirt-config --from-literal debug.useEmulation=true -kubectl scale --replicas=0 deployment/virt-controller -n kubevirt -kubectl scale --replicas=2 deployment/virt-controller -n kubevirt +oc create configmap -n kubevirt kubevirt-config --from-literal debug.useEmulation=true --from-literal feature-gates=DataVolumes +oc scale --replicas=0 deployment/virt-controller -n kubevirt +oc scale --replicas=2 deployment/virt-controller -n kubevirt ## Prepare CDI -export CDI_VERSION=v1.5.0 -kubectl apply -f https://github.com/kubevirt/containerized-data-importer/releases/download/$CDI_VERSION/cdi-controller.yaml +export CDI_VERSION=$(curl https://github.com/kubevirt/containerized-data-importer/releases/latest | grep -o "v[0-9]\.[0-9]*\.[0-9]*") +oc create -f https://github.com/kubevirt/containerized-data-importer/releases/download/$CDI_VERSION/cdi-operator.yaml +oc create -f https://github.com/kubevirt/containerized-data-importer/releases/download/$CDI_VERSION/cdi-operator-cr.yaml get_remaining_pods() { - kubectl get pods \ + oc get pods \ --all-namespaces \ --field-selector=status.phase!=Running,status.phase!=Succeeded ; } @@ -21,7 +22,7 @@ sleep 6; while [[ "$( get_remaining_pods 2>&1 | wc -l)" -gt 2 ]]; do - kubectl get pods --all-namespaces + oc get pods --all-namespaces sleep 6; done