Merge branch 'master' into add-description-to-platform

.travis.yml

@@ -21,32 +21,32 @@ matrix:
         JOB_NAME=unittest
         TOXENV=py36
     # run real rally task
-    #- python: 3.6
-    #  sudo: required
-    #  env:
-    #    JOB_NAME="Rally Task"
-    #    TOXENV=run-task
-    #    XRALLY_TASK="./xrally_tasks/all-in-one.yaml"
-    #    CHANGE_MINIKUBE_NONE_USER=true  # This moves Kubernetes specific config files.
+    - python: 3.6
+      sudo: required
+      env:
+        JOB_NAME="Rally Task"
+        TOXENV=run-task
+        XRALLY_TASK="./xrally_tasks/all-in-one.yaml"
+        CHANGE_MINIKUBE_NONE_USER=true  # This moves Kubernetes specific config files.
       # the idea is taken from https://github.com/LiliC/travis-minikube
-    #  before_script:
-    #    # Install required packages
-    #    - sudo apt-get update
-    #    - sudo apt install systemd
-    #    # Download kubectl, which is a requirement for using minikube.
-    #    - curl -Lo kubectl https://storage.googleapis.com/kubernetes-release/release/v1.9.0/bin/linux/amd64/kubectl && chmod +x kubectl && sudo mv kubectl /usr/local/bin/
-    #    # Download minikube.
-    #    - curl -Lo minikube https://storage.googleapis.com/minikube/releases/latest/minikube-linux-amd64 && chmod +x minikube && sudo mv minikube /usr/local/bin/
-    #    - sudo minikube start --vm-driver=none --bootstrapper=localkube --kubernetes-version=v1.10.0
+      before_script:
+        # Install required packages
+        - sudo apt-get update
+        - sudo apt install systemd
+        # Download kubectl, which is a requirement for using 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/
+        # Download minikube.
+        - curl -Lo minikube https://storage.googleapis.com/minikube/releases/v0.28.0/minikube-linux-amd64 && chmod +x minikube && sudo mv minikube /usr/local/bin/
+        - sudo minikube start --vm-driver=none --bootstrapper=localkube --kubernetes-version=v1.10.0
         # Fix the kubectl context, as it's often stale.
-    #    - minikube update-context
+        - minikube update-context
         # Wait for Kubernetes to be up and ready.
-    #    - JSONPATH='{range .items[*]}{@.metadata.name}:{range @.status.conditions[*]}{@.type}={@.status};{end}{end}'; until kubectl get nodes -o jsonpath="$JSONPATH" 2>&1 | grep -q "Ready=True"; do sleep 1; done
+        - JSONPATH='{range .items[*]}{@.metadata.name}:{range @.status.conditions[*]}{@.type}={@.status};{end}{end}'; until kubectl get nodes -o jsonpath="$JSONPATH" 2>&1 | grep -q "Ready=True"; do sleep 1; done
         # Change MountFlags configuration due to kubernetes docs recommendation
-    #    - sudo sed -i '/MountFlags=/d' /lib/systemd/system/docker.service
-    #    - sudo echo MountFlags=shared >> sudo /lib/systemd/system/docker.service
-    #    - sudo systemctl daemon-reload
-    #    - sudo service docker restart
+        - sudo sed -i '/MountFlags=/d' /lib/systemd/system/docker.service
+        - sudo echo MountFlags=shared >> sudo /lib/systemd/system/docker.service
+        - sudo systemctl daemon-reload
+        - sudo service docker restart
 
 script:
   - tox