Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Repair GH pipeline: QA integration tests for samples is broken #250

Merged
merged 3 commits into from
Jul 13, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 6 additions & 9 deletions .github/workflows/qa-integration.yml
Original file line number Diff line number Diff line change
Expand Up @@ -125,16 +125,14 @@ jobs:
working-directory: workspace
run: |
west twister --verbose --jobs 6 \
--retry-failed 5 --retry-interval 60 \
--outdir twister-out --no-clean --inline-logs \
--enable-size-report --platform-reports \
--integration \
--testsuite-root bridle/samples/button \
--testsuite-root bridle/samples/buzzer \
--testsuite-root bridle/samples/helloshell \
--testsuite-root bridle/samples/ubx_gnss \
--testsuite-root bridle/samples/waveshare_pico_10dof_imu_sensor \
--testsuite-root bridle/samples/waveshare_pico_environment_sensor
--alt-config-root bridle/zephyr/alt-config \
--integration --no-detailed-test-id \
--testsuite-root bridle/samples \
--testsuite-root zephyr/samples \
--tag bridle \
--tag zephyr

- name: Upload integration test results
uses: actions/upload-artifact@v4
Expand Down Expand Up @@ -250,7 +248,6 @@ jobs:
# --testsuite-root bridle/tests/shields/grove_led/dts_bindings \
#
west twister --verbose --jobs 6 \
--retry-failed 5 --retry-interval 60 \
--outdir twister-out --no-clean --inline-logs \
--enable-size-report --platform-reports \
--integration --cmake-only \
Expand Down
4 changes: 3 additions & 1 deletion samples/button/sample.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,9 @@ sample:
description: Button sample, one of the simplest Zephyr application
name: button
common:
tags: introduction
tags:
- bridle
- introduction
build_only: true
platform_allow: nucleo_f413zh
integration_platforms:
Expand Down
19 changes: 11 additions & 8 deletions samples/buzzer/sample.yaml
Original file line number Diff line number Diff line change
@@ -1,14 +1,17 @@
sample:
name: Buzzer using PWM
description: Buzzer using PWM
name: buzzer
common:
tags:
- bridle
- drivers
- pwm
integration_platforms:
- cytron_maker_nano_rp2040
- cytron_maker_pi_rp2040
- picoboy
tests:
bridle.sample.buzzer:
tags:
- drivers
- pwm
depends_on: pwm
harness: buzzer
filter: dt_alias_exists("pwm-buzzer0") and dt_compat_enabled("pwm-buzzers")
integration_platforms:
- cytron_maker_nano_rp2040
- cytron_maker_pi_rp2040
- picoboy
2 changes: 1 addition & 1 deletion samples/helloshell/boards/qemu_cortex_m0.conf
Original file line number Diff line number Diff line change
Expand Up @@ -4,5 +4,5 @@
# disable components to avoid RAM overflow on BSS allocation
CONFIG_FLASH=n
CONFIG_FLASH_SHELL=n
CONFIG_SENSOR_INFO=n
CONFIG_SENSOR_SHELL=n
CONFIG_SHELL_MINIMAL=y
9 changes: 5 additions & 4 deletions samples/helloshell/sample.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ sample:
name: hello shell
common:
tags:
- bridle
- xip
- kernel
- introduction
Expand All @@ -21,7 +22,7 @@ common:
- qemu_x86/atom/virt
- qemu_x86/atom/xip
# Qemu issue: - qemu_x86_lakemont
- qemu_x86_tiny
# Qemu issue: - qemu_x86_tiny
- qemu_x86_64
- qemu_x86_64/atom/nokpti
- qemu_cortex_r5
Expand Down Expand Up @@ -83,15 +84,15 @@ common:
- waveshare_rp2040_plus@16mb
- waveshare_rp2040_geek
tests:
bridle.samples.helloshell.commands:
bridle.sample.helloshell.commands:
filter: CONFIG_QEMU_TARGET and CONFIG_SERIAL and
(dt_chosen_enabled("zephyr,shell-uart") or
CONFIG_XTENSA_SIM_CONSOLE)
extra_args:
- CMAKE_BUILD_TYPE=ZRelease
harness: pytest
timeout: 300
bridle.samples.helloshell.sayhello:
bridle.sample.helloshell.sayhello:
filter: CONFIG_QEMU_TARGET and CONFIG_CONSOLE and
(dt_chosen_enabled("zephyr,console") or
CONFIG_XTENSA_SIM_CONSOLE)
Expand All @@ -101,7 +102,7 @@ tests:
type: one_line
regex:
- "Hello World! I'm THE SHELL from (.*)"
bridle.samples.helloshell.debug:
bridle.sample.helloshell.debug:
build_only: true
build_on_all: true
extra_args: CMAKE_BUILD_TYPE=ZDebug
8 changes: 5 additions & 3 deletions samples/ubx_gnss/sample.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,9 @@ sample:
into a Zephyr application
name: ubxlib gnss
common:
tags: ubxlib
tags:
- bridle
- ubxlib
integration_platforms:
- mimxrt1010_evk
- mimxrt1060_evk
Expand All @@ -16,11 +18,11 @@ common:
- nucleo_f767zi
- nucleo_l496zg
tests:
bridle.samples.ubx_gnss.release:
bridle.sample.ubx_gnss.release:
build_only: true
build_on_all: true
extra_args: CMAKE_BUILD_TYPE=ZRelease
bridle.samples.ubx_gnss.debug:
bridle.sample.ubx_gnss.debug:
build_only: true
build_on_all: true
extra_args: CMAKE_BUILD_TYPE=ZDebug
26 changes: 11 additions & 15 deletions samples/waveshare_pico_10dof_imu_sensor/sample.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,16 +2,19 @@
# SPDX-License-Identifier: Apache-2.0

