@@ -1223,59 +1223,59 @@ def loadConfigEnvVars(){
1223
1223
// Auditbeat depends on metricbeat as framework, but does not include any of
1224
1224
// the modules from Metricbeat.
1225
1225
// The Auditbeat x-pack build contains all functionality from OSS Auditbeat.
1226
- env. BUILD_AUDITBEAT = isChangedOSSCode(getVendorPatterns (' auditbeat' ))
1227
- env. BUILD_AUDITBEAT_XPACK = isChangedXPackCode(getVendorPatterns (' x-pack/auditbeat' ))
1226
+ env. BUILD_AUDITBEAT = isChangedOSSCode(getProjectDependencies (' auditbeat' ))
1227
+ env. BUILD_AUDITBEAT_XPACK = isChangedXPackCode(getProjectDependencies (' x-pack/auditbeat' ))
1228
1228
1229
1229
// Dockerlogbeat is a standalone Beat that only relies on libbeat.
1230
- env. BUILD_DOCKERLOGBEAT_XPACK = isChangedXPackCode(getVendorPatterns (' x-pack/dockerlogbeat' ))
1230
+ env. BUILD_DOCKERLOGBEAT_XPACK = isChangedXPackCode(getProjectDependencies (' x-pack/dockerlogbeat' ))
1231
1231
1232
1232
// Filebeat depends on libbeat only.
1233
1233
// The Filebeat x-pack build contains all functionality from OSS Filebeat.
1234
- env. BUILD_FILEBEAT = isChangedOSSCode(getVendorPatterns (' filebeat' ))
1235
- env. BUILD_FILEBEAT_XPACK = isChangedXPackCode(getVendorPatterns (' x-pack/filebeat' ))
1234
+ env. BUILD_FILEBEAT = isChangedOSSCode(getProjectDependencies (' filebeat' ))
1235
+ env. BUILD_FILEBEAT_XPACK = isChangedXPackCode(getProjectDependencies (' x-pack/filebeat' ))
1236
1236
1237
1237
// Metricbeat depends on libbeat only.
1238
1238
// The Metricbeat x-pack build contains all functionality from OSS Metricbeat.
1239
- env. BUILD_METRICBEAT = isChangedOSSCode(getVendorPatterns (' metricbeat' ))
1240
- env. BUILD_METRICBEAT_XPACK = isChangedXPackCode(getVendorPatterns (' x-pack/metricbeat' ))
1239
+ env. BUILD_METRICBEAT = isChangedOSSCode(getProjectDependencies (' metricbeat' ))
1240
+ env. BUILD_METRICBEAT_XPACK = isChangedXPackCode(getProjectDependencies (' x-pack/metricbeat' ))
1241
1241
1242
1242
// Functionbeat is a standalone beat that depends on libbeat only.
1243
1243
// Functionbeat is available as x-pack build only.
1244
- env. BUILD_FUNCTIONBEAT_XPACK = isChangedXPackCode(getVendorPatterns (' x-pack/functionbeat' ))
1244
+ env. BUILD_FUNCTIONBEAT_XPACK = isChangedXPackCode(getProjectDependencies (' x-pack/functionbeat' ))
1245
1245
1246
1246
// Heartbeat depends on libbeat only.
1247
1247
// The Heartbeat x-pack build contains all functionality from OSS Heartbeat.
1248
- env. BUILD_HEARTBEAT = isChangedOSSCode(getVendorPatterns (' heartbeat' ))
1249
- env. BUILD_HEARTBEAT_XPACK = isChangedXPackCode(getVendorPatterns (' x-pack/heartbeat' ))
1248
+ env. BUILD_HEARTBEAT = isChangedOSSCode(getProjectDependencies (' heartbeat' ))
1249
+ env. BUILD_HEARTBEAT_XPACK = isChangedXPackCode(getProjectDependencies (' x-pack/heartbeat' ))
1250
1250
1251
1251
// Journalbeat depends on libbeat only.
1252
1252
// The Journalbeat x-pack build contains all functionality from OSS Journalbeat.
1253
- env. BUILD_JOURNALBEAT = isChangedOSSCode(getVendorPatterns (' journalbeat' ))
1254
- env. BUILD_JOURNALBEAT_XPACK = isChangedXPackCode(getVendorPatterns (' x-pack/journalbeat' ))
1253
+ env. BUILD_JOURNALBEAT = isChangedOSSCode(getProjectDependencies (' journalbeat' ))
1254
+ env. BUILD_JOURNALBEAT_XPACK = isChangedXPackCode(getProjectDependencies (' x-pack/journalbeat' ))
1255
1255
1256
1256
// Packetbeat depends on libbeat only.
1257
1257
// The Packetbeat x-pack build contains all functionality from OSS Packetbeat.
1258
- env. BUILD_PACKETBEAT = isChangedOSSCode(getVendorPatterns (' packetbeat' ))
1259
- env. BUILD_PACKETBEAT_XPACK = isChangedXPackCode(getVendorPatterns (' x-pack/packetbeat' ))
1258
+ env. BUILD_PACKETBEAT = isChangedOSSCode(getProjectDependencies (' packetbeat' ))
1259
+ env. BUILD_PACKETBEAT_XPACK = isChangedXPackCode(getProjectDependencies (' x-pack/packetbeat' ))
1260
1260
1261
1261
// Winlogbeat depends on libbeat only.
1262
1262
// The Winlogbeat x-pack build contains all functionality from OSS Winlogbeat.
1263
- env. BUILD_WINLOGBEAT = isChangedOSSCode(getVendorPatterns (' winlogbeat' ))
1264
- env. BUILD_WINLOGBEAT_XPACK = isChangedXPackCode(getVendorPatterns (' x-pack/winlogbeat' ))
1263
+ env. BUILD_WINLOGBEAT = isChangedOSSCode(getProjectDependencies (' winlogbeat' ))
1264
+ env. BUILD_WINLOGBEAT_XPACK = isChangedXPackCode(getProjectDependencies (' x-pack/winlogbeat' ))
1265
1265
1266
1266
// Elastic-agent is a self-contained product, that depends on libbeat only.
1267
1267
// The agent acts as a supervisor for other Beats like Filebeat or Metricbeat.
1268
1268
// The agent is available as x-pack build only.
1269
- env. BUILD_ELASTIC_AGENT_XPACK = isChangedXPackCode(getVendorPatterns (' x-pack/elastic-agent' ))
1269
+ env. BUILD_ELASTIC_AGENT_XPACK = isChangedXPackCode(getProjectDependencies (' x-pack/elastic-agent' ))
1270
1270
1271
1271
// The Kubernetes test use Filebeat and Metricbeat, but only need to be run
1272
1272
// if the deployment scripts have been updated. No Beats specific testing is
1273
1273
// involved.
1274
1274
env. BUILD_KUBERNETES = isChanged([" ^deploy/kubernetes/.*" ])
1275
1275
1276
1276
def generatorPatterns = [' ^generator/.*' ]
1277
- generatorPatterns. addAll(getVendorPatterns (' generator/common/beatgen' ))
1278
- generatorPatterns. addAll(getVendorPatterns (' metricbeat/beater' ))
1277
+ generatorPatterns. addAll(getProjectDependencies (' generator/common/beatgen' ))
1278
+ generatorPatterns. addAll(getProjectDependencies (' metricbeat/beater' ))
1279
1279
env. BUILD_GENERATOR = isChangedOSSCode(generatorPatterns)
1280
1280
1281
1281
// Skip all the stages for changes only related to the documentation
@@ -1314,7 +1314,7 @@ def isDocChangedOnly(){
1314
1314
/**
1315
1315
This method grab the dependencies of a Go module and transform them on regexp
1316
1316
*/
1317
- def getVendorPatterns (beatName ){
1317
+ def getProjectDependencies (beatName ){
1318
1318
def os = goos()
1319
1319
def goRoot = " ${ env.WORKSPACE} /.gvm/versions/go${ GO_VERSION} .${ os} .amd64"
1320
1320
def output = " "
@@ -1324,9 +1324,10 @@ def getVendorPatterns(beatName){
1324
1324
" PATH=${ env.WORKSPACE} /bin:${ goRoot} /bin:${ env.PATH} " ,
1325
1325
]) {
1326
1326
output = sh(label : ' Get vendor dependency patterns' , returnStdout : true , script : """
1327
- go list -mod=mod -f '{{ .ImportPath }}{{ "\\ n" }}{{ join .Deps "\\ n" }}' ./${ beatName} \
1328
- |awk '{print \$ 1"/.*"}'\
1329
- |sed -e "s#github.com/elastic/beats/v7/##g"
1327
+ go list -deps ./${ beatName} \
1328
+ | grep 'elastic/beats' \
1329
+ | sed -e "s#github.com/elastic/beats/v7/##g" \
1330
+ | awk '{print "^" \$ 1 "/.*"}'
1330
1331
""" )
1331
1332
}
1332
1333
return output?. split(' \n ' ). collect{ item -> item as String }
0 commit comments