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
260e14f5
Commit
260e14f5
authored
Feb 15, 2019
by
Raphael Defosseux
Browse files
Options
Browse Files
Download
Plain Diff
Merge remote-tracking branch 'origin/rhel76-support' into develop_integration_2019_w07_v2
parents
881b9c9d
01ad8de6
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
15 additions
and
4 deletions
+15
-4
ci-scripts/Jenkinsfile-gitlab
ci-scripts/Jenkinsfile-gitlab
+1
-1
ci-scripts/reportBuildLocally.sh
ci-scripts/reportBuildLocally.sh
+1
-1
cmake_targets/tools/build_helper
cmake_targets/tools/build_helper
+13
-2
No files found.
ci-scripts/Jenkinsfile-gitlab
View file @
260e14f5
...
...
@@ -260,7 +260,7 @@ pipeline {
expression
{
doRedHatBuild
}
}
steps
{
gitlabCommitStatus
(
name:
"Build eNb-USRP-
CentOS
"
)
{
gitlabCommitStatus
(
name:
"Build eNb-USRP-
RHE
"
)
{
script
{
try
{
withCredentials
([
...
...
ci-scripts/reportBuildLocally.sh
View file @
260e14f5
...
...
@@ -492,7 +492,7 @@ function report_build {
if
[
-e
./archives/red_hat
]
then
echo
" <h2>Red Hat
(CentOS Linux release 7.4.1708
) -- Summary</h2>"
>>
./build_results.html
echo
" <h2>Red Hat
Enterprise Linux Server release 7.6
) -- Summary</h2>"
>>
./build_results.html
summary_table_header
"Red Hat -- OAI Build eNB -- USRP option"
./archives/red_hat
summary_table_row
"LTE SoftModem - Release 14"
./archives/red_hat/lte-softmodem.Rel14.txt
"Built target lte-softmodem"
./enb_usrp_rh_row1.html
...
...
cmake_targets/tools/build_helper
View file @
260e14f5
...
...
@@ -102,6 +102,7 @@ check_supported_distribution() {
"ubuntu14.04") return 0 ;;
"fedora24") return 0 ;;
"rhel7") return 0 ;;
"rhel7.6") return 0 ;;
"centos7") return 0 ;;
esac
return 1
...
...
@@ -310,10 +311,20 @@ install_usrp_uhd_driver() {
# On newer kernels, it fails to install
$SUDO apt-get -y install uhd-host
fi
# quick workaround for RHE7.6
local distribution=$(get_distribution_release)
if [ -z $1 ]; then
$SUDO uhd_images_downloader
if [[ "$distribution" == "rhel7.6" ]]; then
$SUDO /usr/local/bin/uhd_images_downloader
else
$SUDO uhd_images_downloader
fi
else
$SUDO uhd_images_downloader -i $1
if [[ "$distribution" == "rhel7.6" ]]; then
$SUDO /usr/local/bin/uhd_images_downloader -i $1
else
$SUDO uhd_images_downloader -i $1
fi
fi
}
...
...
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