hardware ci tweaks (#2266)

* frankenso config

* Revert "frankenso config"

This reverts commit 5bb2375ba2d33ae487273eaa5b7a4f12e8a9cecc.

* add hardware CI flag for proteus

* rename ci job

Co-authored-by: Matthew Kennedy <makenne@microsoft.com>
This commit is contained in:
Matthew Kennedy 2021-02-02 06:14:24 -08:00 committed by GitHub
parent 57b250993c
commit 56530d2851
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 10 additions and 4 deletions

View File

@ -41,7 +41,7 @@ jobs:
- name: Build Firmware
working-directory: ./firmware
run: make -j16
run: make -j16 EXTRA_PARAMS="-DHARDWARE_CI"
- name: OpenOCD wipe & flash STM32
working-directory: ./firmware
@ -50,4 +50,4 @@ jobs:
# This both compiles and runs HW CI tests
- name: Run Hardware CI
working-directory: ./java_console
run: ant real_hardware_functional_test
run: ant hardware_ci_f4_discovery

View File

@ -211,4 +211,10 @@ void setBoardConfigurationOverrides(void) {
CONFIG(mainRelayPin) = GPIOB_9;// "Lowside 13" # pin 10/black35
CONFIG(fanPin) = GPIOE_1;// "Lowside 15" # pin 12/black35
CONFIG(fuelPumpPin) = GPIOE_2;// "Lowside 16" # pin 23/black35
// If we're running as hardware CI, borrow a few extra pins for that
#ifdef HARDWARE_CI
engineConfiguration->triggerSimulatorPins[0] = GPIOG_3;
engineConfiguration->triggerSimulatorPins[1] = GPIOG_2;
#endif
}

View File

@ -187,7 +187,7 @@
</target>
<target name="real_hardware_functional_test" depends="jar">
<target name="hardware_ci_f4_discovery" depends="jar">
<mkdir dir="${hw_tests}"/>
<junit fork="no"
maxmemory="512m"

View File

@ -30,7 +30,7 @@ which java
which javac
echo Sleeping few seconds to give OS time to connect VCP driver
sleep 20s
ant real_hardware_functional_test
ant hardware_ci_f4_discovery
[ $? -eq 0 ] || { echo "ERROR DETECTED"; exit 1; }