Skip to content

Commit 1213b7d

Browse files
asaezpercodebot
asaezper
authored and
codebot
committed
ci: update retina and remove unused custom labels/requirements
1 parent 80e17e5 commit 1213b7d

18 files changed

+1
-53
lines changed

‎.gitlab/ci/e2e/.env‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
SRSGNB_REGISTRY_URI=registry.gitlab.com/softwareradiosystems/srsgnb
22
RETINA_REGISTRY_PREFIX=registry.gitlab.com/softwareradiosystems/ci/retina
3-
RETINA_VERSION=0.84.1
3+
RETINA_VERSION=0.85.0
44
UBUNTU_VERSION=24.04
55
AMARISOFT_VERSION=2023-09-08
66
AMARISOFT_S72_NTN_VERSION=2024-12-13

‎.gitlab/ci/e2e/android_b200.yml‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@
1010
type: ue
1111
image: ${RETINA_REGISTRY_PREFIX}/android:${RETINA_VERSION}
1212
requirements:
13-
arch: amd64
1413
cpu:
1514
requests: 1
1615
limits: 1
@@ -28,7 +27,6 @@
2827
type: gnb
2928
image: ${RETINA_REGISTRY_PREFIX}/srsgnb:${RETINA_VERSION}
3029
requirements:
31-
arch: amd64
3230
cpu:
3331
requests: 6
3432
limits: 6
@@ -53,7 +51,6 @@
5351
image: ${RETINA_REGISTRY_PREFIX}/open5gs:${OPEN5GS_VERSION}_${RETINA_VERSION}
5452
labels: ["kubernetes.io/hostname=k8s-worker-uhd1"]
5553
requirements:
56-
arch: amd64
5754
cpu:
5855
requests: 4
5956
limits: 4

‎.gitlab/ci/e2e/android_callbox.yml‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@
1010
type: ue
1111
image: ${RETINA_REGISTRY_PREFIX}/android:${RETINA_VERSION}
1212
requirements:
13-
arch: amd64
1413
cpu:
1514
requests: 1
1615
limits: 1
@@ -28,7 +27,6 @@
2827
type: gnb
2928
image: ${RETINA_REGISTRY_PREFIX}/srsgnb:${RETINA_VERSION}
3029
requirements:
31-
arch: amd64
3230
cpu:
3331
requests: 12
3432
limits: 12
@@ -56,7 +54,6 @@
5654
taints: ["purpose=retina"]
5755
force_external_ip: true
5856
requirements:
59-
arch: amd64
6057
cpu:
6158
requests: 4
6259
limits: 4

‎.gitlab/ci/e2e/android_x300.yml‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@
1010
type: ue
1111
image: ${RETINA_REGISTRY_PREFIX}/android:${RETINA_VERSION}
1212
requirements:
13-
arch: amd64
1413
cpu:
1514
requests: 1
1615
limits: 1
@@ -28,7 +27,6 @@
2827
type: gnb
2928
image: ${RETINA_REGISTRY_PREFIX}/srsgnb:${RETINA_VERSION}
3029
requirements:
31-
arch: amd64
3230
cpu:
3331
requests: 8
3432
limits: 8
@@ -56,7 +54,6 @@
5654
labels:
5755
- kubernetes.io/hostname=sdr6
5856
requirements:
59-
arch: amd64
6057
cpu:
6158
requests: 4
6259
limits: 4

‎.gitlab/ci/e2e/rf_b200.yml‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@
1212
labels: ["kubernetes.io/hostname=sdr6"]
1313
nof_ports: 4
1414
requirements:
15-
arch: amd64
1615
cpu:
1716
requests: 12
1817
limits: 12
@@ -33,7 +32,6 @@
3332
image: ${RETINA_REGISTRY_PREFIX}/srsgnb:${RETINA_VERSION}
3433
labels: ["kubernetes.io/hostname=sdr4"]
3534
requirements:
36-
arch: amd64
3735
cpu:
3836
requests: 8
3937
limits: 8
@@ -58,7 +56,6 @@
5856
image: ${RETINA_REGISTRY_PREFIX}/open5gs:${OPEN5GS_VERSION}_${RETINA_VERSION}
5957
taints: ["purpose=retina"]
6058
requirements:
61-
arch: amd64
6259
cpu:
6360
requests: 4
6461
limits: 4

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

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@
1313
- ${ZMQ_HOSTLABEL_1}
1414
nof_ports: 16
1515
requirements:
16-
arch: amd64
1716
cpu:
1817
requests: 12
1918
limits: 12
@@ -35,7 +34,6 @@
3534
labels:
3635
- kubernetes.io/hostname=sdr6
3736
requirements:
38-
arch: amd64
3937
cpu:
4038
requests: 12
4139
limits: 12
@@ -64,7 +62,6 @@
6462
image: ${RETINA_REGISTRY_PREFIX}/amarisoft5gc-remote:${RETINA_VERSION}
6563
taints: ["purpose=retina"]
6664
requirements:
67-
arch: amd64
6865
cpu:
6966
requests: 4
7067
limits: 4

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

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@
1212
labels:
1313
- ${ZMQ_HOSTLABEL_0}
1414
requirements:
15-
arch: amd64
1615
cpu:
1716
requests: 1
1817
memory:
@@ -33,7 +32,6 @@
3332
- name: open5gs
3433
type: 5gc
3534
requirements:
36-
arch: amd64
3735
cpu:
3836
requests: 1
3937
limits: 1
@@ -46,4 +44,3 @@
4644
image: ${RETINA_REGISTRY_PREFIX}/open5gs:${OPEN5GS_VERSION}_${RETINA_VERSION}
4745
labels:
4846
- ${ZMQ_HOSTLABEL_0}
49-

‎.gitlab/ci/e2e/test_mode_acc100.yml‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@
1010
type: gnb
1111
image: ${RETINA_REGISTRY_PREFIX}/srsgnb:${RETINA_VERSION}
1212
requirements:
13-
arch: amd64
1413
cpu:
1514
requests: 10
1615
limits: 10

‎.gitlab/ci/e2e/viavi.yml‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@
1212
labels:
1313
- kubernetes.io/hostname=dell-xr12
1414
requirements:
15-
arch: amd64
1615
cpu:
1716
requests: 10
1817
limits: 10
@@ -42,7 +41,6 @@
4241
- name: metrics-server
4342
type: generic
4443
requirements:
45-
arch: amd64
4644
cpu:
4745
requests: 1
4846
limits: 1

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

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@
1313
- ${ZMQ_HOSTLABEL_0}
1414
nof_ports: 64
1515
requirements:
16-
arch: amd64
1716
cpu:
1817
requests: 5
1918
limits: 5
@@ -38,7 +37,6 @@
3837
labels:
3938
- ${ZMQ_HOSTLABEL_0}
4039
requirements:
41-
arch: amd64
4240
cpu:
4341
requests: 5
4442
limits: 5
@@ -61,7 +59,6 @@
6159
- name: open5gs
6260
type: 5gc
6361
requirements:
64-
arch: amd64
6562
cpu:
6663
requests: 1
6764
limits: 1

0 commit comments

Comments
 (0)