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
spbro
OpenXG-RAN
Commits
59749509
Commit
59749509
authored
Jun 11, 2024
by
Bipin Adhikari
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
few fixes and cleaned comments.
parent
596c51e9
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
11 additions
and
48 deletions
+11
-48
ci-scripts/cls_cluster.py
ci-scripts/cls_cluster.py
+1
-1
ci-scripts/cls_containerize.py
ci-scripts/cls_containerize.py
+5
-42
ci-scripts/cls_static_code_analysis.py
ci-scripts/cls_static_code_analysis.py
+3
-3
ci-scripts/xml_files/container_sa_n310_nrue.xml
ci-scripts/xml_files/container_sa_n310_nrue.xml
+2
-2
No files found.
ci-scripts/cls_cluster.py
View file @
59749509
...
...
@@ -305,7 +305,7 @@ class Cluster:
# Workaround for some servers, we need to erase completely the workspace
# if self.forcedWorkspaceCleanup:
# self.cmd.run(f'rm -Rf {lSourcePath}')
cls_containerize
.
CreateWorkspace
(
self
.
cmd
,
lSourcePath
,
self
.
ranRepository
,
self
.
ranCommitID
,
self
.
ranTargetBranch
,
self
.
ranAllowMerge
)
#cls_containerize.CreateWorkspace was here
self
.
cmd
.
cd
(
lSourcePath
)
# to reduce the amount of data send to OpenShift, we
# manually delete all generated files in the workspace
...
...
ci-scripts/cls_containerize.py
View file @
59749509
...
...
@@ -61,40 +61,7 @@ import cls_oaicitest
IMAGES
=
[
'oai-enb'
,
'oai-lte-ru'
,
'oai-lte-ue'
,
'oai-gnb'
,
'oai-nr-cuup'
,
'oai-gnb-aw2s'
,
'oai-nr-ue'
,
'oai-gnb-asan'
,
'oai-nr-ue-asan'
,
'oai-nr-cuup-asan'
,
'oai-gnb-aerial'
]
def
CreateWorkspace
(
sshSession
,
sourcePath
,
ranRepository
,
ranCommitID
,
ranTargetBranch
,
ranAllowMerge
):
print
(
'-------------------------------------------------- Skipping Old Create Workspace'
)
return
if
ranCommitID
==
''
:
logging
.
error
(
'need ranCommitID in CreateWorkspace()'
)
sys
.
exit
(
'Insufficient Parameter in CreateWorkspace()'
)
sshSession
.
command
(
f'rm -rf
{
sourcePath
}
'
,
'\$'
,
10
)
sshSession
.
command
(
'mkdir -p '
+
sourcePath
,
'\$'
,
5
)
sshSession
.
command
(
'cd '
+
sourcePath
,
'\$'
,
5
)
# Recent version of git (>2.20?) should handle missing .git extension # without problems
if
ranTargetBranch
==
'null'
:
ranTargetBranch
=
'develop'
baseBranch
=
re
.
sub
(
'origin/'
,
''
,
ranTargetBranch
)
sshSession
.
command
(
f'git clone --filter=blob:none -n -b
{
baseBranch
}
{
ranRepository
}
.'
,
'\$'
,
60
)
if
sshSession
.
getBefore
().
count
(
'error'
)
>
0
or
sshSession
.
getBefore
().
count
(
'error'
)
>
0
:
sys
.
exit
(
'error during clone'
)
sshSession
.
command
(
'git config user.email "jenkins@openairinterface.org"'
,
'\$'
,
5
)
sshSession
.
command
(
'git config user.name "OAI Jenkins"'
,
'\$'
,
5
)
sshSession
.
command
(
'mkdir -p cmake_targets/log'
,
'\$'
,
5
)
# if the commit ID is provided use it to point to it
sshSession
.
command
(
f'git checkout -f
{
ranCommitID
}
'
,
'\$'
,
30
)
if
sshSession
.
getBefore
().
count
(
f'HEAD is now at
{
ranCommitID
[:
6
]
}
'
)
!=
1
:
sshSession
.
command
(
'git log --oneline | head -n5'
,
'\$'
,
5
)
logging
.
warning
(
f'problems during checkout, is at:
{
sshSession
.
getBefore
()
}
'
)
else
:
logging
.
debug
(
'successful checkout'
)
# if the branch is not develop, then it is a merge request and we need to do
# the potential merge. Note that merge conflicts should already been checked earlier
if
ranAllowMerge
:
if
ranTargetBranch
==
''
:
ranTargetBranch
=
'develop'
logging
.
debug
(
f'Merging with the target branch:
{
ranTargetBranch
}
'
)
sshSession
.
command
(
f'git merge --ff origin/
{
ranTargetBranch
}
-m "Temporary merge for CI"'
,
'\$'
,
30
)
logging
.
info
(
'This Create Workspace Method is depreciated. Please use the new XML Class'
)
def
ImageTagToUse
(
imageName
,
ranCommitID
,
ranBranch
,
ranAllowMerge
):
shortCommit
=
ranCommitID
[
0
:
8
]
...
...
@@ -327,7 +294,6 @@ class Containerize():
self
.
testCase_id
=
HTML
.
testCase_id
CreateWorkspace
(
cmd
,
lSourcePath
,
self
.
ranRepository
,
self
.
ranCommitID
,
self
.
ranTargetBranch
,
self
.
ranAllowMerge
)
cmd
.
cd
(
lSourcePath
)
# if asterix, copy the entitlement and subscription manager configurations
if
self
.
host
==
'Red Hat'
:
...
...
@@ -526,7 +492,8 @@ class Containerize():
self
.
ranRepository
=
'https://github.com/EpiSci/oai-lte-5g-multi-ue-proxy.git'
self
.
ranAllowMerge
=
False
self
.
ranTargetBranch
=
'master'
CreateWorkspace
(
mySSH
,
lSourcePath
,
self
.
ranRepository
,
self
.
ranCommitID
,
self
.
ranTargetBranch
,
self
.
ranAllowMerge
)
# CreateWorkspace was here
mySSH
.
command
(
'cd '
+
lSourcePath
,
'\$'
,
3
)
# to prevent accidentally overwriting data that might be used later
self
.
ranCommitID
=
oldRanCommidID
self
.
ranRepository
=
oldRanRepository
...
...
@@ -855,8 +822,7 @@ class Containerize():
return
True
def
Create_Workspace
(
self
):
print
(
'-------------------------------new Create Workspace Function'
)
print
(
"running on server id"
,
self
.
eNB_serverId
)
logging
.
info
(
"running on server id"
,
self
.
eNB_serverId
)
if
self
.
eNB_serverId
[
self
.
eNB_instance
]
==
'0'
:
lIpAddr
=
self
.
eNBIPAddress
lUserName
=
self
.
eNBUserName
...
...
@@ -891,9 +857,7 @@ class Containerize():
sshSession
.
command
(
f'rm -rf
{
sourcePath
}
'
,
'\$'
,
10
)
sshSession
.
command
(
'mkdir -p '
+
sourcePath
,
'\$'
,
5
)
print
(
"------------------------------PRINTING PWD"
,
sshSession
.
command
(
'pwd'
,
'\$'
,
2
),
sshSession
.
getBefore
())
sshSession
.
cd
(
sourcePath
)
print
(
sshSession
.
command
(
'pwd'
,
'\$'
,
2
),
sshSession
.
getBefore
())
# Recent version of git (>2.20?) should handle missing .git extension # without problems
if
ranTargetBranch
==
'null'
:
ranTargetBranch
=
'develop'
...
...
@@ -919,7 +883,6 @@ class Containerize():
ranTargetBranch
=
'develop'
logging
.
debug
(
f'Merging with the target branch:
{
ranTargetBranch
}
'
)
sshSession
.
command
(
f'git merge --ff origin/
{
ranTargetBranch
}
-m "Temporary merge for CI"'
,
'\$'
,
30
)
print
(
'---------------------------------------End of Function new Create_Workspace'
)
def
DeployObject
(
self
,
HTML
,
EPC
):
if
self
.
eNB_serverId
[
self
.
eNB_instance
]
==
'0'
:
...
...
@@ -944,7 +907,7 @@ class Containerize():
self
.
deployKind
[
self
.
eNB_instance
]
=
True
mySSH
=
cls_cmd
.
getConnection
(
lIpAddr
)
CreateWorkspace
(
mySSH
,
lSourcePath
,
self
.
ranRepository
,
self
.
ranCommitID
,
self
.
ranTargetBranch
,
self
.
ranAllowMerge
)
# CreateWorkspace was here
mySSH
.
cd
(
lSourcePath
+
'/'
+
self
.
yamlPath
[
self
.
eNB_instance
])
mySSH
.
run
(
'cp docker-compose.y*ml docker-compose-ci.yml'
,
5
)
...
...
ci-scripts/cls_static_code_analysis.py
View file @
59749509
...
...
@@ -105,8 +105,8 @@ class StaticCodeAnalysis():
else
:
full_ran_repo_name
=
self
.
ranRepository
+
'.git'
CreateWorkspace
(
cmd
,
lSourcePath
,
full_ran_repo_name
,
self
.
ranCommitID
,
self
.
ranTargetBranch
,
self
.
ranAllowMerge
)
#CreateWorkspace was here
cmd
.
cd
(
lSourcePath
)
logDir
=
f'
{
lSourcePath
}
/cmake_targets/build_log_
{
self
.
testCase_id
}
'
cmd
.
run
(
f'mkdir -p
{
logDir
}
'
)
cmd
.
run
(
'docker image rm oai-cppcheck:bionic oai-cppcheck:focal'
)
...
...
@@ -239,7 +239,7 @@ class StaticCodeAnalysis():
else
:
full_ran_repo_name
=
self
.
ranRepository
+
'.git'
CreateWorkspace
(
cmd
,
lSourcePath
,
full_ran_repo_name
,
self
.
ranCommitID
,
self
.
ranTargetBranch
,
self
.
ranAllowMerge
)
#CreateWorkspace was here
cmd
.
cd
(
lSourcePath
)
check_options
=
''
if
self
.
ranAllowMerge
:
...
...
ci-scripts/xml_files/container_sa_n310_nrue.xml
View file @
59749509
...
...
@@ -83,8 +83,8 @@
<testCase
id=
"800814"
>
<class>
Create_Workspace
</class>
<desc>
Creating new Workspace
</desc>
<eNB_instance>
0
</eNB_instance>
<eNB_serverId>
0
</eNB_serverId>
<eNB_instance>
1
</eNB_instance>
<eNB_serverId>
1
</eNB_serverId>
</testCase>
<testCase
id=
"020001"
>
<class>
Deploy_Object
</class>
...
...
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