Skip to content

Commit

Permalink
[CI] Add ARM packaging (#24041) (#24188)
Browse files Browse the repository at this point in the history
  • Loading branch information
v1v authored Feb 24, 2021
1 parent 54c0584 commit 519fe0d
Show file tree
Hide file tree
Showing 14 changed files with 104 additions and 3 deletions.
27 changes: 25 additions & 2 deletions Jenkinsfile
Original file line number Diff line number Diff line change
Expand Up @@ -262,7 +262,20 @@ def k8sTest(Map args = [:]) {
}

/**
* This method runs the packaging
* This method runs the packaging for ARM
*/
def packagingArm(Map args = [:]) {
def PLATFORMS = [ 'linux/arm64' ].join(' ')
withEnv([
"PLATFORMS=${PLATFORMS}",
"PACKAGES=docker"
]) {
target(args)
}
}

/**
* This method runs the packaging for Linux
*/
def packagingLinux(Map args = [:]) {
def PLATFORMS = [ '+all',
Expand All @@ -286,7 +299,6 @@ def packagingLinux(Map args = [:]) {
}
}


/**
* Upload the packages to their snapshot or pull request buckets
* @param beatsFolder beats folder
Expand Down Expand Up @@ -922,6 +934,17 @@ class RunCommand extends co.elastic.beats.BeatsFunction {
if(args?.content?.containsKey('mage')) {
steps.target(context: args.context, command: args.content.mage, directory: args.project, label: args.label, withModule: withModule, isMage: true, id: args.id)
}
if(args?.content?.containsKey('packaging-arm')) {
steps.packagingArm(context: args.context,
command: args.content.get('packaging-arm'),
directory: args.project,
label: args.label,
isMage: true,
id: args.id,
e2e: args.content.get('e2e'),
package: true,
dockerArch: 'arm64')
}
if(args?.content?.containsKey('packaging-linux')) {
steps.packagingLinux(context: args.context,
command: args.content.get('packaging-linux'),
Expand Down
6 changes: 6 additions & 0 deletions auditbeat/Jenkinsfile.yml
Original file line number Diff line number Diff line change
Expand Up @@ -87,3 +87,9 @@ stages:
packaging-linux: "mage package"
e2e:
enabled: false
packaging-arm:
packaging-arm: "mage package"
e2e:
enabled: false
platforms: ## override default label in this specific stage.
- "arm"
6 changes: 6 additions & 0 deletions filebeat/Jenkinsfile.yml
Original file line number Diff line number Diff line change
Expand Up @@ -85,3 +85,9 @@ stages:
packaging-linux: "mage package"
e2e:
enabled: false
packaging-arm:
packaging-arm: "mage package"
e2e:
enabled: false
platforms: ## override default label in this specific stage.
- "arm"
6 changes: 6 additions & 0 deletions heartbeat/Jenkinsfile.yml
Original file line number Diff line number Diff line change
Expand Up @@ -84,3 +84,9 @@ stages:
packaging-linux: "mage package"
e2e:
enabled: false
packaging-arm:
packaging-arm: "mage package"
e2e:
enabled: false
platforms: ## override default label in this specific stage.
- "arm"
6 changes: 6 additions & 0 deletions journalbeat/Jenkinsfile.yml
Original file line number Diff line number Diff line change
Expand Up @@ -37,3 +37,9 @@ stages:
packaging-linux: "mage package"
e2e:
enabled: false
packaging-arm:
packaging-arm: "mage package"
e2e:
enabled: false
platforms: ## override default label in this specific stage.
- "arm"
6 changes: 6 additions & 0 deletions metricbeat/Jenkinsfile.yml
Original file line number Diff line number Diff line change
Expand Up @@ -79,3 +79,9 @@ stages:
packaging-linux: "mage package"
e2e:
enabled: false ## e2e is enabled only for x-pack beats
packaging-arm:
packaging-arm: "mage package"
e2e:
enabled: false
platforms: ## override default label in this specific stage.
- "arm"
6 changes: 6 additions & 0 deletions packetbeat/Jenkinsfile.yml
Original file line number Diff line number Diff line change
Expand Up @@ -85,3 +85,9 @@ stages:
packaging-linux: "mage package"
e2e:
enabled: false
packaging-arm:
packaging-arm: "mage package"
e2e:
enabled: false
platforms: ## override default label in this specific stage.
- "arm"
6 changes: 6 additions & 0 deletions x-pack/auditbeat/Jenkinsfile.yml
Original file line number Diff line number Diff line change
Expand Up @@ -85,3 +85,9 @@ stages:
packaging-linux: "mage package"
e2e:
enabled: false
packaging-arm:
packaging-arm: "mage package"
e2e:
enabled: false
platforms: ## override default label in this specific stage.
- "arm"
6 changes: 6 additions & 0 deletions x-pack/dockerlogbeat/Jenkinsfile.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,3 +25,9 @@ stages:
packaging-linux: "mage package"
e2e:
enabled: false
packaging-arm:
packaging-arm: "mage package"
e2e:
enabled: false
platforms: ## override default label in this specific stage.
- "arm"
6 changes: 6 additions & 0 deletions x-pack/elastic-agent/Jenkinsfile.yml
Original file line number Diff line number Diff line change
Expand Up @@ -89,3 +89,9 @@ stages:
packaging-linux: "mage package"
e2e:
enabled: false
packaging-arm:
packaging-arm: "mage package"
e2e:
enabled: false
platforms: ## override default label in this specific stage.
- "arm"
8 changes: 7 additions & 1 deletion x-pack/filebeat/Jenkinsfile.yml
Original file line number Diff line number Diff line change
Expand Up @@ -91,4 +91,10 @@ stages:
packaging-linux:
packaging-linux: "mage package"
e2e:
enabled: false
enabled: false
packaging-arm:
packaging-arm: "mage package"
e2e:
enabled: false
platforms: ## override default label in this specific stage.
- "arm"
6 changes: 6 additions & 0 deletions x-pack/heartbeat/Jenkinsfile.yml
Original file line number Diff line number Diff line change
Expand Up @@ -74,3 +74,9 @@ stages:
packaging-linux: "mage package"
e2e:
enabled: false
packaging-arm:
packaging-arm: "mage package"
e2e:
enabled: false
platforms: ## override default label in this specific stage.
- "arm"
6 changes: 6 additions & 0 deletions x-pack/metricbeat/Jenkinsfile.yml
Original file line number Diff line number Diff line change
Expand Up @@ -84,3 +84,9 @@ stages:
e2e:
enabled: false
entrypoint: 'metricbeat-test.sh'
packaging-arm:
packaging-arm: "mage package"
e2e:
enabled: false
platforms: ## override default label in this specific stage.
- "arm"
6 changes: 6 additions & 0 deletions x-pack/packetbeat/Jenkinsfile.yml
Original file line number Diff line number Diff line change
Expand Up @@ -86,3 +86,9 @@ stages:
packaging-linux: "mage package"
e2e:
enabled: false
packaging-arm:
packaging-arm: "mage package"
e2e:
enabled: false
platforms: ## override default label in this specific stage.
- "arm"

0 comments on commit 519fe0d

Please sign in to comment.