Pau Espin Pedrol has submitted this change and it was merged. Change subject: example: Maintain different resources.conf for RnD and prod ......................................................................
example: Maintain different resources.conf for RnD and prod We still want to maintain this file in the same osmo-gsm-tester repo because we frequently neef to update the config when adding new features. Until now only 1 file was maintained (which was used for RnD setup), and then when runnin in prod the jenkins script used sed to change the file to accomodate slightly changes. This way is too hacky, so let's just maintain too separate files, keeping the original resources.conf key name used by osmo-gsm-tester free, so that jenkins job can symlink one of the 2 files to it. Take the chance to remove OctoBTS and Sysmocell5k from the RnD resources file, as we don't have those them. Change-Id: Ifec851c7ac6fca6b294e57dfe86b92f214ae8f42 --- M .gitignore C example/resources.conf.prod R example/resources.conf.rnd 3 files changed, 9 insertions(+), 25 deletions(-) Approvals: Pau Espin Pedrol: Looks good to me, approved Neels Hofmeyr: Looks good to me, but someone else must approve Jenkins Builder: Verified diff --git a/.gitignore b/.gitignore index 1ab84d9..8d3479b 100644 --- a/.gitignore +++ b/.gitignore @@ -9,3 +9,4 @@ state *.pyc selftest/trial_test/ +example/resources.conf diff --git a/example/resources.conf b/example/resources.conf.prod similarity index 78% copy from example/resources.conf copy to example/resources.conf.prod index cb730f5..1e8da53 100644 --- a/example/resources.conf +++ b/example/resources.conf.prod @@ -68,29 +68,29 @@ modem: - label: sierra_1st - path: '/sys/devices/pci0000:00/0000:00:12.2/usb1/1-1/1-1.2' - ki: '80A37E6FDEA931EAC92FFA5F671EFEAD' + path: '/sys/devices/pci0000:00/0000:00:12.2/usb1/1-1/1-1.7/1-1.7.2' + ki: 'EBAB63D06C3F546A16C977CB40E57C68' auth_algo: 'comp128v1' ciphers: [a5_0, a5_1] features: ['sms', 'voice', 'ussd', 'gprs', 'sim'] - label: sierra_2nd - path: '/sys/devices/pci0000:00/0000:00:12.2/usb1/1-1/1-1.3' - ki: '00969E283349D354A8239E877F2E0866' + path: '/sys/devices/pci0000:00/0000:00:12.2/usb1/1-1/1-1.7/1-1.7.3' + ki: 'EBD2B5F6CF3374106D0A66C11F922001' auth_algo: 'comp128v1' ciphers: [a5_0, a5_1] features: ['sms', 'voice', 'ussd', 'gprs', 'sim'] - label: ec20 - path: '/sys/devices/pci0000:00/0000:00:12.2/usb1/1-1/1-1.6' - ki: 'BB70807226393CDBAC8DD3439FF54252' + path: '/sys/devices/pci0000:00/0000:00:12.2/usb1/1-1/1-1.7/1-1.7.6' + ki: '07F35D0A9476646169669401215580E0' auth_algo: 'comp128v1' ciphers: [a5_0, a5_1] features: ['sms', 'ussd', 'gprs', 'sim'] - label: gobi2k - path: '/sys/devices/pci0000:00/0000:00:12.2/usb1/1-1/1-1.5' - ki: '2F70DCA43C45ACB97E947FDD0C7CA30A' + path: '/sys/devices/pci0000:00/0000:00:12.2/usb1/1-1/1-1.7/1-1.7.5' + ki: '5752B3F43277C35D2D1D957007DF74E2' auth_algo: 'comp128v1' ciphers: [a5_0, a5_1] features: ['gprs', 'sim'] diff --git a/example/resources.conf b/example/resources.conf.rnd similarity index 84% rename from example/resources.conf rename to example/resources.conf.rnd index cb730f5..4697bdc 100644 --- a/example/resources.conf +++ b/example/resources.conf.rnd @@ -27,23 +27,6 @@ launch_trx: true ciphers: [a5_0, a5_1] -- label: sysmoCell 5000 - type: osmo-bts-trx - ipa_unit_id: 7 - addr: 10.42.42.51 - band: GSM-1800 - trx_remote_ip: 10.42.42.112 - ciphers: [a5_0, a5_1] - -- label: OCTBTS 3500 - type: osmo-bts-octphy - ipa_unit_id: 8 - addr: 10.42.42.52 - band: GSM-1800 - trx_list: - - hw_addr: 00:0c:90:2e:80:1e - net_device: enp2s0 - arfcn: - arfcn: 512 band: GSM-1800 -- To view, visit https://gerrit.osmocom.org/7275 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ifec851c7ac6fca6b294e57dfe86b92f214ae8f42 Gerrit-PatchSet: 2 Gerrit-Project: osmo-gsm-tester Gerrit-Branch: master Gerrit-Owner: Pau Espin Pedrol <pes...@sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: Neels Hofmeyr <nhofm...@sysmocom.de> Gerrit-Reviewer: Pau Espin Pedrol <pes...@sysmocom.de> Gerrit-Reviewer: lynxis lazus <lyn...@fe80.eu>