-
Notifications
You must be signed in to change notification settings - Fork 47
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.
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
Add AlmaLinux support #98
base: master
Are you sure you want to change the base?
Conversation
* Add AlmaLinux support * Fix default page on AL9
@carlosrodfern @AdamSaleh Could you please check this PR? |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Overall looks OK to me. I think in general, if we want t_functional to be useful in other places we may want to start factoring as much OS specific things into the initialization steps.
The Stream team may need to take a closer look to be sure this works properly in the CentOS Stream test harnesses.
|
||
file /etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS* >/dev/null 2>&1 && \ | ||
file /etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-Security* >/dev/null 2>&1 | ||
if [[ $is_almalinux == "yes" ]]; then |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Can we use $os_name here instead of hard-coding the paths?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Ok, I will try to use this way
@@ -5,9 +5,15 @@ t_Log "Running $0 - Verifying that grub2-efi is correctly signed with correct c | |||
|
|||
arch=$(uname -m) | |||
|
|||
signing_key='CentOS Secure Boot Signing 202' |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Can we factor these into their own vars in 0_lib?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Do we really should put it to 0_lib?
I used it only for reusable vars, but this signing_key
var is used only in this file
if [[ $is_almalinux == "yes" ]]; then | ||
key="AlmaLinux ${id} signing key" | ||
else | ||
key="CentOS \(Linux \)\?${id} signing key" |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Same thing here, we might want to factor the OS-related vars into their own groups in 0_lib
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Same as in previous
@eabdullin1 so, I have tested this on x86 vm on against stable composes of CentOS Stream 8 and 9, it looks it doesn't interfere with any of our tests, so if you'd do those few refactors Brian suggested, we should have no problems merging it. I think, w.r.t. those vars that are specific to single files (key, singing_key, e.t.c), sometimes you can make test more generic, i.e. instead of
you could use something like
For things that are harder to do like this, we would still prefer to have them in one place, so that we can see where we diverge and the rest of the tests are not populated by vendor-specific special cases. We don't mind it is only used once. Still will prefer to see all of these somewhere top-level in the 0_lib/functions.sh file. After that is done I would run it in more of our testing environments and after that works, I think we are good to go. |
Ok, thank you for the reply, will fix it |
@AdamSaleh , |
Move variables from local files to functions.sh
@AdamSaleh @carlosrodfern Guys, can you please take a look? |
@eabdullin1 , For example, in the
Then,
... or something along those lines. |
@carlosrodfern
|
@eabdullin1 , More than the case/esac, the most important point is the removal of distro specific variable naming outside of
|
@carlosrodfern Sorry for the huge delay, I updated functions.sh, please review it) |
@eabdullin1, It will increase the ability of AlmaLinux to reuse tests and contribute if AlmaLinux migrates to |
Hello!
These changes add support for AlmaLinux.
We have successfully tested it on AlmaLinux versions 8 and 9, as well as CentOS 8 Stream and CentOS 9 Stream, and can confirm that everything is working as expected.
Going forward, our plan is to continue to contribute to this project. Specifically, we aim to add more tests to ensure robustness and reliability.
Thank you for your continued support.