Skip to content

Commit 0bbca52

Browse files
okorachokorach-sonar
authored andcommitted
Add-run-all-everywhere (#2002)
* Add run_all everywhere * Quality pass
1 parent 90108ab commit 0bbca52

File tree

4 files changed

+4
-6
lines changed

4 files changed

+4
-6
lines changed

conf/release.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,5 +50,5 @@ if [[ "${confirm}" = "y" ]]; then
5050
cd "${ROOT_DIR}" && docker pushrm olivierkorach/sonar-tools
5151

5252
echo "Running scan"
53-
"${CONF_DIR}/scan.sh" -test
53+
"${CONF_DIR}/run_all.sh" -test
5454
fi

conf/run_tests.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ do
4545
if [[ -d "${ROOT_DIR}/${GEN_LOC}/${target}/" ]]; then
4646
# Recreate a fresh TESTSYNC project for sync tests
4747
curl -X POST -u "${SONAR_TOKEN_TEST_ADMIN_USER}:" "${SONAR_HOST_URL_TEST}/api/projects/delete?project=${SYNC_PROJECT_KEY}"
48-
conf/scan.sh -nolint -Dsonar.host.url="${SONAR_HOST_URL_TEST}" -Dsonar.projectKey="${SYNC_PROJECT_KEY}" -Dsonar.projectName="${SYNC_PROJECT_KEY}" -Dsonar.token="${SONAR_TOKEN_TEST_ADMIN_ANALYSIS}"
48+
conf/run_scanner.sh -Dsonar.host.url="${SONAR_HOST_URL_TEST}" -Dsonar.projectKey="${SYNC_PROJECT_KEY}" -Dsonar.projectName="${SYNC_PROJECT_KEY}" -Dsonar.token="${SONAR_TOKEN_TEST_ADMIN_ANALYSIS}"
4949
# Run tests
5050
poetry run coverage run --branch --source="${ROOT_DIR}" -m pytest "${ROOT_DIR}/${GEN_LOC}/${target}/" --junit-xml="${BUILD_DIR}/xunit-results-${target}.xml"
5151
poetry run coverage xml -o "${BUILD_DIR}/coverage-${target}.xml"

migration/build.sh

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,6 @@ ROOT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && cd .. && pwd )"
2323
CONF_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
2424

2525
build_image=1
26-
release=0
27-
release_docker=0
2826

2927
while [[ $# -ne 0 ]]; do
3028
case "${1}" in

test/test-sync.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,9 @@ for proj in source target
44
do
55
curl -X POST -u "$SONAR_TOKEN:" "$SONAR_HOST_URL/api/projects/delete?project=$proj"
66
opts=("-Dsonar.projectKey=$proj" "-Dsonar.projectName=$proj")
7-
scan.sh "${opts[@]}" "$@"
7+
conf/run_all.sh "${opts[@]}" "$@"
88
for branch in release-1.x release-2.x
99
do
10-
scan.sh "${opts[@]}" "$@" "-Dsonar.branch.name=$branch"
10+
conf/run_all.sh "${opts[@]}" "$@" "-Dsonar.branch.name=$branch"
1111
done
1212
done

0 commit comments

Comments
 (0)