Merge pull request #306 from anarkiwi/rel

release 0.11.2.

.github/workflows/test.yaml

@@ -5,7 +5,6 @@ on: [push, pull_request]
 jobs:
   test:
     runs-on: ubuntu-latest
-
     steps:
     - uses: actions/checkout@v3
       with:
@@ -18,13 +17,15 @@ jobs:
         shellcheck --version && \
         /bin/bash --version && \
         for shellscript in $(find blue -type f -name "*.sh"); do /bin/bash -n "$shellscript" && shellcheck -x -e SC2069 -e SC2048 "$shellscript"; done
-    - name: unit_test
+    - name: code_check
       run: |
         ./blue/tests/install_test.sh && \
         export PYTHONPATH=$PWD/blue/5G:$PYTHONPATH && \
-        pytype . && \
-        pylint --fail-under=6.0 --disable=expression-not-assigned blue && \
-        PATH=/home/runner/.local/bin:$PATH py.test -v -vv --capture=tee-sys --cov-report term-missing --cov=blue/5G/daedalus -c .coveragerc && \
+        timeout 900 pytype . && \
+        pylint --fail-under=6.0 --disable=expression-not-assigned blue
+    - name: unit_test
+      run: |
+        PATH=/home/runner/.local/bin:$PATH timeout 7200 py.test -vvv --capture=tee-sys --cov-report term-missing --cov=blue/5G/daedalus -c .coveragerc && \
         PATH=/home/runner/.local/bin:$PATH coverage report && \
         PATH=/home/runner/.local/bin:$PATH coverage xml
     - name: Upload coverage to Codecov

blue/5G/daedalus/daedalus.py

@@ -76,7 +76,7 @@ def build_dockers(srsran=False, ueransim=False, open5gs=False, srsran_lime=False
             version = 'v'+__version__
 
         if srsran:
-            srsran_version = 'release_21_10'
+            srsran_version = 'release_22_04_1'
             srs_args = ['build', '-t', 'iqtlabs/srsran:'+version, '-f', 'Dockerfile',
                         '--build-arg', f'SRS_VERSION={srsran_version}', '.']
             with local.cwd(local.cwd / 'blue/5G/daedalus/5G/srsRAN'):
@@ -98,7 +98,7 @@ def build_dockers(srsran=False, ueransim=False, open5gs=False, srsran_lime=False
 
     def start_dovesnap(self):
         """Start Dovesnap components in Docker containers"""
-        release = 'v1.1.1'
+        release = 'v1.1.4'
         faucet_prefix = '/tmp/tpfaucet'
         sudo[ip['link', 'add', 'tpmirrorint', 'type', 'veth',
                 'peer', 'name', 'tpmirror']](retcode=(0, 2))

blue/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "daedalus-5g"
-version = "0.11.2.dev"
+version = "0.11.2"
 description = "A tool for creating 4G/5G environments both with SDRs and virtual simulation to run experiments in"
 authors = [
     { name = "cglewis", email = "[email protected]" }

blue/tests/test_daedalus.py

@@ -11,13 +11,15 @@ def test_start_remove_dovesnap():
     instance.start_dovesnap()
     instance.remove_dovesnap()
     instance.reset_cwd()
+    instance.cleanup()
 
 
 def test_build_images():
     instance = Daedalus()
     instance.build_dockers(srsran=True, ueransim=True,
                            open5gs=True, srsran_lime=True)
     instance.reset_cwd()
+    instance.cleanup()
 
 
 def test_create_remove_networks():
@@ -27,16 +29,19 @@ def test_create_remove_networks():
     instance.remove_networks()
     instance.remove_dovesnap()
     instance.reset_cwd()
+    instance.cleanup()
 
 
 def test_start_no_services():
     instance = Daedalus()
     instance.start_services()
+    instance.cleanup()
 
 
 def test_remove_no_services():
     instance = Daedalus()
     instance.remove_services()
+    instance.cleanup()
 
 
 def test_start_remove_services():
@@ -53,28 +58,34 @@ def test_start_remove_services():
 def test_main_questions():
     instance = Daedalus()
     instance.main_questions()
+    instance.cleanup()
 
 
 def test_global_number_questions():
     instance = Daedalus()
     instance.global_number_questions('enb')
+    instance.cleanup()
 
 
 def test_sdr_questions():
     instance = Daedalus()
     instance.sdr_questions('enb')
+    instance.cleanup()
 
 
 def test_imsi_questions():
     instance = Daedalus()
     instance.imsi_questions()
+    instance.cleanup()
 
 
 def test_running_questions():
     instance = Daedalus()
     instance.running_questions()
+    instance.cleanup()
 
 
 def test_check_commands():
     instance = Daedalus()
     instance.check_commands()
+    instance.cleanup()