Skip to content

Commit dd12a5e

Browse files
JAVASE-23 Delete ws_scan_task (#39)
1 parent 5d33da2 commit dd12a5e

File tree

2 files changed

+23
-31
lines changed

2 files changed

+23
-31
lines changed

.cirrus.yml

Lines changed: 23 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -55,28 +55,35 @@ build_task:
5555
- regular_mvn_build_deploy_analyze
5656
cleanup_before_cache_script: cleanup_maven_repository
5757

58-
ws_scan_task:
59-
<<: *ONLY_SONARSOURCE_QA
58+
sonar_shadow_scan_and_issue_replication_task:
59+
depends_on:
60+
- build
61+
# Only run when triggered by the cirrus-ci cron job named "nightly"
62+
only_if: $CIRRUS_CRON == "nightly"
6063
eks_container:
6164
<<: *CONTAINER_DEFINITION
62-
image: ${CIRRUS_AWS_ACCOUNT}.dkr.ecr.eu-central-1.amazonaws.com/base:j17-latest
6365
cpu: 4
6466
memory: 4G
65-
# run only on master and long-term branches
66-
only_if: $CIRRUS_USER_COLLABORATOR == 'true' && ($CIRRUS_BRANCH == "master" || $CIRRUS_BRANCH =~ "branch-.*" || $CIRRUS_BRANCH =~ "mend-.*")
6767
env:
68-
WS_APIKEY: VAULT[development/kv/data/mend data.apikey]
68+
SONAR_PROJECT_KEY: "org.sonarsource.java:sonar-java-symbolic-execution"
69+
SHADOW_ORGANIZATION: "sonarsource"
70+
SHADOW_PROJECT_KEY: "SonarSource_sonar-java-symbolic-execution"
71+
# to replicate issue states from next
72+
SONAR_TOKEN: VAULT[development/kv/data/next data.token]
73+
SONAR_HOST_URL: https://next.sonarqube.com/sonarqube
74+
matrix:
75+
- name: "sonarcloud.io"
76+
SHADOW_SONAR_TOKEN: VAULT[development/kv/data/sonarcloud data.token]
77+
SHADOW_SONAR_HOST_URL: "https://sonarcloud.io"
78+
- name: "sonarqube.us"
79+
SHADOW_SONAR_TOKEN: VAULT[development/kv/data/sonarqube-us data.token]
80+
SHADOW_SONAR_HOST_URL: "https://sonarqube.us"
6981
maven_cache:
7082
folder: ${CIRRUS_WORKING_DIR}/.m2/repository
71-
whitesource_script:
72-
- source cirrus-env QA
73-
- source set_maven_build_version $BUILD_NUMBER
74-
- mvn clean install --batch-mode -Dmaven.test.skip=true -pl '!java-symbolic-execution/java-symbolic-execution-checks-test-sources'
75-
- source ws_scan.sh
76-
allow_failures: "true"
77-
always:
78-
ws_artifacts:
79-
path: "whitesource/**/*"
83+
build_and_shadow_scan_script:
84+
- source cirrus-env BUILD
85+
- ./shadow-scan-and-issue-replication.sh
86+
cleanup_before_cache_script: cleanup_maven_repository
8087

8188
ruling_task:
8289
depends_on:
@@ -121,7 +128,7 @@ ruling_task:
121128
promote_task:
122129
depends_on:
123130
- build
124-
- ws_scan
131+
- sonar_shadow_scan_and_issue_replication
125132
- ruling
126133
<<: *ONLY_SONARSOURCE_QA
127134
eks_container:

wss-unified-agent.config

Lines changed: 0 additions & 15 deletions
This file was deleted.

0 commit comments

Comments
 (0)