-
Notifications
You must be signed in to change notification settings - Fork 48
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'master' into undx/TCOMP-2339_remove_static_modifier
- Loading branch information
Showing
98 changed files
with
712 additions
and
241 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,42 @@ | ||
| #!/usr/bin/env bash | ||
| # | ||
| # Copyright (C) 2006-2023 Talend Inc. - www.talend.com | ||
| # | ||
| # Licensed under the Apache License, Version 2.0 (the "License"); | ||
| # you may not use this file except in compliance with the License. | ||
| # You may obtain a copy of the License at | ||
| # | ||
| # http://www.apache.org/licenses/LICENSE-2.0 | ||
| # | ||
| # Unless required by applicable law or agreed to in writing, software | ||
| # distributed under the License is distributed on an "AS IS" BASIS, | ||
| # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| # See the License for the specific language governing permissions and | ||
| # limitations under the License. | ||
| # | ||
|
|
||
| set -xe | ||
|
|
||
| # Execute sonar analysis | ||
| # $1: Sonar analyzed branch | ||
| # $@: the extra parameters to be used in the maven commands | ||
| main() ( | ||
| branch="${1?Missing branch name}"; shift | ||
| extraBuildParams=("$@") | ||
|
|
||
| declare -a LIST_FILE_ARRAY=( $(find $(pwd) -type f -name 'jacoco.xml') ) | ||
| LIST_FILE=$(IFS=, ; echo "${LIST_FILE_ARRAY[*]}") | ||
|
|
||
| # Why sonar plugin is not declared in pom.xml: https://blog.sonarsource.com/we-had-a-dream-mvn-sonarsonar | ||
| # TODO https://jira.talendforge.org/browse/TDI-48980 (CI: Reactivate Sonar cache) | ||
| mvn sonar:sonar \ | ||
| --define 'sonar.host.url=https://sonar-eks.datapwn.com' \ | ||
| --define "sonar.login=${SONAR_LOGIN}" \ | ||
| --define "sonar.password=${SONAR_PASSWORD}" \ | ||
| --define "sonar.branch.name=${branch}" \ | ||
| --define "sonar.coverage.jacoco.xmlReportPaths='${LIST_FILE}'" \ | ||
| --define "sonar.analysisCache.enabled=false" \ | ||
| "${extraBuildParams[@]}" | ||
| ) | ||
|
|
||
| main "$@" |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,53 @@ | ||
| #!/usr/bin/env bash | ||
| # | ||
| # Copyright (C) 2006-2023 Talend Inc. - www.talend.com | ||
| # | ||
| # Licensed under the Apache License, Version 2.0 (the "License"); | ||
| # you may not use this file except in compliance with the License. | ||
| # You may obtain a copy of the License at | ||
| # | ||
| # http://www.apache.org/licenses/LICENSE-2.0 | ||
| # | ||
| # Unless required by applicable law or agreed to in writing, software | ||
| # distributed under the License is distributed on an "AS IS" BASIS, | ||
| # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| # See the License for the specific language governing permissions and | ||
| # limitations under the License. | ||
| # | ||
|
|
||
| set -xe | ||
|
|
||
| # Execute sonar analysis | ||
| # $1: Sonar analyzed branch | ||
| # $2: Sonar target branch for compare | ||
| # $3: PR id | ||
| # $@: the extra parameters to be used in the maven commands | ||
| main() ( | ||
| branch="${1?Missing branch name}"; shift | ||
| target_branch="${1?Missing target branch name}"; shift | ||
| pull_request_id="${1?Missing pull request id}"; shift | ||
| extraBuildParams=("$@") | ||
|
|
||
| declare -a LIST_FILE_ARRAY=( $(find $(pwd) -type f -name 'jacoco.xml') ) | ||
| LIST_FILE=$(IFS=, ; echo "${LIST_FILE_ARRAY[*]}") | ||
|
|
||
| # Fetch target branch for Sonar diff purpose | ||
| git fetch origin "${target_branch}":"${target_branch}" | ||
|
|
||
| # Why sonar plugin is not declared in pom.xml: https://blog.sonarsource.com/we-had-a-dream-mvn-sonarsonar | ||
| # TODO https://jira.talendforge.org/browse/TDI-48980 (CI: Reactivate Sonar cache) | ||
| mvn sonar:sonar \ | ||
| --define 'sonar.host.url=https://sonar-eks.datapwn.com' \ | ||
| --define "sonar.login=${SONAR_LOGIN}" \ | ||
| --define "sonar.password=${SONAR_PASSWORD}" \ | ||
| --define "sonar.coverage.jacoco.xmlReportPaths='${LIST_FILE}'" \ | ||
| --define "sonar.analysisCache.enabled=false" \ | ||
| --define "sonar.pullrequest.branch=${branch}" \ | ||
| --define "sonar.pullrequest.base=${target_branch}" \ | ||
| --define "sonar.pullrequest.key=${pull_request_id}" \ | ||
| "${extraBuildParams[@]}" | ||
|
|
||
|
|
||
| ) | ||
|
|
||
| main "$@" |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.