Skip to content

O
OpenXG-RAN
Commit cdb98704 authored by donganyuan's avatar donganyuan
Browse files
Options

Merge branch 'develop_ci' into 'develop' 

fix gitlab display problem

See merge request !2
parents 946ae925 79f1bc7e
Show whitespace changes
Inline Side-by-side
Showing with 22 additions and 22 deletions
ci-scripts/Jenkinsfile-gitlab
View file @ cdb98704
...@@ -40,7 +40,7 @@ pipeline { ...@@ -40,7 +40,7 @@ pipeline {
disableConcurrentBuilds() disableConcurrentBuilds()
timestamps() timestamps()
gitLabConnection('OAI GitLab') gitLabConnection('OAI GitLab')
gitlabBuilds(builds: ["Build eNb-USRP", "Build basic-sim", "Build phy-sim", "Build eNb-ethernet", "Build UE-ethernet", "Analysis with cppcheck", "Test phy-sim", "Test basic-sim"])//, "Test-FDD-Band7", "Test-TDD-Band40"]) gitlabBuilds(builds: ["Build eNb-USRP", "Build basic-sim", "Build phy-sim", "Build eNb-ethernet", "Build UE-ethernet", "Analysis with cppcheck", "Test phy-sim"])//, "Test basic-sim", "Test-FDD-Band7", "Test-TDD-Band40"])
ansiColor('xterm') ansiColor('xterm')
} }
...@@ -198,32 +198,32 @@ pipeline { ...@@ -198,32 +198,32 @@ pipeline {
} }
} }
} }
stage ("Build eNb-USRP on Red Hat") { // stage ("Build eNb-USRP on Red Hat") {
when { // when {
expression {doRedHatBuild} // expression {doRedHatBuild}
} // }
steps { // steps {
gitlabCommitStatus(name: "Build eNb-USRP-CentOS") { // gitlabCommitStatus(name: "Build eNb-USRP-CentOS") {
script { // script {
try { // try {
withCredentials([ // withCredentials([
[$class: 'UsernamePasswordMultiBinding', credentialsId: "${params.RedHatRemoteCredentials}", usernameVariable: 'RH_Username', passwordVariable: 'RH_Password'] // [$class: 'UsernamePasswordMultiBinding', credentialsId: "${params.RedHatRemoteCredentials}", usernameVariable: 'RH_Username', passwordVariable: 'RH_Password']
]) { // ]) {
sh "./ci-scripts/buildOnRH.sh --workspace $WORKSPACE --job-name ${JOB_NAME} --build-id ${BUILD_ID} --remote-host ${params.RedHatRemoteServer} --remote-path ${params.RedHatWorkingPath} --remote-user-name ${RH_Username} --remote-password ${RH_Password}" // sh "./ci-scripts/buildOnRH.sh --workspace $WORKSPACE --job-name ${JOB_NAME} --build-id ${BUILD_ID} --remote-host ${params.RedHatRemoteServer} --remote-path ${params.RedHatWorkingPath} --remote-user-name ${RH_Username} --remote-password ${RH_Password}"
} // }
} catch (Exception e) { // } catch (Exception e) {
echo "Red Hat build failed not an error now" // echo "Red Hat build failed not an error now"
} // }
} // }
} // }
} // }
} // }
} }
post { post {
always { always {
script { script {
dir ('archives') { dir ('archives') {
sh "zip -r -qq vm_build_logs.zip basic_sim enb_usrp phy_sim cppcheck enb_eth ue_eth red_hat" sh "zip -r -qq vm_build_logs.zip basic_sim enb_usrp phy_sim cppcheck enb_eth ue_eth" //red_hat
} }
if(fileExists('archives/vm_build_logs.zip')) { if(fileExists('archives/vm_build_logs.zip')) {
archiveArtifacts artifacts: 'archives/vm_build_logs.zip' archiveArtifacts artifacts: 'archives/vm_build_logs.zip'
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment