ci: release,testbed: OSPv2: make firmware filenames UPDK 9.2.3 compliant
Update references to OSPv2 image names in YAML configurations to match the new naming convention, which was introduced in UPDK 9.2.3, providing single build for both A-Step and B-Step OSPv2 hardware revisions. New A-Step: prplos-intel_x86-lgm-PRPL_OSP_v2-tb341_wav700_fullimage.fit New B-Step: prplos-intel_x86-lgm-PRPL_OSP_v2-wgrtd159be_b_wav700_fullimage.fit References: PCF-2202 Signed-off-by: Petr Štetiar <petr.stetiar@prplfoundation.org>
This commit is contained in:
Petr Štetiar
Hela Saadani
parent
b54265a24e
commit
fcfef4c496
@ -47,9 +47,6 @@ stages:
|
||||
build test mxl_x86_osp_tb341_v2 mxl_wlan_hostap_ng_wav700 prpl cellular security thread:
|
||||
extends: .build test config
|
||||
|
||||
build test mxl_x86_osp_wgrtd159be_b_v2 mxl_wlan_hostap_ng_wav700 prpl cellular security thread:
|
||||
extends: .build test config
|
||||
|
||||
build test mvebu prpl security:
|
||||
extends: .build test config
|
||||
|
||||
@ -95,7 +92,7 @@ run test Haze initramfs:
|
||||
extends: .prpl-haze testbed
|
||||
|
||||
run test MXL25641-HDK-6 with system on eMMC:
|
||||
needs: ["build test mxl_x86_osp_wgrtd159be_b_v2 mxl_wlan_hostap_ng_wav700 prpl cellular security thread"]
|
||||
needs: ["build test mxl_x86_osp_tb341_v2 mxl_wlan_hostap_ng_wav700 prpl cellular security thread"]
|
||||
extends: .mxl25641-hdk-6 testbed
|
||||
|
||||
run test Freedom initramfs:
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
.mxl25641-cdrouter: &mxl25641_cdrouter
|
||||
needs: ["build test mxl_x86_osp_wgrtd159be_b_v2 mxl_wlan_hostap_ng_wav700 prpl cellular security thread"]
|
||||
needs: ["build test mxl_x86_osp_tb341_v2 mxl_wlan_hostap_ng_wav700 prpl cellular security thread"]
|
||||
extends:
|
||||
- .mxl25641-hdk-6 testbed
|
||||
- .cdrouter
|
||||
|
||||
@ -12,7 +12,6 @@ upload:
|
||||
- job: build test qca_ipq95xx prpl cellular security thread
|
||||
- job: build test mtk_filogic prpl security
|
||||
- job: build test mxl_x86_osp_tb341_v2 mxl_wlan_hostap_ng_wav700 prpl cellular security thread
|
||||
- job: build test mxl_x86_osp_wgrtd159be_b_v2 mxl_wlan_hostap_ng_wav700 prpl cellular security thread
|
||||
|
||||
rules:
|
||||
- if: '$CI_COMMIT_TAG =~ /^prplware-v[0-9]+\.[0-9]+\.[0-9]+.*$/'
|
||||
@ -56,14 +55,14 @@ upload:
|
||||
# ospv2 A-Step
|
||||
- |
|
||||
curl --header "JOB-TOKEN: ${CI_JOB_TOKEN}" \
|
||||
--upload-file bin/targets/intel_x86/lgm/single-images/prplos-intel_x86-lgm-PRPL_OSP_TB341_v2-osp_tb341_v2_wav700_fullimage.fit \
|
||||
${PACKAGE_REGISTRY_URL}/gemtek-ospv2/${prplware_version}/prplos-intel_x86-lgm-PRPL_OSP_TB341_v2-osp_tb341_v2_wav700_fullimage.fit
|
||||
--upload-file bin/targets/intel_x86/lgm/single-images/prplos-intel_x86-lgm-PRPL_OSP_v2-tb341_wav700_fullimage.fit \
|
||||
${PACKAGE_REGISTRY_URL}/gemtek-ospv2/${prplware_version}/prplos-intel_x86-lgm-PRPL_OSP_v2-tb341_wav700_fullimage.fit
|
||||
|
||||
# ospv2 B-Step
|
||||
- |
|
||||
curl --header "JOB-TOKEN: ${CI_JOB_TOKEN}" \
|
||||
--upload-file bin/targets/intel_x86/lgm/single-images/prplos-intel_x86-lgm-PRPL_OSPv2_WGRTD159BE_B-wav700_fullimage.fit \
|
||||
${PACKAGE_REGISTRY_URL}/gemtek-ospv2-b/${prplware_version}/prplos-intel_x86-lgm-PRPL_OSPv2_WGRTD159BE_B-wav700_fullimage.fit
|
||||
--upload-file bin/targets/intel_x86/lgm/single-images/prplos-intel_x86-lgm-PRPL_OSP_v2-wgrtd159be_b_wav700_fullimage.fit \
|
||||
${PACKAGE_REGISTRY_URL}/gemtek-ospv2-b/${prplware_version}/prplos-intel_x86-lgm-PRPL_OSP_v2-wgrtd159be_b_wav700_fullimage.fit
|
||||
|
||||
# qca_ipq95xx
|
||||
- |
|
||||
@ -113,8 +112,8 @@ release:
|
||||
|
||||
- |
|
||||
release-cli create --name "prplWare release $prplware_version" --tag-name $CI_COMMIT_TAG \
|
||||
--assets-link "{\"name\":\"MaxLinear/Gemtek OSPv2 A-Step single-image\",\"url\":\"${PACKAGE_REGISTRY_URL}/gemtek-ospv2/${prplware_version}/prplos-intel_x86-lgm-PRPL_OSP_TB341_v2-osp_tb341_v2_wav700_fullimage.fit\"}" \
|
||||
--assets-link "{\"name\":\"MaxLinear/Gemtek OSPv2 B-Step single-image\",\"url\":\"${PACKAGE_REGISTRY_URL}/gemtek-ospv2-b/${prplware_version}/prplos-intel_x86-lgm-PRPL_OSPv2_WGRTD159BE_B-wav700_fullimage.fit\"}" \
|
||||
--assets-link "{\"name\":\"MaxLinear/Gemtek OSPv2 A-Step single-image\",\"url\":\"${PACKAGE_REGISTRY_URL}/gemtek-ospv2/${prplware_version}/prplos-intel_x86-lgm-PRPL_OSP_v2-tb341_wav700_fullimage.fit\"}" \
|
||||
--assets-link "{\"name\":\"MaxLinear/Gemtek OSPv2 B-Step single-image\",\"url\":\"${PACKAGE_REGISTRY_URL}/gemtek-ospv2-b/${prplware_version}/prplos-intel_x86-lgm-PRPL_OSP_v2-wgrtd159be_b_wav700_fullimage.fit\"}" \
|
||||
--assets-link "{\"name\":\"MediaTek/Arcadyan Mozart bootstack\",\"url\":\"${PACKAGE_REGISTRY_URL}/arcadyan-mozart/${prplware_version}/prplos-mediatek-filogic-arcadyan_mozart-emmc-bootstack.tar.gz\"}" \
|
||||
--assets-link "{\"name\":\"MediaTek/Arcadyan Mozart sysupgrade\",\"url\":\"${PACKAGE_REGISTRY_URL}/arcadyan-mozart/${prplware_version}/prplos-mediatek-filogic-arcadyan_mozart-squashfs-sysupgrade.itb\"}" \
|
||||
--assets-link "{\"name\":\"MediaTek/Arcadyan Mozart initramfs\",\"url\":\"${PACKAGE_REGISTRY_URL}/arcadyan-mozart/${prplware_version}/prplos-mediatek-filogic-arcadyan_mozart-initramfs.itb\"}" \
|
||||
|
||||
@ -7,8 +7,8 @@
|
||||
DUT_BOARD: mxl25641-hdk-6
|
||||
LABGRID_TARGET: mxl25641-hdk-6-emmc
|
||||
TFTP_IMAGE_PATH: bin/targets/intel_x86/lgm/single-images
|
||||
TFTP_IMAGE_FILENAME: prplos-intel_x86-lgm-PRPL_OSPv2_WGRTD159BE_B-wav700_fullimage.fit
|
||||
TFTP_IMAGE_FILENAME_PATTERN: /.*prplos-intel_x86-lgm-PRPL_OSPv2_WGRTD159BE_B-wav700_fullimage.fit/
|
||||
TFTP_IMAGE_FILENAME: prplos-intel_x86-lgm-PRPL_OSP_v2-wgrtd159be_b_wav700_fullimage.fit
|
||||
TFTP_IMAGE_FILENAME_PATTERN: /.*prplos-intel_x86-lgm-PRPL_OSP_v2-wgrtd159be_b_wav700_fullimage.fit/
|
||||
DUT_ARCH_PACKAGES_PATH: $PACKAGE_DIR/${DUT_ARCH}
|
||||
CDROUTER_CONFIG_LAN_IFACE_ALIAS: cpe-lan2
|
||||
tags:
|
||||
|
||||
@ -130,7 +130,7 @@ targets:
|
||||
- setenv serverip 192.168.1.2
|
||||
- setenv ipaddr 192.168.1.1
|
||||
- setenv lcm_data_block_start 0xa6c00
|
||||
- setenv fullimage prplos-intel_x86-lgm-PRPL_OSPv2_WGRTD159BE_B-wav700_fullimage.fit
|
||||
- setenv fullimage prplos-intel_x86-lgm-PRPL_OSP_v2-wgrtd159be_b_wav700_fullimage.fit
|
||||
- mmc dev 0 && mmc erase ${lcm_data_block_start} 0x400
|
||||
- mmc dev 0 && mmc erase ${rootfs_data_block_start} ${rootfs_data_block_size} && run update_fullimage
|
||||
UBootStrategy: {}
|
||||
|
||||
@ -220,7 +220,7 @@ targets:
|
||||
- setenv serverip 192.168.1.2
|
||||
- setenv ipaddr 192.168.1.1
|
||||
- setenv lcm_data_block_start 0xa6c00
|
||||
- setenv fullimage prplos-intel_x86-lgm-PRPL_OSPv2_WGRTD159BE_B-wav700_fullimage.fit
|
||||
- setenv fullimage prplos-intel_x86-lgm-PRPL_OSP_v2-wgrtd159be_b_wav700_fullimage.fit
|
||||
- mmc dev 0 && mmc erase ${lcm_data_block_start} 0x400
|
||||
- mmc dev 0 && mmc erase ${rootfs_data_block_start} ${rootfs_data_block_size} && run update_fullimage
|
||||
UBootStrategy: {}
|
||||
|
||||
Loading…
Reference in New Issue
Block a user