Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
O
OpenXG UE
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
Michael Black
OpenXG UE
Commits
f4b84860
Commit
f4b84860
authored
Nov 28, 2020
by
Raphael Defosseux
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
CI: fix image build log collection
Signed-off-by:
Raphael Defosseux
<
raphael.defosseux@eurecom.fr
>
parent
b1df6200
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
7 additions
and
17 deletions
+7
-17
ci-scripts/cls_oaicitest.py
ci-scripts/cls_oaicitest.py
+1
-1
ci-scripts/main.py
ci-scripts/main.py
+1
-3
ci-scripts/ran.py
ci-scripts/ran.py
+5
-2
ci-scripts/xml_class_list.yml
ci-scripts/xml_class_list.yml
+0
-1
ci-scripts/xml_files/fr1_image_build.xml
ci-scripts/xml_files/fr1_image_build.xml
+0
-10
No files found.
ci-scripts/cls_oaicitest.py
View file @
f4b84860
...
@@ -3085,7 +3085,7 @@ class OaiCiTest():
...
@@ -3085,7 +3085,7 @@ class OaiCiTest():
SSH
.
command
(
'cd '
+
SourceCodePath
,
'\$'
,
5
)
SSH
.
command
(
'cd '
+
SourceCodePath
,
'\$'
,
5
)
SSH
.
command
(
'cd cmake_targets'
,
'\$'
,
5
)
SSH
.
command
(
'cd cmake_targets'
,
'\$'
,
5
)
SSH
.
command
(
'rm -f build.log.zip'
,
'\$'
,
5
)
SSH
.
command
(
'rm -f build.log.zip'
,
'\$'
,
5
)
SSH
.
command
(
'zip build.log.zip build_log_*/*'
,
'\$'
,
60
)
SSH
.
command
(
'zip
-r
build.log.zip build_log_*/*'
,
'\$'
,
60
)
SSH
.
close
()
SSH
.
close
()
def
LogCollectPing
(
self
,
EPC
):
def
LogCollectPing
(
self
,
EPC
):
...
...
ci-scripts/main.py
View file @
f4b84860
...
@@ -128,7 +128,7 @@ def GetParametersFromXML(action):
...
@@ -128,7 +128,7 @@ def GetParametersFromXML(action):
else
:
else
:
RAN
.
backgroundBuild
=
False
RAN
.
backgroundBuild
=
False
elif
action
==
'WaitEndBuild_eNB'
or
action
==
'WaitEndBuild_Image'
:
elif
action
==
'WaitEndBuild_eNB'
:
RAN
.
Build_eNB_args
=
test
.
findtext
(
'Build_eNB_args'
)
RAN
.
Build_eNB_args
=
test
.
findtext
(
'Build_eNB_args'
)
RAN
.
imageKind
=
test
.
findtext
(
'kind'
)
RAN
.
imageKind
=
test
.
findtext
(
'kind'
)
eNB_instance
=
test
.
findtext
(
'eNB_instance'
)
eNB_instance
=
test
.
findtext
(
'eNB_instance'
)
...
@@ -646,8 +646,6 @@ elif re.match('^TesteNB$', mode, re.IGNORECASE) or re.match('^TestUE$', mode, re
...
@@ -646,8 +646,6 @@ elif re.match('^TesteNB$', mode, re.IGNORECASE) or re.match('^TestUE$', mode, re
RAN
.
BuildImage
()
RAN
.
BuildImage
()
elif
action
==
'WaitEndBuild_eNB'
:
elif
action
==
'WaitEndBuild_eNB'
:
RAN
.
WaitBuildeNBisFinished
()
RAN
.
WaitBuildeNBisFinished
()
elif
action
==
'WaitEndBuild_Image'
:
RAN
.
WaitBuildImageisFinished
()
elif
action
==
'Initialize_eNB'
:
elif
action
==
'Initialize_eNB'
:
check_eNB
=
False
check_eNB
=
False
check_OAI_UE
=
False
check_OAI_UE
=
False
...
...
ci-scripts/ran.py
View file @
f4b84860
...
@@ -470,14 +470,17 @@ class RANManagement():
...
@@ -470,14 +470,17 @@ class RANManagement():
# Recover build logs, for the moment only possible when build is successful
# Recover build logs, for the moment only possible when build is successful
mySSH
.
command
(
'docker create --name test ran-build:'
+
imageTag
,
'\$'
,
5
)
mySSH
.
command
(
'docker create --name test ran-build:'
+
imageTag
,
'\$'
,
5
)
mySSH
.
command
(
'mkdir -p cmake_targets/log/ran-build'
,
'\$'
,
5
)
mySSH
.
command
(
'mkdir -p cmake_targets/log/ran-build'
,
'\$'
,
5
)
mySSH
.
command
(
'docker cp test:/oai-ran/cmake_targets/log/.
/tmp/CI-eNB/
cmake_targets/log/ran-build'
,
'\$'
,
5
)
mySSH
.
command
(
'docker cp test:/oai-ran/cmake_targets/log/. cmake_targets/log/ran-build'
,
'\$'
,
5
)
mySSH
.
command
(
'docker rm -f test'
,
'\$'
,
5
)
mySSH
.
command
(
'docker rm -f test'
,
'\$'
,
5
)
for
image
,
shaone
in
danglingShaOnes
:
for
image
,
shaone
in
danglingShaOnes
:
mySSH
.
command
(
'mkdir -p cmake_targets/log/'
+
image
,
'\$'
,
5
)
mySSH
.
command
(
'mkdir -p cmake_targets/log/'
+
image
,
'\$'
,
5
)
mySSH
.
command
(
'docker create --name test '
+
shaone
,
'\$'
,
5
)
mySSH
.
command
(
'docker create --name test '
+
shaone
,
'\$'
,
5
)
mySSH
.
command
(
'docker cp test:/oai-ran/cmake_targets/log/.
/tmp/CI-eNB/
cmake_targets/log/'
+
image
,
'\$'
,
5
)
mySSH
.
command
(
'docker cp test:/oai-ran/cmake_targets/log/. cmake_targets/log/'
+
image
,
'\$'
,
5
)
mySSH
.
command
(
'docker rm -f test'
,
'\$'
,
5
)
mySSH
.
command
(
'docker rm -f test'
,
'\$'
,
5
)
mySSH
.
command
(
'docker image prune --force'
,
'\$'
,
5
)
mySSH
.
command
(
'docker image prune --force'
,
'\$'
,
5
)
mySSH
.
command
(
'cd cmake_targets'
,
'\$'
,
5
)
mySSH
.
command
(
'mkdir -p build_log_'
+
self
.
testCase_id
,
'\$'
,
5
)
mySSH
.
command
(
'mv log/* '
+
'build_log_'
+
self
.
testCase_id
,
'\$'
,
5
)
mySSH
.
close
()
mySSH
.
close
()
logging
.
info
(
'
\u001B
[1m Building OAI Image(s) Pass
\u001B
[0m'
)
logging
.
info
(
'
\u001B
[1m Building OAI Image(s) Pass
\u001B
[0m'
)
...
...
ci-scripts/xml_class_list.yml
View file @
f4b84860
...
@@ -3,7 +3,6 @@
...
@@ -3,7 +3,6 @@
-
Build_eNB
-
Build_eNB
-
Build_Image
-
Build_Image
-
WaitEndBuild_eNB
-
WaitEndBuild_eNB
-
WaitEndBuild_Image
-
Initialize_eNB
-
Initialize_eNB
-
Terminate_eNB
-
Terminate_eNB
-
Initialize_UE
-
Initialize_UE
...
...
ci-scripts/xml_files/fr1_image_build.xml
View file @
f4b84860
...
@@ -19,7 +19,6 @@
...
@@ -19,7 +19,6 @@
For more information about the OpenAirInterface (OAI) Software Alliance:
For more information about the OpenAirInterface (OAI) Software Alliance:
contact@openairinterface.org
contact@openairinterface.org
000004
-->
-->
<testCaseList>
<testCaseList>
<htmlTabRef>
build-tab
</htmlTabRef>
<htmlTabRef>
build-tab
</htmlTabRef>
...
@@ -36,15 +35,6 @@
...
@@ -36,15 +35,6 @@
<kind>
all
</kind>
<kind>
all
</kind>
<eNB_instance>
0
</eNB_instance>
<eNB_instance>
0
</eNB_instance>
<eNB_serverId>
0
</eNB_serverId>
<eNB_serverId>
0
</eNB_serverId>
<backgroundBuild>
True
</backgroundBuild>
</testCase>
<testCase
id=
"000004"
>
<class>
WaitEndBuild_Image
</class>
<desc>
Wait for end of Build eNB
</desc>
<kind>
eNB
</kind>
<eNB_instance>
0
</eNB_instance>
<eNB_serverId>
0
</eNB_serverId>
</testCase>
</testCase>
</testCaseList>
</testCaseList>
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