Skip to content

Commit 64b5444

Browse files
authored
[7.17] [ci] Add Alma Linux 9 to matrix in packaging and platform jobs (#118331) (#118552)
* [ci] Add Alma Linux 9 to matrix in packaging and platform jobs (#118331) SmbTestContainer base image upgraded from Ubuntu 16.04 to 24.04 to avoid hanging Python module compilation when installing samba package. Installing SMB had to be moved from container building to starting because SYS_ADMIN capability is required. (cherry picked from commit a0f64d2) # Conflicts: # .buildkite/pipelines/pull-request/packaging-tests-unix.yml # x-pack/test/smb-fixture/build.gradle # x-pack/test/smb-fixture/src/main/java/org/elasticsearch/test/fixtures/smb/SmbTestContainer.java * Revert `use-ntvfs` removal This is reverted because Samba Ubuntu base image is not upgraded on 7.x branch
1 parent 95d3c21 commit 64b5444

File tree

5 files changed

+11
-59
lines changed

5 files changed

+11
-59
lines changed

.buildkite/pipelines/periodic-packaging.template.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@ steps:
2323
- rhel-8
2424
- rhel-9
2525
- almalinux-8
26+
- almalinux-9
2627
agents:
2728
provider: gcp
2829
image: family/elasticsearch-{{matrix.image}}

.buildkite/pipelines/periodic-packaging.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@ steps:
2424
- rhel-8
2525
- rhel-9
2626
- almalinux-8
27+
- almalinux-9
2728
agents:
2829
provider: gcp
2930
image: family/elasticsearch-{{matrix.image}}

.buildkite/pipelines/periodic-platform-support.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@ steps:
2323
- rhel-8
2424
- rhel-9
2525
- almalinux-8
26+
- almalinux-9
2627
agents:
2728
provider: gcp
2829
image: family/elasticsearch-{{matrix.image}}

.buildkite/pipelines/pull-request/packaging-tests-unix.yml

Lines changed: 8 additions & 59 deletions
Original file line numberDiff line numberDiff line change
@@ -3,65 +3,9 @@ config:
33
steps:
44
- group: packaging-tests-unix
55
steps:
6-
- label: "{{matrix.image}} / docker / packaging-tests-unix"
7-
key: "packaging-tests-unix-docker"
8-
command: ./.ci/scripts/packaging-test.sh destructiveDistroTest.docker
9-
timeout_in_minutes: 300
10-
matrix:
11-
setup:
12-
image:
13-
- debian-11
14-
- debian-12
15-
- opensuse-leap-15
16-
- oraclelinux-7
17-
- oraclelinux-8
18-
- sles-12
19-
- sles-15
20-
- ubuntu-1804
21-
- ubuntu-2004
22-
- ubuntu-2204
23-
- rocky-8
24-
- rocky-9
25-
- rhel-7
26-
- rhel-8
27-
- rhel-9
28-
- almalinux-8
29-
agents:
30-
provider: gcp
31-
image: family/elasticsearch-{{matrix.image}}
32-
diskSizeGb: 350
33-
machineType: custom-16-32768
34-
- label: "{{matrix.image}} / packages / packaging-tests-unix"
35-
key: "packaging-tests-unix-packages"
36-
command: ./.ci/scripts/packaging-test.sh destructiveDistroTest.packages
37-
timeout_in_minutes: 300
38-
matrix:
39-
setup:
40-
image:
41-
- debian-11
42-
- debian-12
43-
- opensuse-leap-15
44-
- oraclelinux-7
45-
- oraclelinux-8
46-
- sles-12
47-
- sles-15
48-
- ubuntu-1804
49-
- ubuntu-2004
50-
- ubuntu-2204
51-
- rocky-8
52-
- rocky-9
53-
- rhel-7
54-
- rhel-8
55-
- rhel-9
56-
- almalinux-8
57-
agents:
58-
provider: gcp
59-
image: family/elasticsearch-{{matrix.image}}
60-
diskSizeGb: 350
61-
machineType: custom-16-32768
62-
- label: "{{matrix.image}} / archives / packaging-tests-unix"
63-
key: "packaging-tests-unix-archives"
64-
command: ./.ci/scripts/packaging-test.sh destructiveDistroTest.archives
6+
- label: "{{matrix.image}} / {{matrix.PACKAGING_TASK}} / packaging-tests-unix"
7+
key: "packaging-tests-unix"
8+
command: ./.ci/scripts/packaging-test.sh destructiveDistroTest.{{matrix.PACKAGING_TASK}}
659
timeout_in_minutes: 300
6610
matrix:
6711
setup:
@@ -82,6 +26,11 @@ steps:
8226
- rhel-8
8327
- rhel-9
8428
- almalinux-8
29+
- almalinux-9
30+
PACKAGING_TASK:
31+
- docker
32+
- packages
33+
- archives
8534
agents:
8635
provider: gcp
8736
image: family/elasticsearch-{{matrix.image}}

x-pack/test/smb-fixture/src/main/resources/provision/installsmb.sh

100644100755
File mode changed.

0 commit comments

Comments
 (0)