Add Mariner2.0 #350
Add Mariner2.0 #350
Conversation
yakovdyadkin
force-pushed
the
yakovdyadkin/mariner2.0-pr
branch
from
95383b5 to
185d062
Compare
| @@ -63,6 +78,13 @@ then | |||
| rmmod nvidia_peermem | |||
| fi | |||
|
|
|||
| # Mariner only | |||
| if lsmod | grep nv_peer_mem &> /dev/null | |||
There was a problem hiding this comment.
is this only for certain SKUs? or all SKUs?
| @@ -12,6 +12,10 @@ find_distro() { | |||
| then | |||
| local ubuntu_distro=`find_ubuntu_distro` | |||
| echo "${os} ${ubuntu_distro}" | |||
| elif [[ $os == "Common Base Linux Mariner" ]] | |||
There was a problem hiding this comment.
This seems very specific. Is $DISTRIBUTION in scope at this point? If so, can we use that rather than reparsing the OS in a different way, and use fuzzy matching?
There was a problem hiding this comment.
Starting from release 2.0.20240301, Common Base Linux Mariner (CBL-Mariner) is rebranded as Azure Linux. Users may not see the word "Mariner" as the OS name -- we need to consider this in our OS name matching.
In our code, we can still call it Mariner, like the function find_mariner_distro() can be kept as is (for simplicity), but we need to be careful in the OS name matching here, as the word "Mariner" may not appear in any forms in the OS.
Currently, the VM OS info shown still says Mariner:
litan2@litan2southcentralusk-mariner-mofed [ ~ ]$ cat /etc/os-release
NAME="Common Base Linux Mariner"
VERSION="2.0.20240425"
ID=mariner
VERSION_ID="2.0"
PRETTY_NAME="CBL-Mariner/Linux"
ANSI_COLOR="1;34"
HOME_URL="https://aka.ms/cbl-mariner"
BUG_REPORT_URL="https://aka.ms/cbl-mariner"
SUPPORT_URL="https://aka.ms/cbl-mariner"
But this may change in the future, as the rebranding progresses -- we need to keep an eye on when it's updated.
As I can see from the above official homepage of Mariner (https://aka.ms/cbl-mariner), the GitHub repo name has been changed, but not yet in the README.
| # Find Mariner distro | ||
| find_mariner_distro() { | ||
| echo $(cat /etc/os-release | awk 'match($0, /^VERSION_ID="(.*)"/, result) { print result[1] }') | ||
| } |
There was a problem hiding this comment.
Same as above. Can we use $DISTRIBUTION rather than these functions?
| @@ -26,7 +26,13 @@ then | |||
| fi | |||
|
|
|||
| ## load nvidia-peermem module | |||
| modprobe nvidia-peermem | |||
| os=$(cat /etc/os-release | grep "^ID=" | awk -F"=" '{print $NF}') | |||
There was a problem hiding this comment.
Ok, I really don't know if it's in scope for these customization files, but same question about $DISTRIBUTION
| # Kernel | ||
| export KERNEL=$(rpm -q kernel | sed 's/kernel\-//g') | ||
|
|
||
| $COMMON_DIR/write_component_version.sh "distribution" $DISTRIBUTION |
There was a problem hiding this comment.
interesting. I think i'm doing this in the build pipeline. Do you think it's a better idea here?
| tarball="MLNX_OFED_SRC-$mofed_version.tgz" | ||
| mofed_download_url=https://www.mellanox.com/downloads/ofed/MLNX_OFED-$mofed_version/$tarball | ||
| mofed_folder=$(basename $mofed_download_url .tgz) | ||
| kernel_without_arch="${KERNEL%.*}" |
There was a problem hiding this comment.
it doesn't look like this gets used anymore. At one point i think it was needed either in the download file name or a compile switch.
| tdnf repolist | ||
|
|
||
| # Install Kernel dependencies | ||
| tdnf install -y kernel-headers-$(uname -r) \ |
There was a problem hiding this comment.
This is a case where I thought you might use $KERNEL (though i don't know if it's the same format)
| # tdnf install -y pssh-$pssh_version.el8.noarch.rpm | ||
| # rm -f pssh-$pssh_version.el8.noarch.rpm | ||
|
|
||
| tdnf install -y python3-devel \ |
There was a problem hiding this comment.
have we re-evaluated these since removing spack?
| rm -rf ./packages.microsoft.com/ | ||
|
|
||
| # Create alias for "ls -l" | ||
| echo "alias ll='ls -l'" | tee -a /etc/bash.bashrc |
There was a problem hiding this comment.
What about azcopy and the kvp client? Or are those installed elsewhere?
Add customization scripts for CBL-Mariner2.0
TODO: add more detail.