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
19aadc07
Commit
19aadc07
authored
Jun 09, 2021
by
hardy
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
no longer need 3 resources reservation
parent
97d09734
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
2 additions
and
6 deletions
+2
-6
ci-scripts/Jenkinsfile-tmp-multi-enb-nsa
ci-scripts/Jenkinsfile-tmp-multi-enb-nsa
+2
-6
No files found.
ci-scripts/Jenkinsfile-tmp-multi-enb-nsa
View file @
19aadc07
...
@@ -33,10 +33,9 @@ def buildStageStatus = true
...
@@ -33,10 +33,9 @@ def buildStageStatus = true
// Name of the test stage
// Name of the test stage
def
testStageName
=
params
.
pipelineTestStageName
def
testStageName
=
params
.
pipelineTestStageName
// Name of the phone resource
// Name of the phone
/server
resource
def
ciSmartPhonesResource1
=
params
.
SmartPhonesResource1
def
ciSmartPhonesResource1
=
params
.
SmartPhonesResource1
def
ciSmartPhonesResource2
=
params
.
SmartPhonesResource2
def
ciSmartPhonesResource2
=
params
.
SmartPhonesResource2
def
ciSmartPhonesResource3
=
params
.
SmartPhonesResource3
// Global Parameters. Normally they should be populated when the master job
// Global Parameters. Normally they should be populated when the master job
// triggers the slave job with parameters
// triggers the slave job with parameters
...
@@ -53,7 +52,7 @@ pipeline {
...
@@ -53,7 +52,7 @@ pipeline {
options
{
options
{
disableConcurrentBuilds
()
disableConcurrentBuilds
()
ansiColor
(
'xterm'
)
ansiColor
(
'xterm'
)
lock
(
extra:
[[
resource:
ciSmartPhonesResource2
]
,[
resource:
ciSmartPhonesResource3
]
],
resource:
ciSmartPhonesResource1
)
lock
(
extra:
[[
resource:
ciSmartPhonesResource2
]],
resource:
ciSmartPhonesResource1
)
}
}
stages
{
stages
{
stage
(
"Build Init"
)
{
stage
(
"Build Init"
)
{
...
@@ -85,9 +84,6 @@ pipeline {
...
@@ -85,9 +84,6 @@ pipeline {
if
(
params
.
SmartPhonesResource2
==
null
)
{
if
(
params
.
SmartPhonesResource2
==
null
)
{
allParametersPresent
=
false
allParametersPresent
=
false
}
}
if
(
params
.
SmartPhonesResource3
==
null
)
{
allParametersPresent
=
false
}
// 1st eNB parameters
// 1st eNB parameters
if
(
params
.
eNB_IPAddress
==
null
)
{
if
(
params
.
eNB_IPAddress
==
null
)
{
allParametersPresent
=
false
allParametersPresent
=
false
...
...
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