Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

ci: ubuntu 22.04 update #1390

Merged
merged 1 commit into from
Jan 4, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 3 additions & 7 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# Sandbox test environment for HackRF
FROM ubuntu:20.04
CMD ["/bin/bash"]
FROM ubuntu:22.04
USER root

# Override interactive installations and install prerequisites
ENV DEBIAN_FRONTEND=noninteractive
Expand All @@ -15,13 +15,9 @@ RUN apt-get update && apt-get install -y \
pkg-config \
python3 \
python3-pip \
python-is-python3 \
python3-yaml \
&& rm -rf /var/lib/apt/lists/*
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
EXPOSE 8080
11 changes: 7 additions & 4 deletions Jenkinsfile
Original file line number Diff line number Diff line change
Expand Up @@ -26,15 +26,18 @@ pipeline {
}
sh './ci-scripts/test-firmware-flash.sh'
sh 'python3 ci-scripts/test-debug.py'
sh 'python3 ci-scripts/test-transfer.py tx'
sh 'python3 ci-scripts/test-transfer.py rx'
retry(3) {
sh 'python3 ci-scripts/test-transfer.py tx'
}
retry(3) {
sh 'python3 ci-scripts/test-transfer.py rx'
}
sh './ci-scripts/configure-hubs.sh --reset'
}
}
}
post {
always {
sh './ci-scripts/configure-hubs.sh --reset'
sh 'rm -rf testing-venv/'
cleanWs(cleanWhenNotBuilt: false,
deleteDirs: true,
disableDeferredWipeout: true,
Expand Down
3 changes: 2 additions & 1 deletion ci-scripts/configure-hubs.sh
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
#!/bin/bash
set -e
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
3 changes: 2 additions & 1 deletion ci-scripts/install-firmware.sh
Original file line number Diff line number Diff line change
@@ -1,8 +1,9 @@
#!/bin/bash
set -e
git submodule init
git submodule update
mkdir firmware/hackrf_usb/build
cd firmware/hackrf_usb/build
cmake ..
make
cd ../../..
cd ../../..
3 changes: 2 additions & 1 deletion ci-scripts/install-host.sh
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
#!/bin/bash
set -e
mkdir host/build
cd host/build
cmake ..
make
cd ../..
cd ../..
2 changes: 1 addition & 1 deletion ci-scripts/test-firmware-flash.sh
Original file line number Diff line number Diff line change
Expand Up @@ -15,4 +15,4 @@ then
else
echo "Unknown error"
exit $EXIT_CODE
fi
fi
2 changes: 1 addition & 1 deletion ci-scripts/test-firmware-program.sh
Original file line number Diff line number Diff line change
Expand Up @@ -18,4 +18,4 @@ then
else
echo "god have mercy on your soul"
exit $EXIT_CODE
fi
fi
4 changes: 2 additions & 2 deletions ci-scripts/test-host.sh
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#!/bin/bash
#!/bin/bash
usbhub --disable-i2c --hub D9D1 power state --port 2 --reset
sleep 1s
host/build/hackrf-tools/src/hackrf_info
Expand All @@ -18,4 +18,4 @@ then
else
echo "god have mercy on your soul"
exit $EXIT_CODE
fi
fi
Loading