Merge pull request #1390 from grvvy/ci_update

ci: ubuntu 22.04 update

Dockerfile

@@ -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
@@ -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

Jenkinsfile

@@ -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,

ci-scripts/configure-hubs.sh

@@ -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

ci-scripts/install-firmware.sh

@@ -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 ../../..

ci-scripts/install-host.sh

@@ -1,6 +1,7 @@
 #!/bin/bash
+set -e
 mkdir host/build
 cd host/build
 cmake ..
 make
-cd ../..
+cd ../..

ci-scripts/test-firmware-flash.sh

@@ -15,4 +15,4 @@ then
 else
     echo "Unknown error"
     exit $EXIT_CODE
-fi
+fi

ci-scripts/test-firmware-program.sh

@@ -18,4 +18,4 @@ then
 else
     echo "god have mercy on your soul"
     exit $EXIT_CODE
-fi
+fi

ci-scripts/test-host.sh

@@ -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
@@ -18,4 +18,4 @@ then
 else
     echo "god have mercy on your soul"
     exit $EXIT_CODE
-fi
+fi