Hardware CI specifies exact device serial number (#4912)
* scripts specify exact hardware CI device * proteus serial number * dropped this: | * read envionment variable for correct port * it's lowercase for whatever reason * d'oh
This commit is contained in:
parent
6fef0af1ba
commit
d48afea92c
|
@ -18,6 +18,8 @@ jobs:
|
||||||
# folder: f407-discovery
|
# folder: f407-discovery
|
||||||
# config-name: all
|
# config-name: all
|
||||||
# ini-file: rusefi_f4-disco.ini
|
# ini-file: rusefi_f4-disco.ini
|
||||||
|
# openocd-script: ../.github/workflows/openocd_ci_f4_discovery.cfg
|
||||||
|
# serial-device: /dev/serial/by-id/TODO
|
||||||
|
|
||||||
- build-target: proteus_f4
|
- build-target: proteus_f4
|
||||||
script: hardware_ci_proteus
|
script: hardware_ci_proteus
|
||||||
|
@ -25,6 +27,8 @@ jobs:
|
||||||
folder: proteus
|
folder: proteus
|
||||||
config-name: proteus_f4
|
config-name: proteus_f4
|
||||||
ini-file: rusefi_proteus_f4.ini
|
ini-file: rusefi_proteus_f4.ini
|
||||||
|
openocd-script: ../.github/workflows/openocd_ci_proteus.cfg
|
||||||
|
serial-device: /dev/serial/by-id/usb-rusEFI_LLC_rusEFI_Engine_Management_ECU_41003D000451383037343335-if01
|
||||||
|
|
||||||
runs-on: ${{matrix.runs-on}}
|
runs-on: ${{matrix.runs-on}}
|
||||||
|
|
||||||
|
@ -66,7 +70,9 @@ jobs:
|
||||||
run: make clean
|
run: make clean
|
||||||
|
|
||||||
- name: Set EXTRA env
|
- name: Set EXTRA env
|
||||||
run: echo "EXTRA_2_PARAMS=-DHARDWARE_CI" >> $GITHUB_ENV
|
run: |
|
||||||
|
echo "EXTRA_2_PARAMS=-DHARDWARE_CI" >> $GITHUB_ENV
|
||||||
|
echo "HARDWARE_CI_SERIAL_DEVICE=${{matrix.serial-device}}" >> $GITHUB_ENV
|
||||||
|
|
||||||
- name: Build Firmware
|
- name: Build Firmware
|
||||||
run: bash misc/jenkins/compile_other_versions/compile.sh ${{matrix.folder}} ${{matrix.build-target}} ${{matrix.ini-file}}
|
run: bash misc/jenkins/compile_other_versions/compile.sh ${{matrix.folder}} ${{matrix.build-target}} ${{matrix.ini-file}}
|
||||||
|
@ -76,7 +82,7 @@ jobs:
|
||||||
|
|
||||||
- name: OpenOCD wipe & flash STM32
|
- name: OpenOCD wipe & flash STM32
|
||||||
working-directory: ./firmware
|
working-directory: ./firmware
|
||||||
run: openocd -f "interface/stlink.cfg" -f "target/stm32f4x.cfg" -c init -c targets -c "reset halt" -c "flash erase_sector 0 0 11" -c "flash write_image "deliver/rusefi.bin" 0x08000000" -c "reset run" -c "shutdown"
|
run: openocd -f "${{matrix.openocd-script}}" -c init -c targets -c "reset halt" -c "flash erase_sector 0 0 11" -c "flash write_image "deliver/rusefi.bin" 0x08000000" -c "reset run" -c "shutdown"
|
||||||
|
|
||||||
- name: Generate Java (Antlr)
|
- name: Generate Java (Antlr)
|
||||||
working-directory: ./java_tools
|
working-directory: ./java_tools
|
||||||
|
|
|
@ -0,0 +1,15 @@
|
||||||
|
# Openocd script for STM32F4 Discovery Hardware CI
|
||||||
|
source [find interface/stlink.cfg]
|
||||||
|
hla_serial wrong_serial
|
||||||
|
|
||||||
|
transport select hla_swd
|
||||||
|
|
||||||
|
# increase working area to 128KB
|
||||||
|
set WORKAREASIZE 0x20000
|
||||||
|
|
||||||
|
# chip name
|
||||||
|
set CHIPNAME F4_DISCOVERY
|
||||||
|
|
||||||
|
source [find target/stm32f4x.cfg]
|
||||||
|
|
||||||
|
reset_config srst_only
|
|
@ -0,0 +1,15 @@
|
||||||
|
# Openocd script for Proteus hardware CI
|
||||||
|
source [find interface/stlink.cfg]
|
||||||
|
hla_serial 004D00323137511133333639
|
||||||
|
|
||||||
|
transport select hla_swd
|
||||||
|
|
||||||
|
# increase working area to 128KB
|
||||||
|
set WORKAREASIZE 0x20000
|
||||||
|
|
||||||
|
# chip name
|
||||||
|
set CHIPNAME PROTEUS
|
||||||
|
|
||||||
|
source [find target/stm32f4x.cfg]
|
||||||
|
|
||||||
|
reset_config srst_only
|
|
@ -35,13 +35,17 @@ public class ControllerConnectorState {
|
||||||
*/
|
*/
|
||||||
TestingUtils.isRealHardware = true;
|
TestingUtils.isRealHardware = true;
|
||||||
FileLog.MAIN.start();
|
FileLog.MAIN.start();
|
||||||
String port = System.getProperty("ecu.port");
|
|
||||||
|
String port = System.getenv("HARDWARE_CI_SERIAL_DEVICE");
|
||||||
|
if (port == null) {
|
||||||
|
port = System.getProperty("ecu.port");
|
||||||
if (port == null) {
|
if (port == null) {
|
||||||
port = PortDetector.autoDetectSerial(null).getSerialPort();
|
port = PortDetector.autoDetectSerial(null).getSerialPort();
|
||||||
if (port == null)
|
if (port == null)
|
||||||
throw new IllegalStateException("ECU serial not detected");
|
throw new IllegalStateException("ECU serial not detected");
|
||||||
System.out.println("Auto-connected to " + port);
|
System.out.println("Auto-connected to " + port);
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
IoUtil.realHardwareConnect(linkManager, port);
|
IoUtil.realHardwareConnect(linkManager, port);
|
||||||
ControllerConnectorState.linkManager = linkManager;
|
ControllerConnectorState.linkManager = linkManager;
|
||||||
|
|
Loading…
Reference in New Issue