mirror of
				https://github.com/optim-enterprises-bv/kubernetes.git
				synced 2025-11-03 19:58:17 +00:00 
			
		
		
		
	Up unit/integration test on Jenkins to go 1.6.
This commit is contained in:
		@@ -42,5 +42,5 @@ docker run --rm=true \
 | 
				
			|||||||
  -e "KUBE_FORCE_VERIFY_CHECKS=${KUBE_FORCE_VERIFY_CHECKS:-}" \
 | 
					  -e "KUBE_FORCE_VERIFY_CHECKS=${KUBE_FORCE_VERIFY_CHECKS:-}" \
 | 
				
			||||||
  -e "KUBE_VERIFY_GIT_BRANCH=${KUBE_VERIFY_GIT_BRANCH:-}" \
 | 
					  -e "KUBE_VERIFY_GIT_BRANCH=${KUBE_VERIFY_GIT_BRANCH:-}" \
 | 
				
			||||||
  -e "REPO_DIR=${REPO_DIR}" \
 | 
					  -e "REPO_DIR=${REPO_DIR}" \
 | 
				
			||||||
  -i gcr.io/google_containers/kubekins-test:0.8 \
 | 
					  -i gcr.io/google_containers/kubekins-test:0.9 \
 | 
				
			||||||
  bash -c "cd kubernetes && ./hack/jenkins/test-dockerized.sh"
 | 
					  bash -c "cd kubernetes && ./hack/jenkins/test-dockerized.sh"
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -15,7 +15,7 @@
 | 
				
			|||||||
# This file creates a build environment for building and running kubernetes
 | 
					# This file creates a build environment for building and running kubernetes
 | 
				
			||||||
# unit and integration tests
 | 
					# unit and integration tests
 | 
				
			||||||
 | 
					
 | 
				
			||||||
FROM golang:1.5.3
 | 
					FROM golang:1.6
 | 
				
			||||||
MAINTAINER  Jeff Lowdermilk <jeffml@google.com>
 | 
					MAINTAINER  Jeff Lowdermilk <jeffml@google.com>
 | 
				
			||||||
 | 
					
 | 
				
			||||||
ENV WORKSPACE               /workspace
 | 
					ENV WORKSPACE               /workspace
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -14,7 +14,7 @@
 | 
				
			|||||||
 | 
					
 | 
				
			||||||
all: push
 | 
					all: push
 | 
				
			||||||
 | 
					
 | 
				
			||||||
TAG = 0.8
 | 
					TAG = 0.9
 | 
				
			||||||
 | 
					
 | 
				
			||||||
container:
 | 
					container:
 | 
				
			||||||
	docker build -t gcr.io/google_containers/kubekins-test .
 | 
						docker build -t gcr.io/google_containers/kubekins-test .
 | 
				
			||||||
 
 | 
				
			|||||||
		Reference in New Issue
	
	Block a user