@@ -35,7 +35,7 @@ ci_instance_scanner: &CI_SCANNER
35
35
<< : *BUILD_SERVER_HW_TEMPLATE
36
36
37
37
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 != ''
39
39
ec2_instance :
40
40
<< : *VM_TEMPLATE
41
41
pull_public_images_script :
@@ -54,7 +54,7 @@ multi_arch_build_gcp_prod_task:
54
54
- 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 -
55
55
56
56
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 == '')
58
58
env :
59
59
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"
60
60
matrix :
@@ -96,7 +96,7 @@ multi_arch_build_task_template: &multi_arch_build_task_template
96
96
97
97
multi_arch_build_9_x_task :
98
98
<< : *multi_arch_build_task_template
99
- skip : " !changesInclude('9/**/*') && !changesInclude('.cirrus/*') && $CIRRUS_CRON != 'nightly-mend-scan' "
99
+ skip : " !changesInclude('9/**/*') && !changesInclude('.cirrus/*')"
100
100
env :
101
101
matrix :
102
102
- version : 9/community
@@ -113,7 +113,7 @@ multi_arch_build_9_x_task:
113
113
multi_arch_build_commercial_editions_task :
114
114
<< : *multi_arch_build_task_template
115
115
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/*')"
117
117
env :
118
118
matrix :
119
119
- version : commercial-editions/developer
@@ -127,51 +127,12 @@ multi_arch_build_commercial_editions_task:
127
127
128
128
multi_arch_build_community_build_task :
129
129
<< : *multi_arch_build_task_template
130
- skip : " !changesInclude('community-build/*') && !changesInclude('.cirrus/*') && $CIRRUS_CRON != 'nightly-mend-scan' "
130
+ skip : " !changesInclude('community-build/*') && !changesInclude('.cirrus/*')"
131
131
env :
132
132
matrix :
133
133
- version : community-build
134
134
tag : $COMMUNITY_BUILD_VERSION-master-community
135
135
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
-
175
136
multi_arch_test_task_template : &multi_arch_test_task_template
176
137
ec2_instance :
177
138
<< : *VM_TEMPLATE
@@ -188,7 +149,7 @@ multi_arch_test_task_template: &multi_arch_test_task_template
188
149
189
150
multi_arch_test_9_x_task :
190
151
<< : *multi_arch_test_task_template
191
- skip : " !changesInclude('9/**/*') && !changesInclude('.cirrus/*') && $CIRRUS_CRON != 'nightly-mend-scan' "
152
+ skip : " !changesInclude('9/**/*') && !changesInclude('.cirrus/*')"
192
153
matrix :
193
154
- env :
194
155
CIRRUS_ARCH : arm64
@@ -212,7 +173,7 @@ multi_arch_test_9_x_task:
212
173
213
174
multi_arch_test_commercial_editions_task :
214
175
<< : *multi_arch_test_task_template
215
- skip : " !changesInclude('commercial-editions/**/*') && !changesInclude('.cirrus/*') && $CIRRUS_CRON != 'nightly-mend-scan' "
176
+ skip : " !changesInclude('commercial-editions/**/*') && !changesInclude('.cirrus/*')"
216
177
matrix :
217
178
- env :
218
179
CIRRUS_ARCH : arm64
@@ -234,7 +195,7 @@ multi_arch_test_commercial_editions_task:
234
195
235
196
multi_arch_test_community_build_task :
236
197
<< : *multi_arch_test_task_template
237
- skip : " !changesInclude('community-build/*') && !changesInclude('.cirrus/*') && $CIRRUS_CRON != 'nightly-mend-scan' "
198
+ skip : " !changesInclude('community-build/*') && !changesInclude('.cirrus/*')"
238
199
matrix :
239
200
- env :
240
201
CIRRUS_ARCH : arm64
0 commit comments