Skip to content

Commit 1067de0

Browse files
kuisathaveratSteffen Siering
and
Steffen Siering
authored
Update Jenkinsfile to not inspect removed vendor (#19610) (#19621)
Co-authored-by: Steffen Siering <[email protected]>
1 parent 4869d15 commit 1067de0

File tree

1 file changed

+24
-23
lines changed

1 file changed

+24
-23
lines changed

Jenkinsfile

+24-23
Original file line numberDiff line numberDiff line change
@@ -1223,59 +1223,59 @@ def loadConfigEnvVars(){
12231223
// Auditbeat depends on metricbeat as framework, but does not include any of
12241224
// the modules from Metricbeat.
12251225
// 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'))
12281228

12291229
// 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'))
12311231

12321232
// Filebeat depends on libbeat only.
12331233
// 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'))
12361236

12371237
// Metricbeat depends on libbeat only.
12381238
// 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'))
12411241

12421242
// Functionbeat is a standalone beat that depends on libbeat only.
12431243
// 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'))
12451245

12461246
// Heartbeat depends on libbeat only.
12471247
// 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'))
12501250

12511251
// Journalbeat depends on libbeat only.
12521252
// 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'))
12551255

12561256
// Packetbeat depends on libbeat only.
12571257
// 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'))
12601260

12611261
// Winlogbeat depends on libbeat only.
12621262
// 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'))
12651265

12661266
// Elastic-agent is a self-contained product, that depends on libbeat only.
12671267
// The agent acts as a supervisor for other Beats like Filebeat or Metricbeat.
12681268
// 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'))
12701270

12711271
// The Kubernetes test use Filebeat and Metricbeat, but only need to be run
12721272
// if the deployment scripts have been updated. No Beats specific testing is
12731273
// involved.
12741274
env.BUILD_KUBERNETES = isChanged(["^deploy/kubernetes/.*"])
12751275

12761276
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'))
12791279
env.BUILD_GENERATOR = isChangedOSSCode(generatorPatterns)
12801280

12811281
// Skip all the stages for changes only related to the documentation
@@ -1314,7 +1314,7 @@ def isDocChangedOnly(){
13141314
/**
13151315
This method grab the dependencies of a Go module and transform them on regexp
13161316
*/
1317-
def getVendorPatterns(beatName){
1317+
def getProjectDependencies(beatName){
13181318
def os = goos()
13191319
def goRoot = "${env.WORKSPACE}/.gvm/versions/go${GO_VERSION}.${os}.amd64"
13201320
def output = ""
@@ -1324,9 +1324,10 @@ def getVendorPatterns(beatName){
13241324
"PATH=${env.WORKSPACE}/bin:${goRoot}/bin:${env.PATH}",
13251325
]) {
13261326
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 "/.*"}'
13301331
""")
13311332
}
13321333
return output?.split('\n').collect{ item -> item as String }

0 commit comments

Comments
 (0)