From 73be6efb0b5c25425100821b96679b45b3feb4e6 Mon Sep 17 00:00:00 2001 From: Victor Martinez Date: Wed, 7 Apr 2021 13:06:02 +0100 Subject: [PATCH 1/2] CI: use ubuntu-18 --- .ci/beats-tester.groovy | 2 +- .ci/build-docker-images.groovy | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.ci/beats-tester.groovy b/.ci/beats-tester.groovy index 3650246e966..ba05d55c47b 100644 --- a/.ci/beats-tester.groovy +++ b/.ci/beats-tester.groovy @@ -24,7 +24,7 @@ pipeline { } stages { stage('Filter build') { - agent { label 'ubuntu && immutable' } + agent { label 'ubuntu-18 && immutable' } when { beforeAgent true anyOf { diff --git a/.ci/build-docker-images.groovy b/.ci/build-docker-images.groovy index 417e2fefae4..20cd65dce8a 100644 --- a/.ci/build-docker-images.groovy +++ b/.ci/build-docker-images.groovy @@ -3,7 +3,7 @@ @Library('apm@current') _ pipeline { - agent { label 'ubuntu-16 && immutable' } + agent { label 'ubuntu-18 && immutable' } environment { REPO = 'beats' BASE_DIR = "src/github.com/elastic/${env.REPO}" From 854dab9226e66e2d28009db9d77f6ea15090fc8c Mon Sep 17 00:00:00 2001 From: Victor Martinez Date: Wed, 7 Apr 2021 15:25:23 +0100 Subject: [PATCH 2/2] Apply suggestions from code review Co-authored-by: Ivan Fernandez Calvo --- .ci/beats-tester.groovy | 2 +- .ci/build-docker-images.groovy | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.ci/beats-tester.groovy b/.ci/beats-tester.groovy index ba05d55c47b..8d96fb1efea 100644 --- a/.ci/beats-tester.groovy +++ b/.ci/beats-tester.groovy @@ -24,7 +24,7 @@ pipeline { } stages { stage('Filter build') { - agent { label 'ubuntu-18 && immutable' } + agent { label 'ubuntu-20' } when { beforeAgent true anyOf { diff --git a/.ci/build-docker-images.groovy b/.ci/build-docker-images.groovy index 20cd65dce8a..a59aeb8da8f 100644 --- a/.ci/build-docker-images.groovy +++ b/.ci/build-docker-images.groovy @@ -3,7 +3,7 @@ @Library('apm@current') _ pipeline { - agent { label 'ubuntu-18 && immutable' } + agent { label 'ubuntu-20' } environment { REPO = 'beats' BASE_DIR = "src/github.com/elastic/${env.REPO}"