Skip to content

Commit 6dfe3b0

Browse files
committed
ci: test: Use CI Docker image on Linux
This commit updates the CI workflow test job to use the Zephyr CI Docker image (`docker-image`) on the Linux hosts mainly because many PyPI packages do not provide the ARM64 Linux wheels and need to be compiled during installation. It also removes the environment setup steps that are no longer necessary because the required components are already provided as part of the CI Docker image. Signed-off-by: Stephanos Ioannidis <[email protected]>
1 parent 49cc01b commit 6dfe3b0

File tree

1 file changed

+4
-18
lines changed

1 file changed

+4
-18
lines changed

.github/workflows/ci.yml

Lines changed: 4 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -287,7 +287,7 @@ jobs:
287287
MATRIX_TESTENVS+='{
288288
"name": "ubuntu-20.04-x86_64",
289289
"runner": "zephyr-runner-linux-x64-xlarge",
290-
"container": "",
290+
"container": "ghcr.io/zephyrproject-rtos/ci:master",
291291
"bundle-host": "linux-x86_64",
292292
"bundle-archive": "tar.xz"
293293
},'
@@ -297,7 +297,7 @@ jobs:
297297
MATRIX_TESTENVS+='{
298298
"name": "ubuntu-20.04-aarch64",
299299
"runner": "zephyr-runner-linux-arm64-xlarge",
300-
"container": "",
300+
"container": "ghcr.io/zephyrproject-rtos/ci:master",
301301
"bundle-host": "linux-aarch64",
302302
"bundle-archive": "tar.xz"
303303
},'
@@ -1238,6 +1238,7 @@ jobs:
12381238

12391239
steps:
12401240
- name: Set up Python
1241+
if: ${{ runner.os != 'Linux' }}
12411242
uses: actions/setup-python@v4
12421243
with:
12431244
# Force Python 3.10 because the twister is not compatible with a Python
@@ -1252,24 +1253,9 @@ jobs:
12521253
sudo rm -rf ${GITHUB_WORKSPACE}/*
12531254
shopt -u dotglob
12541255
1255-
# Add CMake APT repository
1256-
wget https://apt.kitware.com/kitware-archive.sh
1257-
sudo bash kitware-archive.sh
1258-
12591256
# Install required system packages
12601257
sudo apt-get update
1261-
sudo apt-get install -y ccache cmake device-tree-compiler dos2unix \
1262-
git gperf jq ninja-build wget
1263-
1264-
# Upgrade pip
1265-
python3 -m pip install --upgrade pip
1266-
1267-
# Install west
1268-
pip3 install --user --upgrade west
1269-
echo 'export PATH=~/.local/bin:"$PATH"' >> ~/.bashrc
1270-
1271-
# Install required Python packages
1272-
pip3 install --user --upgrade -r "${{ env.PYTHON_DEPS }}"
1258+
sudo apt-get install -y dos2unix jq
12731259
12741260
# Set environment variables
12751261
echo "TAR=tar" >> $GITHUB_ENV

0 commit comments

Comments
 (0)