Skip to content

Commit 5fe0306

Browse files
v1vmergify[bot]
authored andcommitted
bk: use ubuntu 22.04 (#5123)
(cherry picked from commit fae7420) # Conflicts: # .buildkite/pipeline.package.mbp.yml
1 parent 25e8c8c commit 5fe0306

File tree

1 file changed

+5
-0
lines changed

1 file changed

+5
-0
lines changed

.buildkite/pipeline.package.mbp.yml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,15 @@
11
# yaml-language-server: $schema=https://raw.githubusercontent.com/buildkite/pipeline-schema/main/schema.json
22
name: "fleet server package mbp"
33
env:
4+
<<<<<<< HEAD
45
REPO: 'fleet-server'
56
DOCKER_REGISTRY: "docker.elastic.co"
67
IMAGE_UBUNTU_X86_64: "family/core-ubuntu-2004"
78
IMAGE_UBUNTU_ARM_64: "core-ubuntu-2004-aarch64"
9+
=======
10+
IMAGE_UBUNTU_X86_64: "family/core-ubuntu-2204"
11+
IMAGE_UBUNTU_ARM_64: "core-ubuntu-2204-aarch64"
12+
>>>>>>> fae7420 (bk: use ubuntu 22.04 (#5123))
813

914
# This section is used to define the plugins that will be used in the pipeline.
1015
# See https://buildkite.com/docs/pipelines/integrations/plugins/using#using-yaml-anchors-with-plugins

0 commit comments

Comments
 (0)