Skip to content

K
k3s
Commit 0d7d8793 authored by k8s-merge-robot's avatar k8s-merge-robot
Browse files
Options

Merge pull request #17842 from mesosphere/sttts-docker-it

Auto commit by PR queue bot
parents 69bb774d e795aff0
Show whitespace changes
Inline Side-by-side
Showing with 2 additions and 2 deletions
contrib/mesos/ci/run-with-cluster.sh
View file @ 0d7d8793
...@@ -72,9 +72,9 @@ exec docker run \ ...@@ -72,9 +72,9 @@ exec docker run \
-e "MESOS_DOCKER_OVERLAY_DIR=${MESOS_DOCKER_WORK_DIR}/overlay" \ -e "MESOS_DOCKER_OVERLAY_DIR=${MESOS_DOCKER_WORK_DIR}/overlay" \
-e "KUBERNETES_CONTRIB=mesos" \ -e "KUBERNETES_CONTRIB=mesos" \
-e "KUBERNETES_PROVIDER=mesos/docker" \ -e "KUBERNETES_PROVIDER=mesos/docker" \
-e "TERM=ansi" \
-e "USER=root" \ -e "USER=root" \
-e "E2E_REPORT_DIR=${MESOS_DOCKER_WORK_DIR}/reports" \ -e "E2E_REPORT_DIR=${MESOS_DOCKER_WORK_DIR}/reports" \
-t $(tty &>/dev/null && echo "-i") \
mesosphere/kubernetes-mesos-test \ mesosphere/kubernetes-mesos-test \
-ceux "\ -ceux "\
make clean all && \ make clean all && \
......
contrib/mesos/ci/run.sh
View file @ 0d7d8793
...@@ -50,7 +50,7 @@ exec docker run \ ...@@ -50,7 +50,7 @@ exec docker run \
-v "/var/run/docker.sock:/var/run/docker.sock" \ -v "/var/run/docker.sock:/var/run/docker.sock" \
-v "${DOCKER_BIN_PATH}:/usr/bin/docker" \ -v "${DOCKER_BIN_PATH}:/usr/bin/docker" \
-e "KUBERNETES_CONTRIB=mesos" \ -e "KUBERNETES_CONTRIB=mesos" \
-e "TERM=ansi" \
-e "USER=root" \ -e "USER=root" \
-t $(tty &>/dev/null && echo "-i") \
mesosphere/kubernetes-mesos-test \ mesosphere/kubernetes-mesos-test \
-ceux "${RUN_CMD}" -ceux "${RUN_CMD}"
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment