[ci] Add Alma Linux 9 to matrix in packaging and platform jobs #118331
+29
−7
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Upgraded SmbTestContainer base image 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 the starting because SYS_ADMIN capability is required.
jozala
force-pushed
the
ci-pipelines-add-almalinux-9
branch
from
1237fa8 to
2035fb0
Compare
jozala
commented
Dec 11, 2024
| public final class SmbTestContainer extends DockerEnvironmentAwareTestContainer { | ||
|
|
||
| private static final String DOCKER_BASE_IMAGE = "ubuntu:16.04"; | ||
| private static final String DOCKER_BASE_IMAGE = "ubuntu:24.04"; |
There was a problem hiding this comment.
There is a problem with installation of Samba in Ubuntu 16.04 on specific Docker configuration. The installation hangs on some Python modules compilation.
Python modules compilation hangs because in RHEL9-based distros, during Docker build, ulimit set to unlimited. This is hard to change so instead I've decided to upgrade Ubuntu image to avoid this problem.
jozala
commented
Dec 11, 2024
| .copy("fixture/provision/installsmb.sh", "/fixture/provision/installsmb.sh") | ||
| .copy("fixture/certs/ca.key", "/fixture/certs/ca.key") | ||
| .copy("fixture/certs/ca.pem", "/fixture/certs/ca.pem") | ||
| .copy("fixture/certs/cert.pem", "/fixture/certs/cert.pem") | ||
| .copy("fixture/certs/key.pem", "/fixture/certs/key.pem") | ||
| .run("chmod +x /fixture/provision/installsmb.sh") | ||
| .run("/fixture/provision/installsmb.sh") | ||
| .cmd("service samba-ad-dc restart && sleep infinity") | ||
| .cmd("/fixture/provision/installsmb.sh && service samba-ad-dc restart && echo Samba started && sleep infinity") |
There was a problem hiding this comment.
Samba configuration script has been moved from building to starting the container, because it requires SYS_ADMIN capabilities to run in Ubuntu:24.04 image (capability has been added below). It's not possible to add the capability during the build phase.
jozala
commented
Dec 11, 2024
Comment on lines
+50
to
+54
| setWaitStrategy( | ||
| new WaitAllStrategy().withStartupTimeout(Duration.ofSeconds(120)) | ||
| .withStrategy(Wait.forLogMessage(".*Samba started.*", 1)) | ||
| .withStrategy(Wait.forListeningPort()) | ||
| ); |
There was a problem hiding this comment.
Wait strategy needed now since the Samba configuration script has been moved from building the container to starting it.
jozala
commented
Dec 11, 2024
| @@ -21,7 +21,7 @@ cat $SSL_DIR/ca.pem >> /etc/ssl/certs/ca-certificates.crt | |||
|
|
|||
| mv /etc/samba/smb.conf /etc/samba/smb.conf.orig | |||
|
|
|||
| samba-tool domain provision --server-role=dc --use-rfc2307 --dns-backend=SAMBA_INTERNAL --realm=AD.TEST.ELASTICSEARCH.COM --domain=ADES --adminpass=Passw0rd --use-ntvfs | |||
| samba-tool domain provision --server-role=dc --use-rfc2307 --dns-backend=SAMBA_INTERNAL --realm=AD.TEST.ELASTICSEARCH.COM --domain=ADES --adminpass=Passw0rd | |||
There was a problem hiding this comment.
ntvfs is no longer available in newer versions of Samba (info)
elasticsearchmachine
added
the
needs:triage
jozala
added
>non-issue
:Delivery/Build
|
Pinging @elastic/es-delivery (Team:Delivery) |
breskeby
approved these changes
Dec 12, 2024
💔 Backport failed
You can use sqren/backport to manually backport by running |
jozala
added a commit
to jozala/elasticsearch
that referenced
this pull request
Dec 12, 2024
…ic#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
💚 All backports created successfully
Questions ?Please refer to the Backport tool documentation |
elasticsearchmachine
pushed a commit
that referenced
this pull request
Dec 12, 2024
…) (#118550) 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
elasticsearchmachine
pushed a commit
that referenced
this pull request
Dec 12, 2024
…#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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
No description provided.