ci: update docker base image and prerequisites, catch errors from intermediate test scripts, retry tx/rx tests before failing

This commit is contained in:
grvvy
2023-12-15 14:57:16 -07:00
parent 44c557ae3b
commit c85d6b5245
8 changed files with 20 additions and 18 deletions

View File

@ -1,6 +1,6 @@
# Sandbox test environment for HackRF # Sandbox test environment for HackRF
FROM ubuntu:20.04 FROM ubuntu:22.04
CMD ["/bin/bash"] USER root
# Override interactive installations and install prerequisites # Override interactive installations and install prerequisites
ENV DEBIAN_FRONTEND=noninteractive ENV DEBIAN_FRONTEND=noninteractive
@ -15,13 +15,9 @@ RUN apt-get update && apt-get install -y \
pkg-config \ pkg-config \
python3 \ python3 \
python3-pip \ python3-pip \
python-is-python3 \ python3-yaml \
&& rm -rf /var/lib/apt/lists/* && rm -rf /var/lib/apt/lists/*
RUN pip3 install git+https://github.com/CapableRobot/CapableRobot_USBHub_Driver --upgrade RUN pip3 install git+https://github.com/CapableRobot/CapableRobot_USBHub_Driver --upgrade
# Serial numbers for EUT and TESTER devices connected to the test server
ENV EUT=RunningFromRAM
ENV TESTER=0000000000000000325866e629a25623
# Inform Docker that the container is listening on port 8080 at runtime # Inform Docker that the container is listening on port 8080 at runtime
EXPOSE 8080 EXPOSE 8080

7
Jenkinsfile vendored
View File

@ -26,15 +26,18 @@ pipeline {
} }
sh './ci-scripts/test-firmware-flash.sh' sh './ci-scripts/test-firmware-flash.sh'
sh 'python3 ci-scripts/test-debug.py' sh 'python3 ci-scripts/test-debug.py'
retry(3) {
sh 'python3 ci-scripts/test-transfer.py tx' sh 'python3 ci-scripts/test-transfer.py tx'
}
retry(3) {
sh 'python3 ci-scripts/test-transfer.py rx' sh 'python3 ci-scripts/test-transfer.py rx'
} }
sh './ci-scripts/configure-hubs.sh --reset'
}
} }
} }
post { post {
always { always {
sh './ci-scripts/configure-hubs.sh --reset'
sh 'rm -rf testing-venv/'
cleanWs(cleanWhenNotBuilt: false, cleanWs(cleanWhenNotBuilt: false,
deleteDirs: true, deleteDirs: true,
disableDeferredWipeout: true, disableDeferredWipeout: true,

View File

@ -1,3 +1,4 @@
#!/bin/bash #!/bin/bash
set -e
usbhub --disable-i2c --hub D9D1 power state --port 1,2,3,4 $1 usbhub --disable-i2c --hub D9D1 power state --port 1,2,3,4 $1
usbhub --disable-i2c --hub 624C power state --port 1,2,3,4 $1 usbhub --disable-i2c --hub 624C power state --port 1,2,3,4 $1

View File

@ -1,4 +1,5 @@
#!/bin/bash #!/bin/bash
set -e
git submodule init git submodule init
git submodule update git submodule update
mkdir firmware/hackrf_usb/build mkdir firmware/hackrf_usb/build

View File

@ -1,4 +1,5 @@
#!/bin/bash #!/bin/bash
set -e
mkdir host/build mkdir host/build
cd host/build cd host/build
cmake .. cmake ..