Skip to content

Commit

Permalink
Update base jenkins image (mesosphere#266)
Browse files Browse the repository at this point in the history
* Updating config.xml to use specified base image

* Updating test to use specified base image
  • Loading branch information
pcrews authored Sep 13, 2018
1 parent a5a8151 commit 3b571f6
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
2 changes: 1 addition & 1 deletion conf/jenkins/config.xml
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@
<jnlpArgs>-noReconnect</jnlpArgs>
<containerInfo>
<type>DOCKER</type>
<dockerImage>benclarkwood/dind:3</dockerImage>
<dockerImage>mesosphere/jenkins-dind</dockerImage>
<networking>BRIDGE</networking>
<useCustomDockerCommandShell>true</useCustomDockerCommandShell>
<customDockerCommandShell>wrapper.sh</customDockerCommandShell>
Expand Down
2 changes: 1 addition & 1 deletion tests/scale/test_load.py
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@
log = logging.getLogger(__name__)

SHARED_ROLE = "jenkins-role"
DOCKER_IMAGE="benclarkwood/dind:3"
DOCKER_IMAGE="mesosphere/jenkins-dind"
# initial timeout waiting on deployments
DEPLOY_TIMEOUT = 15 * 60 # 15 mins
JOB_RUN_TIMEOUT = 10 * 60 # 10 mins
Expand Down

0 comments on commit 3b571f6

Please sign in to comment.