Skip to content

Commit b918f8d

Browse files
asaezperasaezper
committed
ci,e2e: upgrade amari version
1 parent 277627c commit b918f8d

22 files changed

+153
-315
lines changed

‎.gitlab/ci/e2e.yml‎

Lines changed: 18 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -99,18 +99,12 @@ smoke zmq:
9999
allow_failure: false
100100
interruptible: true
101101
variables:
102-
TESTBED: "" # Check before_script
102+
TESTBED: zmq
103103
MARKERS: smoke
104-
RETINA_LAUNCHER_ARGS: -x ${EXTRA_SMOKE_ZMQ}
104+
RETINA_LAUNCHER_ARGS: -x
105105
RETINA_PARAM_ARGS: gnb.all.pcap=True gnb.all.mac_enable=True gnb.all.rlc_enable=True gnb.all.enable_integrity_protection=True
106106
E2E_LOG_LEVEL: info
107107
CLUSTER: new-retina-e2e-amd64
108-
before_script:
109-
- |
110-
export TESTBED=zmq
111-
if [ -n "${EXTRA_SMOKE_ZMQ}" ]; then
112-
export TESTBED=zmq_smoke
113-
fi
114108
timeout: 1 hour
115109
needs:
116110
- job: smoke relwithdeb cached
@@ -128,49 +122,37 @@ smoke zmq:
128122
variables:
129123
TESTBED: zmq
130124
E2E_LOG_LEVEL: info
125+
RETINA_LAUNCHER_ARGS: -n 2
131126
CLUSTER: new-retina-e2e-amd64
132127
needs:
133128
- job: basic relwithdeb
134129
artifacts: true
135130
- *txrx-lib
136131
- *retina-needs
137132

138-
.zmq-uesim:
139-
stage: zmq
140-
extends: .e2e-run
141-
variables:
142-
GROUP: uesim
143-
TESTBED: zmq_uesim
144-
E2E_LOG_LEVEL: info
145-
needs:
146-
- job: basic relwithdeb
147-
artifacts: true
148-
- job: build uesim zmq driver
149-
artifacts: true
150-
- *retina-needs
151-
152133
srsue:
153134
extends: .zmq
154135
variables:
155136
TESTBED: zmq_srsue
156137
MARKERS: zmq_srsue
157138

158139
amari 1UE:
159-
extends: .zmq-uesim
140+
extends: .zmq
160141
variables:
161142
MARKERS: zmq_single_ue
162143
E2E_LOG_LEVEL: warning
163144
RETINA_PARAM_ARGS: "gnb.all.pcap=True gnb.all.rlc_enable=True gnb.all.enable_integrity_protection=True"
164145

165146
amari 1UE 4x4 mimo:
166-
extends: .zmq-uesim
147+
extends: .zmq
167148
variables:
168149
MARKERS: zmq_4x4_mimo
169150
RETINA_PARAM_ARGS: "gnb.all.enable_integrity_protection=True"
170151

171152
amari 4UE:
172153
extends: .zmq
173154
variables:
155+
RETINA_LAUNCHER_ARGS:
174156
E2E_FILE_OR_DIR: tests/slicing.py
175157
RETINA_PARAM_ARGS: "gnb.all.pcap=True gnb.all.rlc_enable=False gnb.all.enable_integrity_protection=True"
176158

@@ -189,7 +171,7 @@ amari 4UE deb:
189171
- *retina-needs
190172

191173
amari 4UE asan:
192-
extends: .zmq-uesim
174+
extends: .zmq
193175
variables:
194176
MARKERS: smoke
195177
KEYWORDS: iperf
@@ -201,7 +183,7 @@ amari 4UE asan:
201183
- *retina-needs
202184

203185
amari 4UE tsan:
204-
extends: .zmq-uesim
186+
extends: .zmq
205187
variables:
206188
MARKERS: smoke
207189
KEYWORDS: iperf
@@ -213,8 +195,9 @@ amari 4UE tsan:
213195
- *retina-needs
214196

