Fix the env

linkernetworks · Jul 16, 2018 · aeec6db · aeec6db
1 parent 11fc373
commit aeec6db
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -30,10 +30,10 @@ before_script:
     # Make /sys mounted as rshared to support cadvisor
   - sudo mount --make-rshared /sys
     # # 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/
+  - 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
+  - sudo minikube start --vm-driver=none --bootstrapper=localkube --kubernetes-version=v1.9.0
     # # Fix the kubectl context, as it's often stale.
   - minikube update-context
     # # Wait for Kubernetes to be up and ready.

diff --git a/Jenkinsfile b/Jenkinsfile
@@ -62,7 +62,7 @@ pipeline {
         }
         stage('Test') {
             steps {
-                withEnv(["GOPATH+AA=${env.WORKSPACE}", "TEST_PROMETHEUS=1"]) {
+                withEnv(["GOPATH+AA=${env.WORKSPACE}", "TEST_PROMETHEUS=1", "CHANGE_MINIKUBE_NONE_USER=true"]) {
                     dir ("src/github.com/linkernetworks/vortex") {
                         sh "make src.test-coverage 2>&1 | tee >(go-junit-report > report.xml)"
                         junit "report.xml"

diff --git a/jenkins/entry.sh b/jenkins/entry.sh
@@ -19,7 +19,7 @@ sudo mount --make-rshared /sys
 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/latest/minikube-linux-amd64 && chmod +x minikube && sudo mv minikube /usr/local/bin/
-env CHANGE_MINIKUBE_NONE_USER=true sudo minikube start --vm-driver=none --bootstrapper=localkube --kubernetes-version=v1.10.0
+sudo env CHANGE_MINIKUBE_NONE_USER=true minikube start --vm-driver=none --bootstrapper=localkube --kubernetes-version=v1.10.0
 # Fix the kubectl context, as it's often stale.
 minikube update-context
 # # Wait for Kubernetes to be up and ready.