Skip to content
Snippets Groups Projects
Commit d3fa7213 authored by Sébastien Blin's avatar Sébastien Blin
Browse files

jenkinsfile: remove stages inside docker

Change-Id: Ic761466ece67e5e52d0b7e263ded0fa046308f7a
parent 5c258241
No related branches found
No related tags found
No related merge requests found
...@@ -85,7 +85,7 @@ pipeline { ...@@ -85,7 +85,7 @@ pipeline {
} }
} }
stage('Build project') { stage('Build Client') {
steps { steps {
script { script {
def jenkinsUID = sh(returnStdout: true, script: 'id -u jenkins').replaceAll("\n", '').trim() def jenkinsUID = sh(returnStdout: true, script: 'id -u jenkins').replaceAll("\n", '').trim()
...@@ -95,51 +95,31 @@ pipeline { ...@@ -95,51 +95,31 @@ pipeline {
docker.image('client-validation').withRun('-t -u '+jenkinsUser+' -v '+pwd()+':/foo:rw -w /foo -e BATCH_MODE=1', '/bin/bash') { docker.image('client-validation').withRun('-t -u '+jenkinsUser+' -v '+pwd()+':/foo:rw -w /foo -e BATCH_MODE=1', '/bin/bash') {
container -> code:{ container -> code:{
stage('Build Client') { def base_cmd = 'docker exec -t '+container.id+" sh -c '"
steps { def exec_cmd = { cmd -> sh base_cmd+cmd+"'" }
script {
def base_cmd = 'docker exec -t '+container.id+" sh -c '"
def exec_cmd = { cmd -> sh base_cmd+cmd+"'" }
def dockerTopDir = '/foo' def dockerTopDir = '/foo'
def daemonDir = dockerTopDir + '/daemon' def daemonDir = dockerTopDir + '/daemon'
def clientDir = dockerTopDir + '/client-qt' def clientDir = dockerTopDir + '/client-qt'
def installDir = dockerTopDir + '/install' def installDir = dockerTopDir + '/install'
ansiColor('css') { ansiColor('css') {
exec_cmd(""" exec_cmd("""
cd ${clientDir} cd ${clientDir}
mkdir build mkdir build
cd build cd build
cmake .. -DCMAKE_INSTALL_PREFIX=${installDir}/client-qt \ cmake .. -DCMAKE_INSTALL_PREFIX=${installDir}/client-qt \
-DLIBJAMI_INCLUDE_DIR=${daemonDir}/src/jami \ -DLIBJAMI_INCLUDE_DIR=${daemonDir}/src/jami \
-DLIBJAMI_XML_INTERFACES_DIR=${daemonDir}/bin/dbus \ -DLIBJAMI_XML_INTERFACES_DIR=${daemonDir}/bin/dbus \
-DCMAKE_PREFIX_PATH=/usr/lib/libqt-jami \ -DCMAKE_PREFIX_PATH=/usr/lib/libqt-jami \
-DENABLE_TESTS=True -DENABLE_TESTS=True
make -j${cpuCount} make -j${cpuCount}
make install make install
""") """)
} exec_cmd("""
} cd ${clientDir}
} cd tests/qml
} ../../../build/tests/qml_tests
""")
stage('Run Tests') {
steps {
script {
def base_cmd = 'docker exec -t '+container.id+" sh -c '"
def exec_cmd = { cmd -> sh base_cmd+cmd+"'" }
def dockerTopDir = '/foo'
def clientDir = dockerTopDir + '/client-qt'
ansiColor('css') {
exec_cmd("""
cd ${clientDir}
cd tests/qml
../../../build/tests/qml_tests
""")
}
}
}
} }
} }
} }
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment