Skip to content

Commit d09ca4b

Browse files
ryanhagen-tmoryanhagen-tmo
committed
workflows main sync with tmo-main
1 parent 671d8e5 commit d09ca4b

9 files changed

+42
-32
lines changed

‎.github/workflows/bluetooth-tests.yaml

Lines changed: 6 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,8 @@ on:
66
- ".github/workflows/bluetooth-test*.yaml"
77
- "west.yml"
88
- "subsys/bluetooth/**"
9-
- "tests/bluetooth/bsim_bt/**"
9+
- "tests/bsim/bluetooth/**"
10+
- "samples/bluetooth/**"
1011
- "boards/posix/**"
1112
- "soc/posix/**"
1213
- "arch/posix/**"
@@ -20,13 +21,13 @@ jobs:
2021
if: github.repository_owner == 'zephyrproject-rtos'
2122
runs-on: zephyr-runner-linux-x64-4xlarge
2223
container:
23-
image: ghcr.io/zephyrproject-rtos/ci:v0.24.6
24+
image: ghcr.io/zephyrproject-rtos/ci:v0.25.1
2425
options: '--entrypoint /bin/bash'
2526
volumes:
2627
- /repo-cache/zephyrproject:/github/cache/zephyrproject
2728
env:
2829
ZEPHYR_TOOLCHAIN_VARIANT: zephyr
29-
ZEPHYR_SDK_INSTALL_DIR: /opt/toolchains/zephyr-sdk-0.15.2
30+
ZEPHYR_SDK_INSTALL_DIR: /opt/toolchains/zephyr-sdk-0.16.0
3031
BSIM_OUT_PATH: /opt/bsim/
3132
BSIM_COMPONENTS_PATH: /opt/bsim/components
3233
EDTT_PATH: ../tools/edtt
@@ -66,18 +67,12 @@ jobs:
6667
west update --path-cache /github/cache/zephyrproject 2>&1 1> west.update.log || west update --path-cache /github/cache/zephyrproject 2>&1 1> west.update.log || ( rm -rf ../modules ../bootloader ../tools && west update --path-cache /github/cache/zephyrproject)
6768
west forall -c 'git reset --hard HEAD'
6869
69-
- name: Install parallel
70-
run: |
71-
sudo apt-get update
72-
sudo apt-get install -y parallel
73-
parallel --version
74-
7570
- name: Run Bluetooth Tests with BSIM
7671
run: |
7772
export ZEPHYR_BASE=${PWD}
78-
WORK_DIR=${ZEPHYR_BASE}/bsim_bt_out tests/bluetooth/bsim_bt/compile.sh
73+
WORK_DIR=${ZEPHYR_BASE}/bsim_bt_out tests/bsim/compile.sh
7974
RESULTS_FILE=${ZEPHYR_BASE}/${bsim_bt_test_results_file} \
80-
SEARCH_PATH=tests/bluetooth/bsim_bt/ tests/bluetooth/bsim_bt/run_parallel.sh
75+
SEARCH_PATH=tests/bsim/ tests/bsim/run_parallel.sh
8176
8277
- name: Upload Test Results
8378
if: always()

‎.github/workflows/clang.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ jobs:
1111
if: github.repository_owner == 'zephyrproject-rtos'
1212
runs-on: zephyr-runner-linux-x64-4xlarge
1313
container:
14-
image: ghcr.io/zephyrproject-rtos/ci:v0.24.6
14+
image: ghcr.io/zephyrproject-rtos/ci:v0.25.1
1515
options: '--entrypoint /bin/bash'
1616
volumes:
1717
- /repo-cache/zephyrproject:/github/cache/zephyrproject
@@ -20,7 +20,7 @@ jobs:
2020
matrix:
2121
platform: ["native_posix"]
2222
env:
23-
ZEPHYR_SDK_INSTALL_DIR: /opt/toolchains/zephyr-sdk-0.15.2
23+
ZEPHYR_SDK_INSTALL_DIR: /opt/toolchains/zephyr-sdk-0.16.0
2424
LLVM_TOOLCHAIN_PATH: /usr/lib/llvm-15
2525
COMMIT_RANGE: ${{ github.event.pull_request.base.sha }}..${{ github.event.pull_request.head.sha }}
2626
BASE_REF: ${{ github.base_ref }}

