Skip to content

Commit 2fa70b0

Browse files
authored
{CI} Use Ubuntu 24.04 on ARM agent (#31158)
1 parent ed7f981 commit 2fa70b0

File tree

3 files changed

+7
-10
lines changed

3 files changed

+7
-10
lines changed

.azure-pipelines/templates/variables.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,5 +2,5 @@ variables:
22
ubuntu_pool: 'pool-ubuntu-2204'
33
ubuntu_multi_core_pool: 'pool-ubuntu-latest-multi-core'
44
windows_pool: 'pool-windows-2019'
5-
ubuntu_arm64_pool: 'ubuntu-arm64-2004-pool'
5+
ubuntu_arm64_pool: 'pool-ubuntu-latest-arm64'
66
macos_pool: 'macOS-14'

azure-pipelines.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ parameters:
3030
pool: pool-ubuntu-latest-multi-core
3131
- name: ARM64
3232
value: arm64
33-
pool: ubuntu-arm64-2004-pool
33+
pool: pool-ubuntu-latest-arm64
3434

3535
jobs:
3636
- job: CheckPullRequest

scripts/ci/install_docker.sh

Lines changed: 5 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,8 @@ if [[ $(dpkg --print-architecture) == "amd64" ]]; then
55
echo "Docker is already installed on AMD64"
66
exit 0
77
fi
8-
# https://docs.docker.com/engine/security/rootless/
9-
/bin/bash -c "$(curl -fsSL https://get.docker.com)"
10-
sudo apt-get install -y uidmap
11-
dockerd-rootless-setuptool.sh install
12-
export XDG_RUNTIME_DIR=/home/cloudtest/.docker/run
13-
PATH=/usr/bin:/sbin:/usr/sbin:$PATH dockerd-rootless.sh &
14-
sleep 5
15-
docker context use rootless
8+
9+
# https://docs.docker.com/engine/install/ubuntu/#install-using-the-convenience-script
10+
curl -fsSL https://get.docker.com -o get-docker.sh
11+
sudo sh ./get-docker.sh
12+
sudo chmod 666 /var/run/docker.sock

0 commit comments

Comments
 (0)