Skip to content

Commit

Permalink
Merge pull request kubernetes#17842 from mesosphere/sttts-docker-it
Browse files Browse the repository at this point in the history 
Auto commit by PR queue bot
  • Loading branch information
k8s-merge-robot authored and Sergiusz Urbaniak committed Dec 10, 2015
1 parent 32767ba commit 80034c1
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
2 changes: 1 addition & 1 deletion contrib/mesos/ci/run-with-cluster.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -72,9 +72,9 @@ exec docker run \
-e "MESOS_DOCKER_OVERLAY_DIR=${MESOS_DOCKER_WORK_DIR}/overlay" \
-e "KUBERNETES_CONTRIB=mesos" \
-e "KUBERNETES_PROVIDER=mesos/docker" \
-e "TERM=ansi" \
-e "USER=root" \
-e "E2E_REPORT_DIR=${MESOS_DOCKER_WORK_DIR}/reports" \
-t $(tty &>/dev/null && echo "-i") \
mesosphere/kubernetes-mesos-test \
-ceux "\
make clean all && \
Expand Down
2 changes: 1 addition & 1 deletion contrib/mesos/ci/run.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ exec docker run \
-v "/var/run/docker.sock:/var/run/docker.sock" \
-v "${DOCKER_BIN_PATH}:/usr/bin/docker" \
-e "KUBERNETES_CONTRIB=mesos" \
-e "TERM=ansi" \
-e "USER=root" \
-t $(tty &>/dev/null && echo "-i") \
mesosphere/kubernetes-mesos-test \
-ceux "${RUN_CMD}"

0 comments on commit 80034c1

Please sign in to comment.