Skip to content

Commit b020347

Browse files
SONAR-25897 Remove Mend references in QA
1 parent 4f77dc7 commit b020347

File tree

2 files changed

+8
-49
lines changed

2 files changed

+8
-49
lines changed

.cirrus/tasks.yml

Lines changed: 8 additions & 47 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ ci_instance_scanner: &CI_SCANNER
3535
<<: *BUILD_SERVER_HW_TEMPLATE
3636

3737
multi_arch_build_gcp_prod_task:
38-
only_if: $CIRRUS_CRON == 'nightly-mend-scan' || $TRIGGER == 'PUSH_GCP_IMAGES' || $CIRRUS_RELEASE != ''
38+
only_if: $TRIGGER == 'PUSH_GCP_IMAGES' || $CIRRUS_RELEASE != ''
3939
ec2_instance:
4040
<<: *VM_TEMPLATE
4141
pull_public_images_script:
@@ -54,7 +54,7 @@ multi_arch_build_gcp_prod_task:
5454
- echo -e "FROM ${PUBLIC_IMAGE_NAME}:${CURRENT_VERSION}-datacenter-search" | docker buildx build --platform linux/amd64 --provenance=false --annotation "manifest,manifest-descriptor:com.googleapis.cloudmarketplace.product.service.name=services/official-sonarqube-data-center-edition.endpoints.sonarsource-public.cloud.goog" --tag "${GCLOUD_REGISTRY}/${GCLOUD_PRODUCT_NAME}/sonarqube-dce-search:${CURRENT_VERSION}" --tag "${GCLOUD_REGISTRY}/${GCLOUD_PRODUCT_NAME}/sonarqube-dce-search:${CURRENT_MINOR_VERSION}" --push -
5555

5656
multi_arch_build_gcp_staging_task:
57-
only_if: $CIRRUS_CRON == 'nightly-mend-scan' || $TRIGGER == 'PUSH_GCP_STAGING_IMAGES' || ($CIRRUS_CHANGE_MESSAGE =~ '.*Update docker-sonarqube-server-releases.*' && $CIRRUS_BASE_BRANCH == '')
57+
only_if: $TRIGGER == 'PUSH_GCP_STAGING_IMAGES' || ($CIRRUS_CHANGE_MESSAGE =~ '.*Update docker-sonarqube-server-releases.*' && $CIRRUS_BASE_BRANCH == '')
5858
env:
5959
EXTRA_DOCKER_BUILD_ARGS: "--provenance=false --annotation=manifest,manifest-descriptor:com.googleapis.cloudmarketplace.product.service.name=services/official-sonarqube-data-center-edition.endpoints.sonarsource-public.cloud.goog"
6060
matrix:
@@ -96,7 +96,7 @@ multi_arch_build_task_template: &multi_arch_build_task_template
9696

9797
multi_arch_build_9_x_task:
9898
<<: *multi_arch_build_task_template
99-
skip: "!changesInclude('9/**/*') && !changesInclude('.cirrus/*') && $CIRRUS_CRON != 'nightly-mend-scan'"
99+
skip: "!changesInclude('9/**/*') && !changesInclude('.cirrus/*')"
100100
env:
101101
matrix:
102102
- version: 9/community
@@ -113,7 +113,7 @@ multi_arch_build_9_x_task:
113113
multi_arch_build_commercial_editions_task:
114114
<<: *multi_arch_build_task_template
115115
alias: multi_arch_build_sonarqube_server
116-
skip: "!changesInclude('commercial-editions/**/*') && !changesInclude('.cirrus/*') && $CIRRUS_CRON != 'nightly-mend-scan'"
116+
skip: "!changesInclude('commercial-editions/**/*') && !changesInclude('.cirrus/*')"
117117
env:
118118
matrix:
119119
- version: commercial-editions/developer
@@ -127,51 +127,12 @@ multi_arch_build_commercial_editions_task:
127127

128128
multi_arch_build_community_build_task:
129129
<<: *multi_arch_build_task_template
130-
skip: "!changesInclude('community-build/*') && !changesInclude('.cirrus/*') && $CIRRUS_CRON != 'nightly-mend-scan'"
130+
skip: "!changesInclude('community-build/*') && !changesInclude('.cirrus/*')"
131131
env:
132132
matrix:
133133
- version: community-build
134134
tag: $COMMUNITY_BUILD_VERSION-master-community
135135

