[MERGED] osmo-gsm-tester[master]: Improve resource requirements in suite.conf

Pau Espin Pedrol gerrit-no-reply at lists.osmocom.org
Tue Oct 17 11:40:51 UTC 2017


Pau Espin Pedrol has submitted this change and it was merged.

Change subject: Improve resource requirements in suite.conf
......................................................................


Improve resource requirements in suite.conf

Change-Id: I10fd47f53509f04abe1e2a39036e5d97c781ddab
---
M example/default-suites.conf
M suites/aoip_encryption/suite.conf
M suites/aoip_smpp/suite.conf
M suites/aoip_sms/suite.conf
M suites/smpp/suite.conf
M suites/sms/suite.conf
6 files changed, 15 insertions(+), 1 deletion(-)

Approvals:
  Pau Espin Pedrol: Looks good to me, approved
  Jenkins Builder: Verified



diff --git a/example/default-suites.conf b/example/default-suites.conf
index 1e8d47a..0198486 100644
--- a/example/default-suites.conf
+++ b/example/default-suites.conf
@@ -6,4 +6,4 @@
 - aoip_sms:trx-sysmocell5000
 - smpp
 - aoip_smpp
-- aoip_encryption:cipher-a50+cipher-a51
+- aoip_encryption
diff --git a/suites/aoip_encryption/suite.conf b/suites/aoip_encryption/suite.conf
index 3cdc525..d6d0eee 100644
--- a/suites/aoip_encryption/suite.conf
+++ b/suites/aoip_encryption/suite.conf
@@ -3,8 +3,14 @@
   - times: 5 # msc, bsc, hlr, stp, mgw
   bts:
   - times: 1
+    ciphers:
+      - a5_0
+      - a5_1
   modem:
   - times: 1
+    ciphers:
+      - a5_0
+      - a5_1
 
 defaults:
   timeout: 120s
diff --git a/suites/aoip_smpp/suite.conf b/suites/aoip_smpp/suite.conf
index 46f8d09..688fe0a 100644
--- a/suites/aoip_smpp/suite.conf
+++ b/suites/aoip_smpp/suite.conf
@@ -5,6 +5,8 @@
   - times: 1
   modem:
   - times: 1
+    features:
+    - sms
 
 defaults:
   timeout: 60s
diff --git a/suites/aoip_sms/suite.conf b/suites/aoip_sms/suite.conf
index 216d3ea..677a95e 100644
--- a/suites/aoip_sms/suite.conf
+++ b/suites/aoip_sms/suite.conf
@@ -5,3 +5,5 @@
   - times: 1
   modem:
   - times: 2
+    features:
+    - sms
diff --git a/suites/smpp/suite.conf b/suites/smpp/suite.conf
index eb59abb..eb5dc01 100644
--- a/suites/smpp/suite.conf
+++ b/suites/smpp/suite.conf
@@ -5,6 +5,8 @@
   - times: 1
   modem:
   - times: 1
+    features:
+    - sms
 
 defaults:
   timeout: 60s
diff --git a/suites/sms/suite.conf b/suites/sms/suite.conf
index 376f6cd..485402b 100644
--- a/suites/sms/suite.conf
+++ b/suites/sms/suite.conf
@@ -5,6 +5,8 @@
   - times: 1
   modem:
   - times: 2
+    features:
+    - sms
 
 defaults:
   timeout: 60s

-- 
To view, visit https://gerrit.osmocom.org/4261
To unsubscribe, visit https://gerrit.osmocom.org/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I10fd47f53509f04abe1e2a39036e5d97c781ddab
Gerrit-PatchSet: 1
Gerrit-Project: osmo-gsm-tester
Gerrit-Branch: master
Gerrit-Owner: Pau Espin Pedrol <pespin at sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: Neels Hofmeyr <nhofmeyr at sysmocom.de>
Gerrit-Reviewer: Pau Espin Pedrol <pespin at sysmocom.de>


More information about the gerrit-log mailing list