Unverified Commit bed9f3ff authored by shiyu1994's avatar shiyu1994 Committed by GitHub
Browse files

[ci] Upgrade Azure VMSS to use Mariner Linux (#6222)

* Update .vsts-ci.yml for Azure Pipelines

Upgrade Azure VM Scale Set to use Mariner (Azure Linux) systems.

* Update .vsts-ci.yml

* Update .vsts-ci.yml

* Update .vsts-ci.yml

* Update .vsts-ci.yml

* Update .vsts-ci.yml

* upgrade clang to clang-17

* add -y in apt install

* update name of mariner agent pool

* fix clang 17 compiler name

* apt update before install clang 17

* update libomp version for clang 17

* use clang-17 only for Mariner agents

* fix CXX and CC
parent 074b3e88
...@@ -54,6 +54,14 @@ else # Linux ...@@ -54,6 +54,14 @@ else # Linux
sudo apt-get install --no-install-recommends -y \ sudo apt-get install --no-install-recommends -y \
clang \ clang \
libomp-dev libomp-dev
elif [[ $COMPILER == "clang-17" ]]; then
sudo apt-get install wget
wget -qO- https://apt.llvm.org/llvm-snapshot.gpg.key | sudo tee /etc/apt/trusted.gpg.d/apt.llvm.org.asc
sudo apt-add-repository deb http://apt.llvm.org/jammy/ llvm-toolchain-jammy-17 main
sudo apt-add-repository deb-src http://apt.llvm.org/jammy/ llvm-toolchain-jammy-17 main
sudo apt-get update
sudo apt-get install -y clang-17
sudo apt-get install --no-install-recommends -y libomp-17-dev
fi fi
export LANG="en_US.UTF-8" export LANG="en_US.UTF-8"
......
...@@ -6,6 +6,9 @@ if [[ $OS_NAME == "macos" ]] && [[ $COMPILER == "gcc" ]]; then ...@@ -6,6 +6,9 @@ if [[ $OS_NAME == "macos" ]] && [[ $COMPILER == "gcc" ]]; then
elif [[ $OS_NAME == "linux" ]] && [[ $COMPILER == "clang" ]]; then elif [[ $OS_NAME == "linux" ]] && [[ $COMPILER == "clang" ]]; then
export CXX=clang++ export CXX=clang++
export CC=clang export CC=clang
elif [[ $OS_NAME == "linux" ]] && [[ $COMPILER == "clang-17" ]]; then
export CXX=clang++-17
export CC=clang-17
fi fi
if [[ $IN_UBUNTU_BASE_CONTAINER == "true" ]]; then if [[ $IN_UBUNTU_BASE_CONTAINER == "true" ]]; then
......
...@@ -34,7 +34,7 @@ jobs: ...@@ -34,7 +34,7 @@ jobs:
SETUP_CONDA: 'false' SETUP_CONDA: 'false'
OS_NAME: 'linux' OS_NAME: 'linux'
PRODUCES_ARTIFACTS: 'true' PRODUCES_ARTIFACTS: 'true'
pool: sh-ubuntu pool: sh-mariner
container: linux-artifact-builder container: linux-artifact-builder
strategy: strategy:
matrix: matrix:
...@@ -82,12 +82,12 @@ jobs: ...@@ -82,12 +82,12 @@ jobs:
- job: Linux_latest - job: Linux_latest
########################################### ###########################################
variables: variables:
COMPILER: clang COMPILER: clang-17
DEBIAN_FRONTEND: 'noninteractive' DEBIAN_FRONTEND: 'noninteractive'
IN_UBUNTU_BASE_CONTAINER: 'true' IN_UBUNTU_BASE_CONTAINER: 'true'
OS_NAME: 'linux' OS_NAME: 'linux'
SETUP_CONDA: 'true' SETUP_CONDA: 'true'
pool: sh-ubuntu pool: sh-mariner
container: ubuntu-latest container: ubuntu-latest
strategy: strategy:
matrix: matrix:
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment