Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Try to add AlmaLinux 9 #399

Merged
merged 9 commits into from
Jun 24, 2022
Merged

Try to add AlmaLinux 9 #399

merged 9 commits into from
Jun 24, 2022

Conversation

ashie
Copy link
Member

@ashie ashie commented Jun 16, 2022 •
edited

Fix #388

@ashie ashie mentioned this pull request Jun 16, 2022
Closed
@cosmo0920
Copy link
Contributor

cosmo0920 commented Jun 17, 2022 •
edited

We have to fix serverspec preparing script for AlmaLinux 9.

@ashie
Try to add AlmaLinux-9
91a92fd 
Signed-off-by: Takuro Ashie <ashie@clear-code.com>
@ashie
CI: Add AlmaLinux 9
e85e7df 
Signed-off-by: Takuro Ashie <ashie@clear-code.com>
@ashie
yum: Don't install curl if curl-minimal is already installed in serve…
b269a5c 
…rspec-test.sh

Fix the following error:
https://github.com/fluent/fluent-package-builder/runs/6963197435?check_suite_focus=true
```
Error:
 Problem: problem with installed package curl-minimal-7.76.1-14.el9.x86_64
  - package curl-minimal-7.76.1-14.el9.x86_64 conflicts with curl provided by curl-7.76.1-14.el9.x86_64
  - conflicting requests
```

Signed-off-by: Takuro Ashie <ashie@clear-code.com>
@ashie
yum: Disable kafka test for AlmaLinux 9
25893a9 
The kafka package for RHEL 9 isn't released yet.

Signed-off-by: Takuro Ashie <ashie@clear-code.com>
@ashie
yum: Add almalinux to binstub test
8ce0733 
Signed-off-by: Takuro Ashie <ashie@clear-code.com>
@ashie
yum: Ignore rpmlint error "E: env-script-interpreter"
31fa9bc 
Many gems include such shebang but it's expected for us since we use our
own ruby interpreter with additional `PATH`.

```
td-agent.x86_64: E: env-script-interpreter /opt/td-agent/lib/ruby/gems/3.1.0/gems/fluentd-1.14.6/bin/fluentd /usr/bin/env ruby
This script uses 'env' as an interpreter. For the rpm runtime dependency
detection to work, the shebang #!/usr/bin/env python  needs to be patched into
dependency on /usr/bin/env rather than the actual interpreter /usr/bin/python.
Alternatively, if the file should not be executed, then ensure that it is not
marked as executable or don't install it in a path that is reserved for
executables.
```

Signed-off-by: Takuro Ashie <ashie@clear-code.com>
@ashie
yum: Suppress a warning of rpmlint
c6f7d93 
```
warning: File listed twice: /opt/td-agent/share/td-agent.conf.tmpl
```

Signed-off-by: Takuro Ashie <ashie@clear-code.com>
@ashie
Add almalinux-9 to default YUM_TARGETS
9487aeb 
Signed-off-by: Takuro Ashie <ashie@clear-code.com>
@ashie ashie marked this pull request as ready for review June 21, 2022 06:12
@ashie
Copy link
Member Author

ashie commented Jun 21, 2022

We have to fix serverspec preparing script for AlmaLinux 9.

Fixed. CI is passed with some more fixes.
I'm now checking the built package.

@ashie
Copy link
Member Author

ashie commented Jun 21, 2022 

$ rpm -q --requires td-agent | sort | uniq
/bin/bash
/bin/sh
/usr/bin/env
/usr/bin/getent
/usr/sbin/adduser
config(td-agent) = 4.3.1.1-1.el9
ld-linux-x86-64.so.2()(64bit)
ld-linux-x86-64.so.2(GLIBC_2.2.5)(64bit)
ld-linux-x86-64.so.2(GLIBC_2.3)(64bit)
libc.so.6()(64bit)
libc.so.6(GLIBC_2.10)(64bit)
libc.so.6(GLIBC_2.14)(64bit)
libc.so.6(GLIBC_2.16)(64bit)
libc.so.6(GLIBC_2.17)(64bit)
libc.so.6(GLIBC_2.2.5)(64bit)
libc.so.6(GLIBC_2.25)(64bit)
libc.so.6(GLIBC_2.27)(64bit)
libc.so.6(GLIBC_2.28)(64bit)
libc.so.6(GLIBC_2.3)(64bit)
libc.so.6(GLIBC_2.3.2)(64bit)
libc.so.6(GLIBC_2.3.4)(64bit)
libc.so.6(GLIBC_2.32)(64bit)
libc.so.6(GLIBC_2.33)(64bit)
libc.so.6(GLIBC_2.34)(64bit)
libc.so.6(GLIBC_2.4)(64bit)
libc.so.6(GLIBC_2.6)(64bit)
libc.so.6(GLIBC_2.7)(64bit)
libc.so.6(GLIBC_2.8)(64bit)
libc.so.6(GLIBC_2.9)(64bit)
libcrypt.so.2()(64bit)
libcrypt.so.2(XCRYPT_2.0)(64bit)
libcrypto.so.3()(64bit)
libcrypto.so.3(OPENSSL_3.0.0)(64bit)
libedit.so.0()(64bit)
libm.so.6()(64bit)
libm.so.6(GLIBC_2.2.5)(64bit)
libm.so.6(GLIBC_2.29)(64bit)
libncurses.so.6()(64bit)
libsasl2.so.3()(64bit)
libssl.so.3()(64bit)
libssl.so.3(OPENSSL_3.0.0)(64bit)
libtinfo.so.6()(64bit)
libyaml-0.so.2()(64bit)
libz.so.1()(64bit)
libz.so.1(ZLIB_1.2.0)(64bit)
libz.so.1(ZLIB_1.2.2)(64bit)
rpmlib(CompressedFileNames) <= 3.0.4-1
rpmlib(FileDigests) <= 4.6.0-1
rpmlib(PayloadFilesHavePrefix) <= 4.0-1
rpmlib(PayloadIsZstd) <= 5.4.18-1
rtld(GNU_HASH)
systemd

$ rpm -q --provides td-agent
config(td-agent) = 4.3.1.1-1.el9
td-agent = 4.3.1.1-1.el9
td-agent(x86-64) = 4.3.1.1-1.el9

@ashie
Copy link
Member Author

ashie commented Jun 21, 2022

Works fine on RHEL 9.

@ashie ashie requested a review from kenhys June 21, 2022 14:01
@ashie
convert-artifacts-layout.sh: Add almalinux
1c2dc77 
Signed-off-by: Takuro Ashie <ashie@clear-code.com>
@ashie
Copy link
Member Author

ashie commented Jun 24, 2022

We are going to release the td-agent package for RHEL9 as td-agent 4.3.2 at the end of this month.

@ashie ashie merged commit c171365 into master Jun 24, 2022
@ashie ashie deleted the almalinux-9 branch June 24, 2022 02:21
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@cosmo0920 cosmo0920 cosmo0920 left review comments

@kenhys kenhys Awaiting requested review from kenhys

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

Support RHEL9
2 participants
@ashie @cosmo0920