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
Merge "Update sigul macro to support sign mode"
[releng/global-jjb.git]
/
shell
/
maven-sonar.sh
diff --git
a/shell/maven-sonar.sh
b/shell/maven-sonar.sh
index
ef9bea2
..
ae280b2
100644
(file)
--- a/
shell/maven-sonar.sh
+++ b/
shell/maven-sonar.sh
@@
-1,4
+1,4
@@
-#!/bin/bash
+#!/bin/bash
-l
# SPDX-License-Identifier: EPL-1.0
##############################################################################
# Copyright (c) 2017 The Linux Foundation and others.
# SPDX-License-Identifier: EPL-1.0
##############################################################################
# Copyright (c) 2017 The Linux Foundation and others.
@@
-14,25
+14,31
@@
# 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
set +u
export MAVEN_OPTS
+declare -a params
+params+=("--global-settings $GLOBAL_SETTINGS_FILE")
+params+=("--settings $SETTINGS_FILE")
+
# Disable SC2086 because we want to allow word splitting for $MAVEN_* parameters.
# shellcheck disable=SC2086
# Disable SC2086 because we want to allow word splitting for $MAVEN_* parameters.
# shellcheck disable=SC2086
-$MVN clean
deploy
\
+$MVN clean
install
\
-e -Dsonar \
-e -Dsonar \
- --global-settings "$GLOBAL_SETTINGS_FILE" \
- --settings "$SETTINGS_FILE" \
- -DaltDeploymentRepository=staging::default::file:"$WORKSPACE"/m2repo \
+ ${params[*]} \
$MAVEN_OPTIONS $MAVEN_PARAMS
$MAVEN_OPTIONS $MAVEN_PARAMS
+if [ "$SONAR_HOST_URL" = "https://sonarcloud.io" ]; then
+ params+=("-Dsonar.projectKey=$PROJECT_KEY")
+ params+=("-Dsonar.organization=$PROJECT_ORGANIZATION")
+ params+=("-Dsonar.login=$API_TOKEN")
+fi
+
# Disable SC2086 because we want to allow word splitting for $MAVEN_* parameters.
# shellcheck disable=SC2086
# Disable SC2086 because we want to allow word splitting for $MAVEN_* parameters.
# shellcheck disable=SC2086
-
$MVN
$SONAR_MAVEN_GOAL \
+
"$MVN"
$SONAR_MAVEN_GOAL \
-e -Dsonar -Dsonar.host.url="$SONAR_HOST_URL" \
-e -Dsonar -Dsonar.host.url="$SONAR_HOST_URL" \
- --global-settings "$GLOBAL_SETTINGS_FILE" \
- --settings "$SETTINGS_FILE" \
- -DaltDeploymentRepository=staging::default::file:"$WORKSPACE"/m2repo \
+ ${params[*]} \
$MAVEN_OPTIONS $MAVEN_PARAMS
$MAVEN_OPTIONS $MAVEN_PARAMS