Skip to content

Commit 72c8527

Browse files
Ww19960307xieqinan
authored andcommitted
feat(ci): set lts and idf pytest job to manual
1 parent d10456f commit 72c8527

File tree

5 files changed

+25
-13
lines changed

5 files changed

+25
-13
lines changed

.gitlab/ci/generate_build_test_jobs.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -22,13 +22,15 @@ generate_child_pipeline:
2222
--result child_pipeline_lts.yml \
2323
--idf_version v5.1.6 v5.2.5 v5.3.4 v5.4.2 \
2424
--chips esp32h2 esp32c6 esp32s3 \
25-
--job_templates build_pytest_template_sdk_example build_non_pytest_template_sdk_example build_pytest_gateway_template_sdk_example pytest_template_sdk_example
25+
--job_templates build_pytest_template_sdk_example build_non_pytest_template_sdk_example build_pytest_gateway_template_sdk_example pytest_template_sdk_example \
26+
--manual_pytest
2627
- |
2728
python3 tools/ci/dynamic_pipelines/generate_child_pipeline.py \
2829
--result child_pipeline_idf_example.yml \
2930
--idf_version v5.5.1 master \
3031
--chips esp32h2 esp32c6 esp32s3 esp32c5 \
31-
--job_templates build_pytest_template_idf_example build_pytest_gateway_template_idf_example pytest_template_idf_example
32+
--job_templates build_pytest_template_idf_example build_pytest_gateway_template_idf_example pytest_template_idf_example \
33+
--manual_pytest
3234
3335
build_and_test_pipeline_default:
3436
stage: build
@@ -50,7 +52,6 @@ build_and_test_pipeline_lts:
5052
- generate_child_pipeline
5153
inherit:
5254
variables: true
53-
when: manual
5455
trigger:
5556
include:
5657
- artifact: child_pipeline_lts.yml
@@ -65,7 +66,6 @@ build_and_test_pipeline_idf_example:
6566
- generate_child_pipeline
6667
inherit:
6768
variables: true
68-
when: manual
6969
trigger:
7070
include:
7171
- artifact: child_pipeline_idf_example.yml

examples/esp_zigbee_all_device_types_app/partitions.csv

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,6 @@
33
nvs, data, nvs, , 0x6000,
44
otadata, data, ota, , 0x2000,
55
phy_init, data, phy, , 0x1000,
6-
factory, app, factory, , 1M,
6+
factory, app, factory, , 1500k,
77
zb_storage, data, fat, , 16K,
88
zb_fct, data, fat, , 1K,

examples/esp_zigbee_gateway/partitions.csv

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
# Note: if you have increased the bootloader size, make sure to update the offsets to avoid overlap
33
nvs, data, nvs, 0x9000, 0x6000,
44
phy_init, data, phy, 0xf000, 0x1000,
5-
factory, app, factory, 0x10000, 1400K,
6-
zb_storage, data, fat, 0x16e000,16K,
7-
zb_fct, data, fat, 0x172000,1K,
8-
rcp_fw, data, spiffs, 0x173000,640k,
5+
factory, app, factory, 0x10000, 1800K,
6+
zb_storage, data, fat, ,16K,
7+
zb_fct, data, fat, ,1K,
8+
rcp_fw, data, spiffs, ,640k,

tools/ci/build_apps.py

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,9 @@
3636
r"warning: 'init_spiffs' defined but not used",
3737
r"warning: 'esp_zb_gateway_board_try_update' defined but not used",
3838
r"DeprecationWarning: pkg_resources is deprecated as an API",
39+
r"Warning: Deprecated: Option '--flash_mode' is deprecated. Use '--flash-mode' instead.",
40+
r"Warning: Deprecated: Option '--flash_freq' is deprecated. Use '--flash-freq' instead.",
41+
r"Warning: Deprecated: Option '--flash_size' is deprecated. Use '--flash-size' instead."
3942
]
4043

4144
def _is_pytest_app(app: App) -> bool:
@@ -81,7 +84,8 @@ def main(args: argparse.Namespace) -> None:
8184

8285
ignore_warnings = IGNORE_WARNINGS
8386
if args.ignore_warning:
84-
ignore_warnings = [r"warning: .*"]
87+
ignore_warnings = [r"warning: .*",
88+
r"Warning: .*"]
8589
ret_code = build_apps(
8690
apps_for_build,
8791
parallel_count=args.parallel_count,

tools/ci/dynamic_pipelines/generate_child_pipeline.py

Lines changed: 11 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
from constants import ZbCiCons
88
import os
99

10-
def generate(idf_and_docker, generate_yaml, build_templates, pytest_job_template, chips):
10+
def generate(idf_and_docker, generate_yaml, build_templates, pytest_job_template, chips, manual_pytest):
1111
generate_jobs = []
1212
for idf_version, docker_version in idf_and_docker.items():
1313
for job_name_fmt, tmpl in build_templates:
@@ -36,7 +36,8 @@ def generate(idf_and_docker, generate_yaml, build_templates, pytest_job_template
3636
'CHIP': chip,
3737
'IDF_VERSION': idf_version,
3838
},
39-
needs=[needs_target]
39+
needs=[needs_target],
40+
when='manual' if manual_pytest else 'always'
4041
))
4142
dump_jobs_to_yaml(generate_jobs, generate_yaml, ZbCiCons.PATH_TEMPLATE)
4243

@@ -67,7 +68,7 @@ def main(arg):
6768
idf_and_docker = match_idf_docker(arg.idf_version)
6869
yaml_result_path = os.path.join(ZbCiCons.PATH_PROJECT, arg.result)
6970
build_templates, pytest_template = parse_job_templates(arg.job_templates)
70-
generate(idf_and_docker, yaml_result_path, build_templates, pytest_template, arg.chips)
71+
generate(idf_and_docker, yaml_result_path, build_templates, pytest_template, arg.chips, arg.manual_pytest)
7172

7273

7374
if __name__ == '__main__':
@@ -98,5 +99,12 @@ def main(arg):
9899
help='job template names (e.g. build_pytest_template build_non_pytest_template build_pytest_gateway_template)',
99100
nargs='+',
100101
)
102+
parser.add_argument(
103+
"--manual_pytest",
104+
action="store_true",
105+
dest="manual_pytest",
106+
default=False,
107+
help="Set pytest jobs to manual",
108+
)
101109
args = parser.parse_args()
102110
main(args)

0 commit comments

Comments
 (0)