sample:
name: Waveshare Pico 10-DOF IMU Sensor Sample
description: Waveshare Pico 10-DOF IMU Sensor Sample
name: waveshare pico 10dof imu sensor
common:
tags:
- bridle
- sensors
- lps22hb
- mpu9250
depends_on:
- pico_i2c
- pico_gpio
tests:
bridle.sample.waveshare_pico_10dof_imu_sensor_r2:
tags:
- sensors
- lps22hb
- mpu9250
depends_on:
- pico_i2c
- pico_gpio
extra_args: SHIELD=waveshare_pico_10dof_imu_sensor_r2
integration_platforms:
- rpi_pico
Expand All @@ -20,13 +23,6 @@ tests:
- waveshare_rp2040_plus
- waveshare_rp2040_plus@16mb
bridle.sample.waveshare_pico_10dof_imu_sensor_r1:
tags:
- sensors
- lps22hb
- mpu9250
depends_on:
- pico_i2c
- pico_gpio
extra_args: SHIELD=waveshare_pico_10dof_imu_sensor_r1
integration_platforms:
- rpi_pico
Expand Down
21 changes: 12 additions & 9 deletions samples/waveshare_pico_environment_sensor/sample.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,17 +2,20 @@
# SPDX-License-Identifier: Apache-2.0

sample:
name: Waveshare Pico Environment Sensor Sample
description: Waveshare Pico Environment Sensor Sample
name: waveshare pico environment sensor
common:
tags:
- bridle
- sensors
- bme280
- sgp40
- mpu9250 # FIXME: icm20948
depends_on:
- pico_i2c
- pico_gpio
tests:
bridle.sample.waveshare_pico_environment_sensor:
tags:
- sensors
- bme280
- sgp40
- mpu9250 # FIXME: icm20948
depends_on:
- pico_i2c
- pico_gpio
extra_args: SHIELD=waveshare_pico_environment_sensor
integration_platforms:
- rpi_pico
Expand Down
54 changes: 54 additions & 0 deletions zephyr/alt-config/drivers/display/sample.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,54 @@
sample:
name: Display Bit Order and Orientation
common:
tags:
- zephyr
- shield
- drivers
- display
depends_on: spi
harness: display
build_only: true
tests:
#
# shield: Waveshare Pico LCD 1.14
#
sample.drivers.display.waveshare_pico_lcd_1_14:
extra_args:
SHIELD=waveshare_pico_lcd_1_14
integration_platforms:
- rpi_pico
- rpi_pico/rp2040/w
- waveshare_rp2040_plus
- waveshare_rp2040_plus@16mb
#
# shield: Waveshare Pico LCD 2
#
sample.drivers.display.waveshare_pico_lcd_2:
extra_args:
SHIELD=waveshare_pico_lcd_2
integration_platforms:
- rpi_pico
- rpi_pico/rp2040/w
- waveshare_rp2040_plus
- waveshare_rp2040_plus@16mb
#
# shield: Waveshare Pico ResTouch LCD 3.5
#
sample.drivers.display.waveshare_pico_restouch_lcd_3_5:
extra_args:
SHIELD=waveshare_pico_restouch_lcd_3_5
integration_platforms:
- rpi_pico
- rpi_pico/rp2040/w
- waveshare_rp2040_plus
- waveshare_rp2040_plus@16mb
#
# shield: Waveshare 2.4 LCD
#
sample.drivers.display.waveshare_2_4_lcd:
extra_args:
SHIELD=waveshare_2_4_lcd
integration_platforms:
- cytron_maker_nano_rp2040
- cytron_maker_pi_rp2040
33 changes: 33 additions & 0 deletions zephyr/alt-config/subsys/input/input_dump/sample.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
sample:
name: Input Dump
common:
tags:
- zephyr
- shield
- input
build_only: true
depends_on: pico_gpio
harness: input
tests:
#
# shield: Waveshare Pico LCD 1.14
#
sample.input.input_dump.waveshare_pico_lcd_1_14:
extra_args:
SHIELD=waveshare_pico_lcd_1_14
integration_platforms:
- rpi_pico
- rpi_pico/rp2040/w
- waveshare_rp2040_plus
- waveshare_rp2040_plus@16mb
#
# shield: Waveshare Pico LCD 2
#
sample.input.input_dump.waveshare_pico_lcd_2:
extra_args:
SHIELD=waveshare_pico_lcd_2
integration_platforms:
- rpi_pico
- rpi_pico/rp2040/w
- waveshare_rp2040_plus
- waveshare_rp2040_plus@16mb
Loading