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
zzha zzha
OpenXG-RAN
Commits
cc71018e
Commit
cc71018e
authored
1 year ago
by
Jaroslava Fiedlerova
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Define server where to pull OC images
- if the server is not specified in the xml file, eNBIPAddress is taken
parent
a648b9ed
Branches unavailable
2024.w06
2024.w05
2024.w04
2024.w03
2024.w02
2024.w01
2023.w51
2023.w50
2023.w49
2023.w48
2023.w47
2023.w45
2023.w43
2023.w42
2023.w41
2023.w40
2023.w39
2023.w38
2023.w37
2023.w36
2023.w34
2023.w33
2023.w32
2023.w31
2023.w30
2023.w29
2023.w28
2023.w27
v2.1.0
v2.0.0
No related merge requests found
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
8 additions
and
4 deletions
+8
-4
ci-scripts/cls_cluster.py
ci-scripts/cls_cluster.py
+5
-3
ci-scripts/main.py
ci-scripts/main.py
+3
-1
No files found.
ci-scripts/cls_cluster.py
View file @
cc71018e
...
...
@@ -82,6 +82,7 @@ class Cluster:
self
.
ranTargetBranch
=
""
self
.
cmd
=
None
self
.
imageToPull
=
''
self
.
testSvrId
=
None
def
_recreate_entitlements
(
self
):
# recreating entitlements, don't care if deletion fails
...
...
@@ -195,12 +196,13 @@ class Cluster:
self
.
cmd
.
run
(
f'oc delete -f
{
filename
}
'
)
def
PullClusterImage
(
self
,
HTML
,
RAN
):
if
self
.
testSvrId
==
None
:
self
.
testSvrId
=
self
.
eNBIPAddress
if
self
.
imageToPull
==
''
:
HELP
.
GenericHelp
(
CONST
.
Version
)
HELP
.
EPCSrvHelp
(
self
.
imageToPull
)
sys
.
exit
(
'Insufficient eNB Parameters
'
)
sys
.
exit
(
'Insufficient Parameter'
)
logging
.
debug
(
f'Pull OC image
{
self
.
imageToPull
}
to server
{
self
.
testSvrId
}
'
)
self
.
testCase_id
=
HTML
.
testCase_id
cmd
=
cls_cmd
.
getConnection
(
self
.
eNBIPAddress
)
cmd
=
cls_cmd
.
getConnection
(
self
.
testSvrId
)
succeeded
=
OC_login
(
cmd
,
self
.
OCUserName
,
self
.
OCPassword
,
CI_OC_RAN_NAMESPACE
)
if
not
succeeded
:
logging
.
error
(
'
\u001B
[1m OC Cluster Login Failed
\u001B
[0m'
)
...
...
This diff is collapsed.
Click to expand it.
ci-scripts/main.py
View file @
cc71018e
...
...
@@ -431,10 +431,12 @@ def GetParametersFromXML(action):
RAN
.
command
=
test
.
findtext
(
'command'
)
RAN
.
command_fail
=
test
.
findtext
(
'command_fail'
)
in
[
'True'
,
'true'
,
'Yes'
,
'yes'
]
elif
action
==
'Pull_Cluster_Image'
:
# CLUSTER.imageToPull.clear()
string_field
=
test
.
findtext
(
'images_to_pull'
)
if
(
string_field
is
not
None
):
CLUSTER
.
imageToPull
=
string_field
.
split
()
string_field
=
test
.
findtext
(
'test_svr_id'
)
if
(
string_field
is
not
None
):
CLUSTER
.
testSvrId
=
string_field
else
:
logging
.
warning
(
f"unknown action
{
action
}
from option-parsing point-of-view"
)
...
...
This diff is collapsed.
Click to expand it.
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