Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
O
OpenXG-RAN
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
lizhongxiao
OpenXG-RAN
Commits
37cc53cf
Commit
37cc53cf
authored
Nov 26, 2021
by
Raphael Defosseux
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix(ci): wrong image tag to deploy CU/DU containers
Signed-off-by:
Raphael Defosseux
<
raphael.defosseux@eurecom.fr
>
parent
1d0abb90
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
5 additions
and
5 deletions
+5
-5
ci-scripts/cls_containerize.py
ci-scripts/cls_containerize.py
+2
-2
ci-scripts/cls_oaicitest.py
ci-scripts/cls_oaicitest.py
+1
-1
ci-scripts/yaml_files/5g_f1_rfsimulator/docker-compose.yaml
ci-scripts/yaml_files/5g_f1_rfsimulator/docker-compose.yaml
+2
-2
No files found.
ci-scripts/cls_containerize.py
View file @
37cc53cf
...
@@ -757,7 +757,7 @@ class Containerize():
...
@@ -757,7 +757,7 @@ class Containerize():
cmd
=
'mkdir -p '
+
logPath
cmd
=
'mkdir -p '
+
logPath
deployStatus
=
subprocess
.
check_output
(
cmd
,
shell
=
True
,
stderr
=
subprocess
.
STDOUT
,
universal_newlines
=
True
,
timeout
=
10
)
deployStatus
=
subprocess
.
check_output
(
cmd
,
shell
=
True
,
stderr
=
subprocess
.
STDOUT
,
universal_newlines
=
True
,
timeout
=
10
)
cmd
=
'docker exec '
+
self
.
pingContName
+
' /bin/bash -c "ping '
+
self
.
pingOptions
+
'" 2>&1 | tee
../cmake_targets/log
/ping_'
+
HTML
.
testCase_id
+
'.log || true'
cmd
=
'docker exec '
+
self
.
pingContName
+
' /bin/bash -c "ping '
+
self
.
pingOptions
+
'" 2>&1 | tee
'
+
logPath
+
'
/ping_'
+
HTML
.
testCase_id
+
'.log || true'
logging
.
debug
(
cmd
)
logging
.
debug
(
cmd
)
deployStatus
=
subprocess
.
check_output
(
cmd
,
shell
=
True
,
stderr
=
subprocess
.
STDOUT
,
universal_newlines
=
True
,
timeout
=
100
)
deployStatus
=
subprocess
.
check_output
(
cmd
,
shell
=
True
,
stderr
=
subprocess
.
STDOUT
,
universal_newlines
=
True
,
timeout
=
100
)
...
@@ -840,7 +840,7 @@ class Containerize():
...
@@ -840,7 +840,7 @@ class Containerize():
# Start the client process
# Start the client process
cmd
=
'docker exec '
+
self
.
cliContName
+
' /bin/bash -c "iperf '
+
self
.
cliOptions
+
'" 2>&1 | tee
../cmake_targets/log
/iperf_client_'
+
HTML
.
testCase_id
+
'.log || true'
cmd
=
'docker exec '
+
self
.
cliContName
+
' /bin/bash -c "iperf '
+
self
.
cliOptions
+
'" 2>&1 | tee
'
+
logPath
+
'
/iperf_client_'
+
HTML
.
testCase_id
+
'.log || true'
logging
.
debug
(
cmd
)
logging
.
debug
(
cmd
)
clientStatus
=
subprocess
.
check_output
(
cmd
,
shell
=
True
,
stderr
=
subprocess
.
STDOUT
,
universal_newlines
=
True
,
timeout
=
100
)
clientStatus
=
subprocess
.
check_output
(
cmd
,
shell
=
True
,
stderr
=
subprocess
.
STDOUT
,
universal_newlines
=
True
,
timeout
=
100
)
...
...
ci-scripts/cls_oaicitest.py
View file @
37cc53cf
...
@@ -3348,7 +3348,7 @@ class OaiCiTest():
...
@@ -3348,7 +3348,7 @@ class OaiCiTest():
self
.
desc
=
'Automatic Termination of OAI-UE'
self
.
desc
=
'Automatic Termination of OAI-UE'
HTML
.
desc
=
self
.
desc
HTML
.
desc
=
self
.
desc
self
.
ShowTestID
()
self
.
ShowTestID
()
self
.
TerminateOAIUE
(
HTML
,
RAN
,
COTS_UE
,
EPC
,
InfraUE
)
self
.
TerminateOAIUE
(
HTML
,
RAN
,
COTS_UE
,
EPC
,
InfraUE
,
CONTAINERS
)
if
(
RAN
.
Initialize_eNB_args
!=
''
):
if
(
RAN
.
Initialize_eNB_args
!=
''
):
self
.
testCase_id
=
'AUTO-KILL-RAN'
self
.
testCase_id
=
'AUTO-KILL-RAN'
HTML
.
testCase_id
=
self
.
testCase_id
HTML
.
testCase_id
=
self
.
testCase_id
...
...
ci-scripts/yaml_files/5g_f1_rfsimulator/docker-compose.yaml
View file @
37cc53cf
...
@@ -225,7 +225,7 @@ services:
...
@@ -225,7 +225,7 @@ services:
timeout
:
5s
timeout
:
5s
retries
:
5
retries
:
5
oai-cu
:
oai-cu
:
image
:
oai-gnb:
f1-test
image
:
oai-gnb:
develop
privileged
:
true
privileged
:
true
container_name
:
rfsim5g-oai-cu
container_name
:
rfsim5g-oai-cu
environment
:
environment
:
...
@@ -261,7 +261,7 @@ services:
...
@@ -261,7 +261,7 @@ services:
timeout
:
5s
timeout
:
5s
retries
:
5
retries
:
5
oai-du
:
oai-du
:
image
:
oai-gnb:
f1-test
image
:
oai-gnb:
develop
privileged
:
true
privileged
:
true
container_name
:
rfsim5g-oai-du
container_name
:
rfsim5g-oai-du
environment
:
environment
:
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment