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
94956cda
Commit
94956cda
authored
Mar 05, 2021
by
Raphael Defosseux
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
CI: increase timeout for wait stages and fix wait on v1
Signed-off-by:
Raphael Defosseux
<
raphael.defosseux@eurecom.fr
>
parent
3797e463
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
16 additions
and
29 deletions
+16
-29
ci-scripts/Jenkinsfile-gitlab
ci-scripts/Jenkinsfile-gitlab
+7
-26
ci-scripts/buildOnVM.sh
ci-scripts/buildOnVM.sh
+3
-3
ci-scripts/waitBuildOnVM.sh
ci-scripts/waitBuildOnVM.sh
+6
-0
No files found.
ci-scripts/Jenkinsfile-gitlab
View file @
94956cda
...
...
@@ -196,16 +196,6 @@ pipeline {
}
}
stage
(
"Start VM -- enb-usrp"
)
{
steps
{
lock
(
vmResource
)
{
timeout
(
time:
5
,
unit:
'MINUTES'
)
{
sh
"./ci-scripts/oai-ci-vm-tool build --workspace $WORKSPACE --variant enb-usrp --job-name ${JOB_NAME} --build-id ${BUILD_ID} --daemon"
}
}
}
}
stage
(
"Start VM -- phy-sim"
)
{
steps
{
lock
(
vmResource
)
{
...
...
@@ -251,7 +241,7 @@ pipeline {
stage
(
"Analysis with cppcheck"
)
{
steps
{
gitlabCommitStatus
(
name:
"Analysis with cppcheck"
)
{
timeout
(
time:
2
0
,
unit:
'MINUTES'
)
{
timeout
(
time:
3
0
,
unit:
'MINUTES'
)
{
sh
"./ci-scripts/oai-ci-vm-tool wait --workspace $WORKSPACE --variant cppcheck --job-name ${JOB_NAME} --build-id ${BUILD_ID}"
}
}
...
...
@@ -260,7 +250,7 @@ pipeline {
stage
(
"Build basic simulator"
)
{
steps
{
gitlabCommitStatus
(
name:
"Build basic-sim"
)
{
timeout
(
time:
2
0
,
unit:
'MINUTES'
)
{
timeout
(
time:
3
0
,
unit:
'MINUTES'
)
{
sh
"./ci-scripts/oai-ci-vm-tool wait --workspace $WORKSPACE --variant basic-sim --job-name ${JOB_NAME} --build-id ${BUILD_ID} --keep-vm-alive"
}
}
...
...
@@ -269,7 +259,7 @@ pipeline {
stage
(
"Build 5G gNB-USRP"
)
{
steps
{
gitlabCommitStatus
(
name:
"Build gNB-USRP"
)
{
timeout
(
time:
2
0
,
unit:
'MINUTES'
)
{
timeout
(
time:
3
0
,
unit:
'MINUTES'
)
{
sh
"./ci-scripts/oai-ci-vm-tool wait --workspace $WORKSPACE --variant gnb-usrp --job-name ${JOB_NAME} --build-id ${BUILD_ID} --keep-vm-alive"
}
}
...
...
@@ -278,25 +268,16 @@ pipeline {
stage
(
"Build 5G NR-UE-USRP"
)
{
steps
{
gitlabCommitStatus
(
name:
"Build nr-UE-USRP"
)
{
timeout
(
time:
2
0
,
unit:
'MINUTES'
)
{
timeout
(
time:
3
0
,
unit:
'MINUTES'
)
{
sh
"./ci-scripts/oai-ci-vm-tool wait --workspace $WORKSPACE --variant nr-ue-usrp --job-name ${JOB_NAME} --build-id ${BUILD_ID} --keep-vm-alive"
}
}
}
}
stage
(
"Build eNB-USRP"
)
{
steps
{
gitlabCommitStatus
(
name:
"Build eNB-USRP"
)
{
timeout
(
time:
20
,
unit:
'MINUTES'
)
{
sh
"./ci-scripts/oai-ci-vm-tool wait --workspace $WORKSPACE --variant enb-usrp --job-name ${JOB_NAME} --build-id ${BUILD_ID}"
}
}
}
}
stage
(
"Build physical simulators"
)
{
steps
{
gitlabCommitStatus
(
name:
"Build phy-sim"
)
{
timeout
(
time:
2
0
,
unit:
'MINUTES'
)
{
timeout
(
time:
3
0
,
unit:
'MINUTES'
)
{
sh
"./ci-scripts/oai-ci-vm-tool wait --workspace $WORKSPACE --variant phy-sim --job-name ${JOB_NAME} --build-id ${BUILD_ID} --keep-vm-alive"
}
}
...
...
@@ -305,7 +286,7 @@ pipeline {
stage
(
"Build eNB-ethernet"
)
{
steps
{
gitlabCommitStatus
(
name:
"Build eNB-ethernet"
)
{
timeout
(
time:
2
0
,
unit:
'MINUTES'
)
{
timeout
(
time:
3
0
,
unit:
'MINUTES'
)
{
sh
"./ci-scripts/oai-ci-vm-tool wait --workspace $WORKSPACE --variant enb-ethernet --job-name ${JOB_NAME} --build-id ${BUILD_ID} --keep-vm-alive"
}
}
...
...
@@ -316,7 +297,7 @@ pipeline {
// This is typically the last one to finish.
lock
(
vmResource
)
{
gitlabCommitStatus
(
name:
"Build UE-ethernet"
)
{
timeout
(
time:
2
0
,
unit:
'MINUTES'
)
{
timeout
(
time:
3
0
,
unit:
'MINUTES'
)
{
sh
"./ci-scripts/oai-ci-vm-tool wait --workspace $WORKSPACE --variant ue-ethernet --job-name ${JOB_NAME} --build-id ${BUILD_ID} --keep-vm-alive"
}
}
...
...
ci-scripts/buildOnVM.sh
View file @
94956cda
...
...
@@ -216,10 +216,10 @@ function build_on_vm {
else
if
[[
"
$VM_NAME
"
==
*
"-enb-ethernet"
*
]]
then
echo
"echo
\"
sleep
20
0 && ./build_oai -I
$BUILD_OPTIONS
\"
> ./my-vm-build.sh"
>>
$VM_CMDS
elif
[[
"
$VM_NAME
"
==
*
"-
enb
-ethernet"
*
]]
echo
"echo
\"
sleep
17
0 && ./build_oai -I
$BUILD_OPTIONS
\"
> ./my-vm-build.sh"
>>
$VM_CMDS
elif
[[
"
$VM_NAME
"
==
*
"-
ue
-ethernet"
*
]]
then
echo
"echo
\"
sleep
10
0 && ./build_oai -I
$BUILD_OPTIONS
\"
> ./my-vm-build.sh"
>>
$VM_CMDS
echo
"echo
\"
sleep
6
0 && ./build_oai -I
$BUILD_OPTIONS
\"
> ./my-vm-build.sh"
>>
$VM_CMDS
else
echo
"echo
\"
./build_oai -I
$BUILD_OPTIONS
\"
> ./my-vm-build.sh"
>>
$VM_CMDS
fi
...
...
ci-scripts/waitBuildOnVM.sh
View file @
94956cda
...
...
@@ -90,6 +90,12 @@ function wait_on_vm_build {
}
function
check_on_vm_build
{
if
[[
"
$VM_NAME
"
==
*
"-enb-usrp"
*
]]
then
echo
"This VM type is no longer supported in the pipeline framework"
return
fi
echo
"############################################################"
echo
"Creating a tmp folder to store results and artifacts"
echo
"############################################################"
...
...
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