136-
private_scan_task:
137-
env:
138-
platform: amd64
139-
MEND_API_KEY: VAULT[development/kv/data/mend data.apikey]
140-
WS_WSS_URL: https://saas-eu.whitesourcesoftware.com/agent
141-
matrix:
142-
- tag: ${PREVIOUS_LTA_VERSION}-master-datacenter-app
143-
- tag: ${CURRENT_VERSION}-master-datacenter-app
144-
ec2_instance:
145-
<<: *CI_SCANNER
146-
login_script:
147-
- docker login --username $DOCKER_USERNAME --password $DOCKER_PASSWORD
148-
scan_script:
149-
- echo "docker.includes=${tag}" >> .cirrus/wss-unified-agent.config
150-
- echo "Scan the ${STAGING_IMAGE_NAME}:${tag} image supporting linux/${platform}"
151-
- .cirrus/pull.sh ${STAGING_IMAGE_NAME} ${tag} ${platform}
152-
- java -jar /usr/local/bin/wss-unified-agent.jar -c .cirrus/wss-unified-agent.config -apiKey $MEND_API_KEY -product ${WS_PRODUCTNAME} -project ${STAGING_IMAGE_NAME}:${tag} -wss.url ${WS_WSS_URL} -docker.scanImages true
153-
depends_on:
154-
- multi_arch_build_9_x
155-
- multi_arch_build_sonarqube_server
156-
157-
public_scan_task:
158-
only_if: $CIRRUS_CRON == 'nightly-mend-scan'
159-
env:
160-
platform: amd64
161-
MEND_API_KEY: VAULT[development/kv/data/mend data.apikey]
162-
WS_WSS_URL: https://saas-eu.whitesourcesoftware.com/agent
163-
matrix:
164-
- tag: $PREVIOUS_LTA_VERSION-datacenter-app
165-
- tag: $CURRENT_VERSION-datacenter-app
166-
ec2_instance:
167-
<<: *CI_SCANNER
168-
scan_script:
169-
- echo "docker.includes=${tag}" >> .cirrus/wss-unified-agent.config
170-
- echo "Scan the ${PUBLIC_IMAGE_NAME}:${tag} image"
171-
- docker pull "${PUBLIC_IMAGE_NAME}:${tag}"
172-
- .cirrus/pull.sh ${PUBLIC_IMAGE_NAME} ${tag} ${platform}
173-
- java -jar /usr/local/bin/wss-unified-agent.jar -c .cirrus/wss-unified-agent.config -apiKey $MEND_API_KEY -product ${WS_PRODUCTNAME} -project ${PUBLIC_IMAGE_NAME}:${tag} -wss.url ${WS_WSS_URL} -docker.scanImages true
174-
175136
multi_arch_test_task_template: &multi_arch_test_task_template
176137
ec2_instance:
177138
<<: *VM_TEMPLATE
@@ -188,7 +149,7 @@ multi_arch_test_task_template: &multi_arch_test_task_template
188149

189150
multi_arch_test_9_x_task:
190151
<<: *multi_arch_test_task_template
191-
skip: "!changesInclude('9/**/*') && !changesInclude('.cirrus/*') && $CIRRUS_CRON != 'nightly-mend-scan'"
152+
skip: "!changesInclude('9/**/*') && !changesInclude('.cirrus/*')"
192153
matrix:
193154
- env:
194155
CIRRUS_ARCH: arm64
@@ -212,7 +173,7 @@ multi_arch_test_9_x_task:
212173

213174
multi_arch_test_commercial_editions_task:
214175
<<: *multi_arch_test_task_template
215-
skip: "!changesInclude('commercial-editions/**/*') && !changesInclude('.cirrus/*') && $CIRRUS_CRON != 'nightly-mend-scan'"
176+
skip: "!changesInclude('commercial-editions/**/*') && !changesInclude('.cirrus/*')"
216177
matrix:
217178
- env:
218179
CIRRUS_ARCH: arm64
@@ -234,7 +195,7 @@ multi_arch_test_commercial_editions_task:
234195

235196
multi_arch_test_community_build_task:
236197
<<: *multi_arch_test_task_template
237-
skip: "!changesInclude('community-build/*') && !changesInclude('.cirrus/*') && $CIRRUS_CRON != 'nightly-mend-scan'"
198+
skip: "!changesInclude('community-build/*') && !changesInclude('.cirrus/*')"
238199
matrix:
239200
- env:
240201
CIRRUS_ARCH: arm64

.cirrus/wss-unified-agent.config

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

0 commit comments

Comments
 (0)