Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion .cirrus.yml
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,6 @@
env:
SONAR_PROJECT_KEY: "org.sonarsource.java:sonar-java-symbolic-execution"
SHADOW_ORGANIZATION: "sonarsource"
SHADOW_PROJECT_KEY: "SonarSource_sonar-java-symbolic-execution"
# to replicate issue states from next
SONAR_TOKEN: VAULT[development/kv/data/next data.token]
SONAR_HOST_URL: https://next.sonarqube.com/sonarqube
Expand Down Expand Up @@ -125,7 +124,7 @@
actual_artifacts:
path: "${CIRRUS_WORKING_DIR}/its/ruling/target/actual/**/*"

promote_task:

Check warning on line 127 in .cirrus.yml

View check run for this annotation

Cirrus CI / Build Parsing Results

.cirrus.yml#L127

task "promote" depends on task "sonar_shadow_scan_and_issue_replication", but their only_if conditions are different
depends_on:
- build
- sonar_shadow_scan_and_issue_replication
Expand Down
8 changes: 4 additions & 4 deletions shadow-scan-and-issue-replication.sh
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ function build_and_analyze_the_project() {
-Dsonar.host.url="${SHADOW_SONAR_HOST_URL}" \
-Dsonar.token="${SHADOW_SONAR_TOKEN}" \
-Dsonar.organization="${SHADOW_ORGANIZATION}" \
-Dsonar.projectKey="${SHADOW_PROJECT_KEY}" \
-Dsonar.projectKey="${SONAR_PROJECT_KEY}" \
-Dsonar.analysis.buildNumber="${BUILD_NUMBER}" \
-Dsonar.analysis.repository="${GITHUB_REPO}" \
"$@"
Expand Down Expand Up @@ -64,9 +64,9 @@ function wait_for_sonarcloud_compute_engine_to_finish() {
local LAST_STATUS=""
local STATUS

echo "Waiting for SonarCloud compute engine to finish for project key: ${SHADOW_PROJECT_KEY}"
echo "Waiting for SonarCloud compute engine to finish for project key: ${SONAR_PROJECT_KEY}"
while (( ELAPSED_TIME < MAX_WAIT_TIME_SECONDS )); do
STATUS=$(sonarcloud_compute_engine_status_for_given_project "${SHADOW_PROJECT_KEY}")
STATUS=$(sonarcloud_compute_engine_status_for_given_project "${SONAR_PROJECT_KEY}")
if [[ "${STATUS}" != "${LAST_STATUS}" ]]; then
echo -n " ${STATUS} "
LAST_STATUS="${STATUS}"
Expand Down Expand Up @@ -97,7 +97,7 @@ function run_iris() {
-Diris.source.projectKey="${SONAR_PROJECT_KEY}" \
-Diris.source.url="${SONAR_HOST_URL}" \
-Diris.source.token="${SONAR_TOKEN}" \
-Diris.destination.projectKey="${SHADOW_PROJECT_KEY}" \
-Diris.destination.projectKey="${SONAR_PROJECT_KEY}" \
-Diris.destination.organization="${SHADOW_ORGANIZATION}" \
-Diris.destination.url="${SHADOW_SONAR_HOST_URL}" \
-Diris.destination.token="${SHADOW_SONAR_TOKEN}" \
Expand Down