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.

Sign up for GitHub

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 #521

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

ci: ubuntu 22.04 update #521

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
7 changes: 4 additions & 3 deletions Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,9 @@
# Sandbox test environment for Ubertooth
FROM ubuntu:20.04
FROM ubuntu:22.04
USER root

# Override interactive installations and install prerequisite programs
ENV DEBIAN_FRONTEND=noninteractive
ENV DEBIAN_FRONTEND=noninteractive
RUN apt-get update && apt-get install -y \
cmake \
gcc \
Expand All @@ -19,7 +20,7 @@ RUN apt-get update && apt-get install -y \
python3-pip \
python3-qtpy \
python3-setuptools \
python-is-python3 \
python3-yaml \
wget \
&& rm -rf /var/lib/apt/lists/*
RUN pip3 install git+https://github.com/CapableRobot/CapableRobot_USBHub_Driver --upgrade
Expand Down
6 changes: 3 additions & 3 deletions Jenkinsfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
pipeline {
agent {
agent {
dockerfile {
args '--group-add=46 --device-cgroup-rule="c 189:* rmw" -v /dev/bus/usb:/dev/bus/usb'
}
Expand All @@ -21,16 +21,16 @@ pipeline {
retry(3) {
sh './ci-scripts/test.sh'
}
sh './ci-scripts/configure-hubs.sh --reset'
}
}
}
post {
always {
sh './ci-scripts/configure-hubs.sh --reset'
cleanWs(cleanWhenNotBuilt: false,
deleteDirs: true,
disableDeferredWipeout: true,
notFailBuild: true)
}
}
}
}
3 changes: 2 additions & 1 deletion ci-scripts/build-firmware.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
#!/bin/bash
set -e
cd firmware/bluetooth_rxtx
DFU_TOOL=../../host/build/ubertooth-tools/src/ubertooth-dfu make
cd ../..
cd ../..
3 changes: 2 additions & 1 deletion ci-scripts/build-host.sh
View file
Open in desktop
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 ../..
5 changes: 3 additions & 2 deletions ci-scripts/configure-hubs.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
#!/bin/bash -x
#!/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
2 changes: 1 addition & 1 deletion ci-scripts/test.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,4 +32,4 @@ then
else
echo "Unhandled DFU error!"
exit $DFU_STATUS
fi
fi
Loading