Skip to content

Commit

Permalink
Merge the tip of origin/release/proposed/2019.2.0 into origin/release…
Browse files Browse the repository at this point in the history
…/2019.2.0

d7f866e Increase wait_timeout for Jenkins master

Change-Id: Ic1e0631c6064424f511444f2e655b2e3953c6de8
  • Loading branch information
MCP Jenkins committed May 5, 2022
2 parents 1ee9327 + d7f866e commit 4ccd44a
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion src/com/mirantis/mk/Orchestrate.groovy
Original file line number Diff line number Diff line change
Expand Up @@ -750,7 +750,7 @@ def installCicd(master, extra_tgt = '') {
salt.enforceState([saltId: master, target: "I@docker:swarm:role:master and I@jenkins:client ${dockerClientExclude} ${extra_tgt}", state: 'docker.client', retries: 2])

// API timeout in minutes
def wait_timeout = 10
def wait_timeout = 30

// Gerrit
def gerrit_master_url = salt.getPillar(master, gerrit_compound, '_param:gerrit_master_url')
Expand Down

0 comments on commit 4ccd44a

Please sign in to comment.