Code Review
/
releng
/
global-jjb.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Increase maven-jobs default timeout to 60 mins
[releng/global-jjb.git]
/
shell
/
maven-sonar.sh
diff --git
a/shell/maven-sonar.sh
b/shell/maven-sonar.sh
index
ef9bea2
..
e0c0477
100644
(file)
--- a/
shell/maven-sonar.sh
+++ b/
shell/maven-sonar.sh
@@
-14,18
+14,17
@@
# DO NOT enable -u because $MAVEN_PARAMS and $MAVEN_OPTIONS could be unbound.
# Ensure we fail the job if any steps fail.
# DO NOT enable -u because $MAVEN_PARAMS and $MAVEN_OPTIONS could be unbound.
# Ensure we fail the job if any steps fail.
-set -e -o pipefail
+set -
x
e -o pipefail
set +u
export MAVEN_OPTS
# Disable SC2086 because we want to allow word splitting for $MAVEN_* parameters.
# shellcheck disable=SC2086
set +u
export MAVEN_OPTS
# Disable SC2086 because we want to allow word splitting for $MAVEN_* parameters.
# shellcheck disable=SC2086
-$MVN clean
deploy
\
+$MVN clean
install
\
-e -Dsonar \
--global-settings "$GLOBAL_SETTINGS_FILE" \
--settings "$SETTINGS_FILE" \
-e -Dsonar \
--global-settings "$GLOBAL_SETTINGS_FILE" \
--settings "$SETTINGS_FILE" \
- -DaltDeploymentRepository=staging::default::file:"$WORKSPACE"/m2repo \
$MAVEN_OPTIONS $MAVEN_PARAMS
# Disable SC2086 because we want to allow word splitting for $MAVEN_* parameters.
$MAVEN_OPTIONS $MAVEN_PARAMS
# Disable SC2086 because we want to allow word splitting for $MAVEN_* parameters.
@@
-34,5
+33,4
@@
$MVN $SONAR_MAVEN_GOAL \
-e -Dsonar -Dsonar.host.url="$SONAR_HOST_URL" \
--global-settings "$GLOBAL_SETTINGS_FILE" \
--settings "$SETTINGS_FILE" \
-e -Dsonar -Dsonar.host.url="$SONAR_HOST_URL" \
--global-settings "$GLOBAL_SETTINGS_FILE" \
--settings "$SETTINGS_FILE" \
- -DaltDeploymentRepository=staging::default::file:"$WORKSPACE"/m2repo \
$MAVEN_OPTIONS $MAVEN_PARAMS
$MAVEN_OPTIONS $MAVEN_PARAMS