‎.github/workflows/codecov.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ jobs:
1313
if: github.repository == 'zephyrproject-rtos/zephyr'
1414
runs-on: zephyr-runner-linux-x64-4xlarge
1515
container:
16-
image: ghcr.io/zephyrproject-rtos/ci:v0.24.6
16+
image: ghcr.io/zephyrproject-rtos/ci:v0.25.1
1717
options: '--entrypoint /bin/bash'
1818
volumes:
1919
- /repo-cache/zephyrproject:/github/cache/zephyrproject
@@ -22,7 +22,7 @@ jobs:
2222
matrix:
2323
platform: ["native_posix", "qemu_x86", "unit_testing"]
2424
env:
25-
ZEPHYR_SDK_INSTALL_DIR: /opt/toolchains/zephyr-sdk-0.15.2
25+
ZEPHYR_SDK_INSTALL_DIR: /opt/toolchains/zephyr-sdk-0.16.0
2626
steps:
2727
- name: Apply container owner mismatch workaround
2828
run: |

‎.github/workflows/coding_guidelines.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ jobs:
1212
with:
1313
ref: ${{ github.event.pull_request.head.sha }}
1414
fetch-depth: 0
15+
1516
- name: cache-pip
1617
uses: actions/cache@v3
1718
with:

‎.github/workflows/doc-build.yml

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ on:
2626

2727
env:
2828
# NOTE: west docstrings will be extracted from the version listed here
29-
WEST_VERSION: 1.0.0a1
29+
WEST_VERSION: 1.0.0
3030
# The latest CMake available directly with apt is 3.18, but we need >=3.20
3131
# so we fetch that through pip.
3232
CMAKE_VERSION: 3.20.5
@@ -130,14 +130,20 @@ jobs:
130130
- name: install-pkgs
131131
run: |
132132
apt-get update
133-
apt-get install -y python3-pip ninja-build doxygen graphviz librsvg2-bin
133+
apt-get install -y python3-pip python3-venv ninja-build doxygen graphviz librsvg2-bin
134134
135135
- name: cache-pip
136136
uses: actions/cache@v3
137137
with:
138138
path: ~/.cache/pip
139139
key: pip-${{ hashFiles('scripts/requirements-doc.txt') }}
140140

141+
- name: setup-venv
142+
run: |
143+
python3 -m venv .venv
144+
. .venv/bin/activate
145+
echo PATH=$PATH >> $GITHUB_ENV
146+
141147
- name: install-pip
142148
run: |
143149
pip3 install -U setuptools wheel pip

‎.github/workflows/errno.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,9 @@ jobs:
1010
check-errno:
1111
runs-on: ubuntu-20.04
1212
container:
13-
image: ghcr.io/zephyrproject-rtos/ci:v0.24.6
13+
image: ghcr.io/zephyrproject-rtos/ci:v0.25.0
1414
env:
15-
ZEPHYR_SDK_INSTALL_DIR: /opt/toolchains/zephyr-sdk-0.15.2
15+
ZEPHYR_SDK_INSTALL_DIR: /opt/toolchains/zephyr-sdk-0.16.0
1616

1717
steps:
1818
- name: Apply container owner mismatch workaround

‎.github/workflows/footprint-tracking.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,12 +22,12 @@ jobs:
2222
runs-on: ubuntu-20.04
2323
if: github.repository == 'zephyrproject-rtos/zephyr'
2424
container:
25-
image: ghcr.io/zephyrproject-rtos/ci:v0.24.6
25+
image: ghcr.io/zephyrproject-rtos/ci:v0.25.0
2626
options: '--entrypoint /bin/bash'
2727
strategy:
2828
fail-fast: false
2929
env:
30-
ZEPHYR_SDK_INSTALL_DIR: /opt/toolchains/zephyr-sdk-0.15.2
30+
ZEPHYR_SDK_INSTALL_DIR: /opt/toolchains/zephyr-sdk-0.16.0
3131
ZEPHYR_TOOLCHAIN_VARIANT: zephyr
3232
steps:
3333
- name: Apply container owner mismatch workaround

‎.github/workflows/footprint.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,12 +11,12 @@ jobs:
1111
runs-on: ubuntu-20.04
1212
if: github.repository == 'zephyrproject-rtos/zephyr'
1313
container:
14-
image: ghcr.io/zephyrproject-rtos/ci:v0.24.6
14+
image: ghcr.io/zephyrproject-rtos/ci:v0.25.0
1515
options: '--entrypoint /bin/bash'
1616
strategy:
1717
fail-fast: false
1818
env:
19-
ZEPHYR_SDK_INSTALL_DIR: /opt/toolchains/zephyr-sdk-0.15.2
19+
ZEPHYR_SDK_INSTALL_DIR: /opt/toolchains/zephyr-sdk-0.16.0
2020
ZEPHYR_TOOLCHAIN_VARIANT: zephyr
2121
steps:
2222
- name: Apply container owner mismatch workaround