215197
amari 4UE memcheck:
216-
extends: .zmq-uesim
198+
extends: .zmq
217199
variables:
200+
RETINA_LAUNCHER_ARGS:
218201
MARKERS: zmq_valgrind
219202
E2E_LOG_LEVEL: warning
220203
RETINA_PARAM_ARGS: "gnb.all.pcap=True gnb.all.mac_enable=True gnb.all.rlc_enable=True gnb.all.enable_integrity_protection=True"
@@ -225,7 +208,7 @@ amari 4UE memcheck:
225208
- *retina-needs
226209

227210
amari 8UE:
228-
extends: .zmq-uesim
211+
extends: .zmq
229212
variables:
230213
MARKERS: zmq and not smoke
231214
RETINA_PARAM_ARGS: "gnb.all.pcap=True gnb.all.rlc_enable=False gnb.all.enable_integrity_protection=True"
@@ -262,34 +245,36 @@ amari 32UE:
262245
amari 32UE [tests/pucch.py]:
263246
extends: .zmq
264247
variables:
265-
TESTBED: zmq_ntn
248+
TESTBED: zmq
266249
MARKERS: "zmq and not smoke"
267250
RETINA_PARAM_ARGS: "gnb.all.pcap=True gnb.all.rlc_enable=False gnb.all.enable_integrity_protection=True"
268251
E2E_FILE_OR_DIR: tests/pucch.py
269252
needs:
270253
- job: basic relwithdeb
271254
artifacts: true
272-
- job: build amariue ntn zmq driver
255+
- job: build amariue zmq driver
273256
artifacts: true
274257
- *retina-needs
275258

276259
amari 32UE [ping]:
277-
extends: .zmq-uesim
260+
extends: .zmq
278261
variables:
279262
E2E_FILE_OR_DIR: tests/ping.py
280263
MARKERS: "zmq and not smoke"
281264
RETINA_PARAM_ARGS: "gnb.all.pcap=True gnb.all.rlc_enable=False gnb.all.enable_integrity_protection=True"
282265
KEYWORDS: "32"
283266

284267
amari 32UE 2x2 mimo:
285-
extends: .zmq-uesim
268+
extends: .zmq
286269
variables:
270+
RETINA_LAUNCHER_ARGS:
287271
MARKERS: zmq_2x2_mimo
288272
RETINA_PARAM_ARGS: "gnb.all.pcap=True gnb.all.rlc_enable=False gnb.all.enable_integrity_protection=True"
289273

290274
amari 64UE 2x2 mimo:
291275
extends: .zmq
292276
variables:
277+
RETINA_LAUNCHER_ARGS:
293278
E2E_FILE_OR_DIR: tests/iperf.py
294279
KEYWORDS: "64"
295280
RETINA_PARAM_ARGS: "gnb.all.pcap=True gnb.all.rlc_enable=False gnb.all.enable_integrity_protection=True"
@@ -349,16 +334,11 @@ ntn:
349334
variables:
350335
TESTBED: zmq_ntn
351336
MARKERS: zmq_ntn
337+
RETINA_LAUNCHER_ARGS:
352338
parallel:
353339
matrix:
354340
- E2E_FILE_OR_DIR: tests/ping.py
355341
- E2E_FILE_OR_DIR: tests/iperf.py
356-
needs:
357-
- job: basic relwithdeb
358-
artifacts: true
359-
- job: build amariue ntn zmq driver
360-
artifacts: true
361-
- *retina-needs
362342

363343
################################################################################
364344
# TEST MODE

