Skip to content

Commit

Permalink
ci: use ubuntu:22 workers (#34315)
Browse files Browse the repository at this point in the history
  • Loading branch information
v1v committed Jan 24, 2023
1 parent 48603f7 commit a5f15b6
Show file tree
Hide file tree
Showing 25 changed files with 26 additions and 26 deletions.
2 changes: 1 addition & 1 deletion .ci/apm-beats-update.groovy
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ pipeline {
}
stages {
stage('Filter build') {
agent { label 'ubuntu-18 && immutable' }
agent { label 'ubuntu-22 && immutable' }
when {
beforeAgent true
anyOf {
Expand Down
2 changes: 1 addition & 1 deletion .ci/beats-tester.groovy
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ pipeline {
}
stages {
stage('Filter build') {
agent { label 'ubuntu-20' }
agent { label 'ubuntu-22' }
when {
beforeAgent true
anyOf {
Expand Down
2 changes: 1 addition & 1 deletion .ci/build-docker-images.groovy
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
@Library('apm@current') _

pipeline {
agent { label 'ubuntu-20' }
agent { label 'ubuntu-22' }
environment {
REPO = 'beats'
BASE_DIR = "src/github.com/elastic/${env.REPO}"
Expand Down
2 changes: 1 addition & 1 deletion .ci/heartbeat-synthetics.groovy
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
@Library('apm@current') _

pipeline {
agent { label 'ubuntu-18 && immutable' }
agent { label 'ubuntu-22 && immutable' }
environment {
BASE_DIR = 'src/github.com/elastic/beats'
DOCKERELASTIC_SECRET = 'secret/observability-team/ci/docker-registry/prod'
Expand Down
2 changes: 1 addition & 1 deletion .ci/ironbank-validation.groovy
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
@Library('apm@current') _

pipeline {
agent { label 'ubuntu-20 && immutable' }
agent { label 'ubuntu-22 && immutable' }
environment {
REPO = 'beats'
BASE_DIR = "src/github.com/elastic/${env.REPO}"
Expand Down
4 changes: 2 additions & 2 deletions .ci/packaging.groovy
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ pipeline {
stages {
stage('Filter build') {
options { skipDefaultCheckout() }
agent { label 'ubuntu-20 && immutable' }
agent { label 'ubuntu-22 && immutable' }
when {
beforeAgent true
anyOf {
Expand Down Expand Up @@ -282,7 +282,7 @@ def generateArmStep(beat) {

def generateLinuxStep(beat) {
return {
withNode(labels: 'ubuntu-20.04 && immutable') {
withNode(labels: 'ubuntu-22.04 && immutable') {
withEnv(["HOME=${env.WORKSPACE}", "PLATFORMS=${linuxPlatforms()}", "BEATS_FOLDER=${beat}"]) {
withGithubNotify(context: "Packaging Linux ${beat}") {
deleteDir()
Expand Down
2 changes: 1 addition & 1 deletion Jenkinsfile
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
@Library('apm@current') _

pipeline {
agent { label 'ubuntu-18 && immutable' }
agent { label 'ubuntu-22 && immutable' }
environment {
AWS_ACCOUNT_SECRET = 'secret/observability-team/ci/elastic-observability-aws-account-auth'
AWS_REGION = "${params.awsRegion}"
Expand Down
2 changes: 1 addition & 1 deletion auditbeat/Jenkinsfile.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ when:
parameters: ## when parameter was selected in the UI.
- "auditbeat"
tags: true ## for all the tags
platform: "immutable && ubuntu-18" ## default label for all the stages
platform: "immutable && ubuntu-22" ## default label for all the stages
stages:
arm:
mage: "mage build unitTest"
Expand Down
2 changes: 1 addition & 1 deletion deploy/kubernetes/Jenkinsfile.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ when:
parameters: ## when parameter was selected in the UI.
- "kubernetes"
tags: true ## for all the tags
platform: "immutable && ubuntu-18" ## default label for all the stages
platform: "immutable && ubuntu-22" ## default label for all the stages
stages:
checks:
make: |
Expand Down
2 changes: 1 addition & 1 deletion filebeat/Jenkinsfile.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ when:
parameters: ## when parameter was selected in the UI.
- "filebeat"
tags: true ## for all the tags
platform: "immutable && ubuntu-18" ## default label for all the stages
platform: "immutable && ubuntu-22" ## default label for all the stages
stages:
arm:
mage: "mage build unitTest"
Expand Down
2 changes: 1 addition & 1 deletion heartbeat/Jenkinsfile.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ when:
parameters: ## when parameter was selected in the UI.
- "heartbeat"
tags: true ## for all the tags
platform: "immutable && ubuntu-18" ## default label for all the stages
platform: "immutable && ubuntu-22" ## default label for all the stages
stages:
arm:
mage: "mage build unitTest"
Expand Down
2 changes: 1 addition & 1 deletion libbeat/Jenkinsfile.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ when:
parameters: ## when parameter was selected in the UI.
- "libbeat"
tags: true ## for all the tags
platform: "immutable && ubuntu-18" ## default label for all the stages
platform: "immutable && ubuntu-22" ## default label for all the stages
stages:
arm:
mage: "mage build unitTest"
Expand Down
2 changes: 1 addition & 1 deletion metricbeat/Jenkinsfile.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ when:
parameters: ## when parameter was selected in the UI.
- "metricbeat"
tags: true ## for all the tags
platform: "immutable && ubuntu-18" ## default label for all the stages
platform: "immutable && ubuntu-22" ## default label for all the stages
stages:
unitTest:
mage: "mage build unitTest"
Expand Down
2 changes: 1 addition & 1 deletion packetbeat/Jenkinsfile.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ when:
parameters: ## when parameter was selected in the UI.
- "packetbeat"
tags: true ## for all the tags
platform: "immutable && ubuntu-18" ## default label for all the stages
platform: "immutable && ubuntu-22" ## default label for all the stages
stages:
arm:
mage: "mage build unitTest"
Expand Down
2 changes: 1 addition & 1 deletion winlogbeat/Jenkinsfile.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ when:
parameters: ## when parameter was selected in the UI.
- "winlogbeat"
tags: true ## for all the tags
platform: "immutable && ubuntu-18" ## default label for all the stages
platform: "immutable && ubuntu-22" ## default label for all the stages
stages:
crosscompile:
make: "make -C winlogbeat crosscompile"
Expand Down
2 changes: 1 addition & 1 deletion x-pack/auditbeat/Jenkinsfile.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ when:
parameters: ## when parameter was selected in the UI.
- "x-pack-auditbeat"
tags: true ## for all the tags
platform: "immutable && ubuntu-18" ## default label for all the stages
platform: "immutable && ubuntu-22" ## default label for all the stages
stages:
arm:
mage: "mage build unitTest"
Expand Down
2 changes: 1 addition & 1 deletion x-pack/dockerlogbeat/Jenkinsfile.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ when:
parameters: ## when parameter was selected in the UI.
- "x-pack-dockerlogbeat"
tags: true ## for all the tags
platform: "immutable && ubuntu-18" ## default label for all the stages
platform: "immutable && ubuntu-22" ## default label for all the stages
stages:
unitTest:
mage: "mage build unitTest"
Expand Down
2 changes: 1 addition & 1 deletion x-pack/filebeat/Jenkinsfile.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ when:
parameters: ## when parameter was selected in the UI.
- "x-pack-filebeat"
tags: true ## for all the tags
platform: "immutable && ubuntu-18" ## default label for all the stages
platform: "immutable && ubuntu-22" ## default label for all the stages
stages:
arm:
mage: "mage build unitTest"
Expand Down
2 changes: 1 addition & 1 deletion x-pack/functionbeat/Jenkinsfile.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ when:
parameters: ## when parameter was selected in the UI.
- "x-pack-functionbeat"
tags: true ## for all the tags
platform: "immutable && ubuntu-18" ## default label for all the stages
platform: "immutable && ubuntu-22" ## default label for all the stages
stages:
arm:
mage: "mage build unitTest"
Expand Down
2 changes: 1 addition & 1 deletion x-pack/heartbeat/Jenkinsfile.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ when:
parameters: ## when parameter was selected in the UI.
- "x-pack-heartbeat"
tags: true ## for all the tags
platform: "immutable && ubuntu-18" ## default label for all the stages
platform: "immutable && ubuntu-22" ## default label for all the stages
stages:
unitTest:
mage: "mage build unitTest"
Expand Down
2 changes: 1 addition & 1 deletion x-pack/libbeat/Jenkinsfile.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ when:
parameters: ## when parameter was selected in the UI.
- "x-pack-libbeat"
tags: true ## for all the tags
platform: "immutable && ubuntu-18" ## default label for all the stages
platform: "immutable && ubuntu-22" ## default label for all the stages
stages:
arm:
mage: "mage build unitTest"
Expand Down
2 changes: 1 addition & 1 deletion x-pack/metricbeat/Jenkinsfile.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ when:
parameters: ## when parameter was selected in the UI.
- "x-pack-metricbeat"
tags: true ## for all the tags
platform: "immutable && ubuntu-18" ## default label for all the stages
platform: "immutable && ubuntu-22" ## default label for all the stages
stages:
unitTest:
mage: "mage build unitTest"
Expand Down
2 changes: 1 addition & 1 deletion x-pack/osquerybeat/Jenkinsfile.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ when:
parameters: ## when parameter was selected in the UI.
- "x-pack-osquerybeat"
tags: true ## for all the tags
platform: "immutable && ubuntu-18" ## default label for all the stages
platform: "immutable && ubuntu-22" ## default label for all the stages
stages:
unitTest:
mage: "mage build unitTest"
Expand Down
2 changes: 1 addition & 1 deletion x-pack/packetbeat/Jenkinsfile.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ when:
parameters: ## when parameter was selected in the UI.
- "x-pack-packetbeat"
tags: true ## for all the tags
platform: "immutable && ubuntu-18" ## default label for all the stages
platform: "immutable && ubuntu-22" ## default label for all the stages
stages:
arm:
mage: "mage build unitTest"
Expand Down
2 changes: 1 addition & 1 deletion x-pack/winlogbeat/Jenkinsfile.yml
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ stages:
e2e:
enabled: false
platforms: ## override default labels in this specific stage.
- "immutable && ubuntu-18"
- "immutable && ubuntu-22"
stage: packaging
when:
branches: false ## Only on a PR basis for the time being
Expand Down

0 comments on commit a5f15b6

Please sign in to comment.