Skip to content

Commit a5f15b6

Browse files
authored
ci: use ubuntu:22 workers (elastic#34315)
1 parent 48603f7 commit a5f15b6

25 files changed

+26
-26
lines changed

.ci/apm-beats-update.groovy

+1-1
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ pipeline {
3131
}
3232
stages {
3333
stage('Filter build') {
34-
agent { label 'ubuntu-18 && immutable' }
34+
agent { label 'ubuntu-22 && immutable' }
3535
when {
3636
beforeAgent true
3737
anyOf {

.ci/beats-tester.groovy

+1-1
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ pipeline {
2424
}
2525
stages {
2626
stage('Filter build') {
27-
agent { label 'ubuntu-20' }
27+
agent { label 'ubuntu-22' }
2828
when {
2929
beforeAgent true
3030
anyOf {

.ci/build-docker-images.groovy

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
@Library('apm@current') _
44

55
pipeline {
6-
agent { label 'ubuntu-20' }
6+
agent { label 'ubuntu-22' }
77
environment {
88
REPO = 'beats'
99
BASE_DIR = "src/github.com/elastic/${env.REPO}"

.ci/heartbeat-synthetics.groovy

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
@Library('apm@current') _
44

55
pipeline {
6-
agent { label 'ubuntu-18 && immutable' }
6+
agent { label 'ubuntu-22 && immutable' }
77
environment {
88
BASE_DIR = 'src/github.com/elastic/beats'
99
DOCKERELASTIC_SECRET = 'secret/observability-team/ci/docker-registry/prod'

.ci/ironbank-validation.groovy

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
@Library('apm@current') _
44

55
pipeline {
6-
agent { label 'ubuntu-20 && immutable' }
6+
agent { label 'ubuntu-22 && immutable' }
77
environment {
88
REPO = 'beats'
99
BASE_DIR = "src/github.com/elastic/${env.REPO}"

.ci/packaging.groovy

+2-2
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ pipeline {
4646
stages {
4747
stage('Filter build') {
4848
options { skipDefaultCheckout() }
49-
agent { label 'ubuntu-20 && immutable' }
49+
agent { label 'ubuntu-22 && immutable' }
5050
when {
5151
beforeAgent true
5252
anyOf {
@@ -282,7 +282,7 @@ def generateArmStep(beat) {
282282

283283
def generateLinuxStep(beat) {
284284
return {
285-
withNode(labels: 'ubuntu-20.04 && immutable') {
285+
withNode(labels: 'ubuntu-22.04 && immutable') {
286286
withEnv(["HOME=${env.WORKSPACE}", "PLATFORMS=${linuxPlatforms()}", "BEATS_FOLDER=${beat}"]) {
287287
withGithubNotify(context: "Packaging Linux ${beat}") {
288288
deleteDir()

Jenkinsfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
@Library('apm@current') _
44

55
pipeline {
6-
agent { label 'ubuntu-18 && immutable' }
6+
agent { label 'ubuntu-22 && immutable' }
77
environment {
88
AWS_ACCOUNT_SECRET = 'secret/observability-team/ci/elastic-observability-aws-account-auth'
99
AWS_REGION = "${params.awsRegion}"

auditbeat/Jenkinsfile.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ when:
1111
parameters: ## when parameter was selected in the UI.
1212
- "auditbeat"
1313
tags: true ## for all the tags
14-
platform: "immutable && ubuntu-18" ## default label for all the stages
14+
platform: "immutable && ubuntu-22" ## default label for all the stages
1515
stages:
1616
arm:
1717
mage: "mage build unitTest"

deploy/kubernetes/Jenkinsfile.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ when:
1010
parameters: ## when parameter was selected in the UI.
1111
- "kubernetes"
1212
tags: true ## for all the tags
13-
platform: "immutable && ubuntu-18" ## default label for all the stages
13+
platform: "immutable && ubuntu-22" ## default label for all the stages
1414
stages:
1515
checks:
1616
make: |

filebeat/Jenkinsfile.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ when:
1111
parameters: ## when parameter was selected in the UI.
1212
- "filebeat"
1313
tags: true ## for all the tags
14-
platform: "immutable && ubuntu-18" ## default label for all the stages
14+
platform: "immutable && ubuntu-22" ## default label for all the stages
1515
stages:
1616
arm:
1717
mage: "mage build unitTest"

heartbeat/Jenkinsfile.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ when:
1111
parameters: ## when parameter was selected in the UI.
1212
- "heartbeat"
1313
tags: true ## for all the tags
14-
platform: "immutable && ubuntu-18" ## default label for all the stages
14+
platform: "immutable && ubuntu-22" ## default label for all the stages
1515
stages:
1616
arm:
1717
mage: "mage build unitTest"

libbeat/Jenkinsfile.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ when:
1010
parameters: ## when parameter was selected in the UI.
1111
- "libbeat"
1212
tags: true ## for all the tags
13-
platform: "immutable && ubuntu-18" ## default label for all the stages
13+
platform: "immutable && ubuntu-22" ## default label for all the stages
1414
stages:
1515
arm:
1616
mage: "mage build unitTest"

metricbeat/Jenkinsfile.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ when:
1111
parameters: ## when parameter was selected in the UI.
1212
- "metricbeat"
1313
tags: true ## for all the tags
14-
platform: "immutable && ubuntu-18" ## default label for all the stages
14+
platform: "immutable && ubuntu-22" ## default label for all the stages
1515
stages:
1616
unitTest:
1717
mage: "mage build unitTest"

packetbeat/Jenkinsfile.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ when:
1111
parameters: ## when parameter was selected in the UI.
1212
- "packetbeat"
1313
tags: true ## for all the tags
14-
platform: "immutable && ubuntu-18" ## default label for all the stages
14+
platform: "immutable && ubuntu-22" ## default label for all the stages
1515
stages:
1616
arm:
1717
mage: "mage build unitTest"

winlogbeat/Jenkinsfile.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ when:
1111
parameters: ## when parameter was selected in the UI.
1212
- "winlogbeat"
1313
tags: true ## for all the tags
14-
platform: "immutable && ubuntu-18" ## default label for all the stages
14+
platform: "immutable && ubuntu-22" ## default label for all the stages
1515
stages:
1616
crosscompile:
1717
make: "make -C winlogbeat crosscompile"

x-pack/auditbeat/Jenkinsfile.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ when:
1111
parameters: ## when parameter was selected in the UI.
1212
- "x-pack-auditbeat"
1313
tags: true ## for all the tags
14-
platform: "immutable && ubuntu-18" ## default label for all the stages
14+
platform: "immutable && ubuntu-22" ## default label for all the stages
1515
stages:
1616
arm:
1717
mage: "mage build unitTest"

x-pack/dockerlogbeat/Jenkinsfile.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ when:
1111
parameters: ## when parameter was selected in the UI.
1212
- "x-pack-dockerlogbeat"
1313
tags: true ## for all the tags
14-
platform: "immutable && ubuntu-18" ## default label for all the stages
14+
platform: "immutable && ubuntu-22" ## default label for all the stages
1515
stages:
1616
unitTest:
1717
mage: "mage build unitTest"

x-pack/filebeat/Jenkinsfile.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ when:
1111
parameters: ## when parameter was selected in the UI.
1212
- "x-pack-filebeat"
1313
tags: true ## for all the tags
14-
platform: "immutable && ubuntu-18" ## default label for all the stages
14+
platform: "immutable && ubuntu-22" ## default label for all the stages
1515
stages:
1616
arm:
1717
mage: "mage build unitTest"

x-pack/functionbeat/Jenkinsfile.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ when:
1111
parameters: ## when parameter was selected in the UI.
1212
- "x-pack-functionbeat"
1313
tags: true ## for all the tags
14-
platform: "immutable && ubuntu-18" ## default label for all the stages
14+
platform: "immutable && ubuntu-22" ## default label for all the stages
1515
stages:
1616
arm:
1717
mage: "mage build unitTest"

x-pack/heartbeat/Jenkinsfile.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ when:
1111
parameters: ## when parameter was selected in the UI.
1212
- "x-pack-heartbeat"
1313
tags: true ## for all the tags
14-
platform: "immutable && ubuntu-18" ## default label for all the stages
14+
platform: "immutable && ubuntu-22" ## default label for all the stages
1515
stages:
1616
unitTest:
1717
mage: "mage build unitTest"

x-pack/libbeat/Jenkinsfile.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ when:
1111
parameters: ## when parameter was selected in the UI.
1212
- "x-pack-libbeat"
1313
tags: true ## for all the tags
14-
platform: "immutable && ubuntu-18" ## default label for all the stages
14+
platform: "immutable && ubuntu-22" ## default label for all the stages
1515
stages:
1616
arm:
1717
mage: "mage build unitTest"

x-pack/metricbeat/Jenkinsfile.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ when:
1111
parameters: ## when parameter was selected in the UI.
1212
- "x-pack-metricbeat"
1313
tags: true ## for all the tags
14-
platform: "immutable && ubuntu-18" ## default label for all the stages
14+
platform: "immutable && ubuntu-22" ## default label for all the stages
1515
stages:
1616
unitTest:
1717
mage: "mage build unitTest"

x-pack/osquerybeat/Jenkinsfile.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ when:
1111
parameters: ## when parameter was selected in the UI.
1212
- "x-pack-osquerybeat"
1313
tags: true ## for all the tags
14-
platform: "immutable && ubuntu-18" ## default label for all the stages
14+
platform: "immutable && ubuntu-22" ## default label for all the stages
1515
stages:
1616
unitTest:
1717
mage: "mage build unitTest"

x-pack/packetbeat/Jenkinsfile.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ when:
1111
parameters: ## when parameter was selected in the UI.
1212
- "x-pack-packetbeat"
1313
tags: true ## for all the tags
14-
platform: "immutable && ubuntu-18" ## default label for all the stages
14+
platform: "immutable && ubuntu-22" ## default label for all the stages
1515
stages:
1616
arm:
1717
mage: "mage build unitTest"

x-pack/winlogbeat/Jenkinsfile.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ stages:
5959
e2e:
6060
enabled: false
6161
platforms: ## override default labels in this specific stage.
62-
- "immutable && ubuntu-18"
62+
- "immutable && ubuntu-22"
6363
stage: packaging
6464
when:
6565
branches: false ## Only on a PR basis for the time being

0 commit comments

Comments
 (0)