‎.gitlab/ci/e2e/.env‎

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,15 @@
11
SRSGNB_REGISTRY_URI=registry.gitlab.com/softwareradiosystems/srsgnb
22
RETINA_REGISTRY_PREFIX=registry.gitlab.com/softwareradiosystems/ci/retina
3-
RETINA_VERSION=0.86.0
3+
RETINA_VERSION=0.87.1
44
UBUNTU_VERSION=24.04
5-
AMARISOFT_VERSION=2023-09-08
6-
AMARISOFT_S72_NTN_VERSION=2025-09-19
5+
AMARISOFT_VERSION=2025-09-19
76
SRSUE_VERSION=23.11
87
OPEN5GS_VERSION=2.7.0
98
FLEXRIC_VERSION=br-flexric
109
NTN_CHANNEL_EMULATOR_VERSION=0.1
1110
PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin
1211
SRS_TELEGRAF_VERSION=0.16.1
1312
DPDK_VERSION=24.11.2
14-
ZMQ_HOSTLABEL_0=kubernetes.io/hostname=hp-generic-2
15-
ZMQ_HOSTLABEL_1=kubernetes.io/hostname=ci-buildmaster
13+
ZMQ_HOSTLABEL=kubernetes.io/hostname=fpga-virt-master
1614
AMARISOFT_TXRX_BINARY_PATH=../../build_trx_srsran/libtrx_srsran.so
1715
GNB_BUILD_PATH=../../build

‎.gitlab/ci/e2e/s72_uesim.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,9 @@
88

99
- name: amarisoft-ue
1010
type: ue
11-
image: ${RETINA_REGISTRY_PREFIX}/amarisoftue:${AMARISOFT_S72_NTN_VERSION}_${RETINA_VERSION}
11+
image: ${RETINA_REGISTRY_PREFIX}/amarisoftue:${AMARISOFT_VERSION}_${RETINA_VERSION}
1212
labels:
13-
- ${ZMQ_HOSTLABEL_1}
13+
- kubernetes.io/hostname=ci-buildmaster
1414
nof_ports: 16
1515
requirements:
1616
cpu:
@@ -24,7 +24,7 @@
2424
limits: "8G"
2525
resources:
2626
- type: license
27-
model: amarisoft-5g-ext
27+
model: amarisoft-ue.*
2828
- type: ru
2929
model: amariue-s72
3030

‎.gitlab/ci/e2e/test_mode.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
type: gnb
1111
image: ${RETINA_REGISTRY_PREFIX}/srsgnb:${RETINA_VERSION}
1212
labels:
13-
- ${ZMQ_HOSTLABEL_0}
13+
- ${ZMQ_HOSTLABEL}
1414
requirements:
1515
cpu:
1616
requests: 1
@@ -43,4 +43,4 @@
4343
limits: "6G"
4444
image: ${RETINA_REGISTRY_PREFIX}/open5gs:${OPEN5GS_VERSION}_${RETINA_VERSION}
4545
labels:
46-
- ${ZMQ_HOSTLABEL_0}
46+
- ${ZMQ_HOSTLABEL}

‎.gitlab/ci/e2e/zmq.yml‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -10,12 +10,12 @@
1010
type: ue
1111
image: ${RETINA_REGISTRY_PREFIX}/amarisoftue:${AMARISOFT_VERSION}_${RETINA_VERSION}
1212
labels:
13-
- ${ZMQ_HOSTLABEL_0}
13+
- ${ZMQ_HOSTLABEL}
1414
nof_ports: 64
1515
requirements:
1616
cpu:
17-
requests: 5
18-
limits: 5
17+
requests: 6
18+
limits: 6
1919
memory:
2020
requests: "26G"
2121
limits: "26G"
@@ -25,7 +25,7 @@
2525
resources:
2626
- type: zmq
2727
- type: license
28-
model: amarisoft-5g
28+
model: amarisoft-ue.*
2929
shared_files:
3030
- local_path: ${AMARISOFT_TXRX_BINARY_PATH}
3131
remote_path: /opt/lteue/trx_srsran.so
@@ -35,11 +35,11 @@
3535
type: gnb
3636
image: ${RETINA_REGISTRY_PREFIX}/srsgnb:${RETINA_VERSION}
3737
labels:
38-
- ${ZMQ_HOSTLABEL_0}
38+
- ${ZMQ_HOSTLABEL}
3939
requirements:
4040
cpu:
41-
requests: 5
42-
limits: 5
41+
requests: 6
42+
limits: 6
4343
memory:
4444
requests: "26G"
4545
limits: "26G"
@@ -60,8 +60,8 @@
6060
type: 5gc
6161
requirements:
6262
cpu:
63-
requests: 1
64-
limits: 1
63+
requests: 2
64+
limits: 2
6565
memory:
6666
requests: "8G"
6767
limits: "8G"
@@ -70,4 +70,4 @@
7070
limits: "6G"
7171
image: ${RETINA_REGISTRY_PREFIX}/open5gs:${OPEN5GS_VERSION}_${RETINA_VERSION}
7272
labels:
73-
- ${ZMQ_HOSTLABEL_0}
73+
- ${ZMQ_HOSTLABEL}

