diff --git a/.travis.yml b/.travis.yml index ed878b38019..50d0a736f80 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,4 +1,4 @@ -dist: trusty +dist: xenial sudo: required language: go @@ -172,16 +172,15 @@ jobs: # Run devfile integration test on Kubernetes cluster - <<: *base-test stage: test - name: "devfile catalog, watch command integration tests on kubernetes cluster" + name: "devfile catalog and watch command integration tests on kubernetes cluster" before_script: # Download kubectl, a cli tool for accessing Kubernetes cluster - - curl -sLo kubectl https://storage.googleapis.com/kubernetes-release/release/v1.7.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.16.0/bin/linux/amd64/kubectl && chmod +x kubectl && sudo mv kubectl /usr/local/bin/ # Download minikube and set up Kubernetes single node cluster - - curl -sLo minikube https://storage.googleapis.com/minikube/releases/v0.25.2/minikube-linux-amd64 && chmod +x minikube && sudo mv minikube /usr/local/bin/ + - curl -Lo minikube https://storage.googleapis.com/minikube/releases/v1.4.0/minikube-linux-amd64 && chmod +x minikube && sudo mv minikube /usr/local/bin/ - mkdir -p $HOME/.kube $HOME/.minikube - touch $KUBECONFIG - - sudo minikube start --vm-driver=none --kubernetes-version=v1.7.0 - - minikube update-context + - sudo minikube start --vm-driver=none --kubernetes-version=v1.16.0 - "sudo chown -R travis: /home/travis/.minikube/" script: - kubectl cluster-info diff --git a/scripts/oc-cluster.sh b/scripts/oc-cluster.sh index 55638f4a5af..88b8a24aca9 100755 --- a/scripts/oc-cluster.sh +++ b/scripts/oc-cluster.sh @@ -8,8 +8,8 @@ OPENSHIFT_CLIENT_BINARY_URL=${OPENSHIFT_CLIENT_BINARY_URL:-'https://github.com/o sudo service docker stop -sudo sed -i -e 's/sock/sock --insecure-registry 172.30.0.0\/16/' /etc/default/docker -sudo cat /etc/default/docker +sudo sed -i -e 's/"mtu": 1460/"mtu": 1460, "insecure-registries": ["172.30.0.0\/16"]/' /etc/docker/daemon.json +sudo cat /etc/docker/daemon.json sudo service docker start sudo service docker status