Skip to content

Commit

Permalink
Merge branch 'jgfouca/scripts-acme/fix_jenkins_wrapper' into master (PR
Browse files Browse the repository at this point in the history
#512)

jenkins_script: Turn off quit-on-failure mode

jenkins_generic_job returns non-zero if there were failing tests.
This was causing the jenkins bash wrapper to terminate before it
could restore the state of the submodule URLs.

[BFB]

* jgfouca/scripts-acme/fix_jenkins_wrapper:
  jenkins_script: Turn off quit-on-failure mode
  Merge of mt5555/homme/vcord branch into next
  • Loading branch information
jgfouca committed Dec 4, 2015
2 parents 20449e8 + 843b83a commit a1c192d
Showing 1 changed file with 1 addition and 3 deletions.
4 changes: 1 addition & 3 deletions cime/scripts-acme/jenkins_script
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#!/bin/bash -e
#!/bin/bash

#
# Wrapper around jenkins_generic_job that will allow output
Expand All @@ -7,8 +7,6 @@
# script that should be used from Jenkins.
#

set -o pipefail

SCRIPT_DIR=$( cd "$( dirname "$0" )" && pwd )
DATE_STAMP=$(date "+%Y-%m-%d_%H%M%S")

Expand Down

0 comments on commit a1c192d

Please sign in to comment.