‎.github/workflows/twister.yaml

Lines changed: 17 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ jobs:
2222
if: github.repository_owner == 'zephyrproject-rtos'
2323
runs-on: zephyr-runner-linux-x64-4xlarge
2424
container:
25-
image: ghcr.io/zephyrproject-rtos/ci:v0.24.6
25+
image: ghcr.io/zephyrproject-rtos/ci:v0.25.1
2626
options: '--entrypoint /bin/bash'
2727
volumes:
2828
- /repo-cache/zephyrproject:/github/cache/zephyrproject
@@ -34,7 +34,9 @@ jobs:
3434
MATRIX_SIZE: 10
3535
PUSH_MATRIX_SIZE: 15
3636
DAILY_MATRIX_SIZE: 80
37-
ZEPHYR_SDK_INSTALL_DIR: /opt/toolchains/zephyr-sdk-0.15.2
37+
ZEPHYR_SDK_INSTALL_DIR: /opt/toolchains/zephyr-sdk-0.16.0
38+
BSIM_OUT_PATH: /opt/bsim/
39+
BSIM_COMPONENTS_PATH: /opt/bsim/components
3840
TESTS_PER_BUILDER: 700
3941
COMMIT_RANGE: ${{ github.event.pull_request.base.sha }}..${{ github.event.pull_request.head.sha }}
4042
BASE_REF: ${{ github.base_ref }}
@@ -118,7 +120,7 @@ jobs:
118120
needs: twister-build-prep
119121
if: needs.twister-build-prep.outputs.size != 0
120122
container:
121-
image: ghcr.io/zephyrproject-rtos/ci:v0.24.6
123+
image: ghcr.io/zephyrproject-rtos/ci:v0.25.1
122124
options: '--entrypoint /bin/bash'
123125
volumes:
124126
- /repo-cache/zephyrproject:/github/cache/zephyrproject
@@ -127,7 +129,9 @@ jobs:
127129
matrix:
128130
subset: ${{fromJSON(needs.twister-build-prep.outputs.subset)}}
129131
env:
130-
ZEPHYR_SDK_INSTALL_DIR: /opt/toolchains/zephyr-sdk-0.15.2
132+
ZEPHYR_SDK_INSTALL_DIR: /opt/toolchains/zephyr-sdk-0.16.0
133+
BSIM_OUT_PATH: /opt/bsim/
134+
BSIM_COMPONENTS_PATH: /opt/bsim/components
131135
TWISTER_COMMON: ' --force-color --inline-logs -v -N -M --retry-failed 3 '
132136
DAILY_OPTIONS: ' -M --build-only --all --show-footprint'
133137
PR_OPTIONS: ' --clobber-output --integration'
@@ -267,8 +271,8 @@ jobs:
267271
twister-test-results:
268272
name: "Publish Unit Tests Results"
269273
env:
270-
OPENSEARCH_USER: ${{ secrets.OPENSEARCH_USER }}
271-
OPENSEARCH_PASS: ${{ secrets.OPENSEARCH_PASS }}
274+
ELASTICSEARCH_KEY: ${{ secrets.ELASTICSEARCH_KEY }}
275+
ELASTICSEARCH_SERVER: "https://elasticsearch.zephyrproject.io:443"
272276
needs: twister-build
273277
runs-on: ubuntu-20.04
274278
# the build-and-test job might be skipped, we don't need to run this job then
@@ -291,11 +295,15 @@ jobs:
291295
- if: github.event_name == 'push' || github.event_name == 'schedule'
292296
name: Upload to opensearch
293297
run: |
294-
pip3 install opensearch-py
298+
pip3 install elasticsearch
299+
# set run date on upload to get consistent and unified data across the matrix.
300+
run_date=`date --iso-8601=minutes`
295301
if [ "${{github.event_name}}" = "push" ]; then
296-
python3 ./scripts/ci/upload_test_results.py --index zephyr-main-2 artifacts/*/*/twister.json
302+
python3 ./scripts/ci/upload_test_results_es.py -r ${run_date} \
303+
--index zephyr-main-ci-push-1 artifacts/*/*/twister.json
297304
elif [ "${{github.event_name}}" = "schedule" ]; then
298-
python3 ./scripts/ci/upload_test_results.py --index zephyr-weekly artifacts/*/*/twister.json
305+
python3 ./scripts/ci/upload_test_results_es.py -r ${run_date} \
306+
--index zephyr-main-ci-weekly-1 artifacts/*/*/twister.json
299307
fi
300308
301309
- name: Merge Test Results

0 commit comments

Comments
 (0)