‎.gitlab/ci/e2e/zmq_cu2du.yml‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -10,12 +10,12 @@
1010
type: ue
1111
image: ${RETINA_REGISTRY_PREFIX}/amarisoftue:${AMARISOFT_VERSION}_${RETINA_VERSION}
1212
labels:
13-
- ${ZMQ_HOSTLABEL_0}
13+
- ${ZMQ_HOSTLABEL}
1414
nof_ports: 64
1515
requirements:
1616
cpu:
17-
requests: 5
18-
limits: 5
17+
requests: 6
18+
limits: 6
1919
memory:
2020
requests: "24G"
2121
limits: "24G"
@@ -25,7 +25,7 @@
2525
resources:
2626
- type: zmq
2727
- type: license
28-
model: amarisoft-5g
28+
model: amarisoft-ue.*
2929
shared_files:
3030
- local_path: ${AMARISOFT_TXRX_BINARY_PATH}
3131
remote_path: /opt/lteue/trx_srsran.so
@@ -35,11 +35,11 @@
3535
type: cu
3636
image: ${RETINA_REGISTRY_PREFIX}/srscu:${RETINA_VERSION}
3737
labels:
38-
- ${ZMQ_HOSTLABEL_0}
38+
- ${ZMQ_HOSTLABEL}
3939
requirements:
4040
cpu:
41-
requests: 1
42-
limits: 1
41+
requests: 2
42+
limits: 2
4343
memory:
4444
requests: "8G"
4545
limits: "8G"
@@ -57,7 +57,7 @@
5757
type: du
5858
image: ${RETINA_REGISTRY_PREFIX}/srsdu:${RETINA_VERSION}
5959
labels:
60-
- ${ZMQ_HOSTLABEL_0}
60+
- ${ZMQ_HOSTLABEL}
6161
requirements:
6262
cpu:
6363
requests: 2
@@ -81,7 +81,7 @@
8181
type: du
8282
image: ${RETINA_REGISTRY_PREFIX}/srsdu:${RETINA_VERSION}
8383
labels:
84-
- ${ZMQ_HOSTLABEL_0}
84+
- ${ZMQ_HOSTLABEL}
8585
requirements:
8686
cpu:
8787
requests: 2
@@ -105,8 +105,8 @@
105105
type: 5gc
106106
requirements:
107107
cpu:
108-
requests: 1
109-
limits: 1
108+
requests: 2
109+
limits: 2
110110
memory:
111111
requests: "8G"
112112
limits: "8G"
@@ -115,4 +115,4 @@
115115
limits: "6G"
116116
image: ${RETINA_REGISTRY_PREFIX}/open5gs:${OPEN5GS_VERSION}_${RETINA_VERSION}
117117
labels:
118-
- ${ZMQ_HOSTLABEL_0}
118+
- ${ZMQ_HOSTLABEL}

0 commit comments

Comments
 (0)