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
85669c6b
Commit
85669c6b
authored
Sep 12, 2018
by
laurent
Browse files
Options
Browse Files
Download
Plain Diff
Merge remote-tracking branch 'origin/develop' into new_nos1
parents
4bc842ca
957bd567
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
3 additions
and
3 deletions
+3
-3
ci-scripts/Jenkinsfile-gitlab
ci-scripts/Jenkinsfile-gitlab
+2
-2
common/utils/LOG/log.c
common/utils/LOG/log.c
+1
-1
No files found.
ci-scripts/Jenkinsfile-gitlab
View file @
85669c6b
...
...
@@ -237,7 +237,7 @@ pipeline {
sh
"./ci-scripts/reportBuildLocally.sh --git-url ${GIT_URL} --job-name ${JOB_NAME} --build-id ${BUILD_ID} --trigger push --branch ${GIT_BRANCH} --commit ${GIT_COMMIT}"
}
if
(
fileExists
(
'build_results.html'
))
{
sh
"sed -i -e 's#Build-ID: ${BUILD_ID}#Build-ID: <a href=\"{BUILD_URL}\">${BUILD_ID}</a>#' build_results.html"
sh
"sed -i -e 's#Build-ID: ${BUILD_ID}#Build-ID: <a href=\"
$
{BUILD_URL}\">${BUILD_ID}</a>#' build_results.html"
archiveArtifacts
artifacts:
'build_results.html'
}
}
...
...
@@ -376,7 +376,7 @@ pipeline {
sh
"./ci-scripts/reportTestLocally.sh --git-url ${GIT_URL} --job-name ${JOB_NAME} --build-id ${BUILD_ID} --trigger push --branch ${GIT_BRANCH} --commit ${GIT_COMMIT}"
}
if
(
fileExists
(
'test_simulator_results.html'
))
{
sh
"sed -i -e 's#Build-ID: ${BUILD_ID}#Build-ID: <a href=\"{BUILD_URL}\">${BUILD_ID}</a>#' test_simulator_results.html"
sh
"sed -i -e 's#Build-ID: ${BUILD_ID}#Build-ID: <a href=\"
$
{BUILD_URL}\">${BUILD_ID}</a>#' test_simulator_results.html"
archiveArtifacts
artifacts:
'test_simulator_results.html'
}
}
...
...
common/utils/LOG/log.c
View file @
85669c6b
...
...
@@ -454,7 +454,7 @@ int rt = pthread_getname_np(pthread_self(), threadname,bufsize) ;
}
}
int
inline
log_header
(
char
*
log_buffer
,
int
buffsize
,
int
comp
,
int
level
,
const
char
*
format
)
{
static
int
log_header
(
char
*
log_buffer
,
int
buffsize
,
int
comp
,
int
level
,
const
char
*
format
)
{
char
threadname
[
PR_SET_NAME
];
return
snprintf
(
log_buffer
,
buffsize
,
"%s%s[%s]%c %s %s%s"
,
log_level_highlight_end
[
level
],
...
...
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