diff --git a/extras/ci/client-qt-gnulinux/Jenkinsfile b/extras/ci/client-qt-gnulinux/Jenkinsfile index e47adc983fcce0bcaefbf8a79b10785a169cb7d7..72eb43b20020fd9b19bc20e14a2e039e227f7c1c 100644 --- a/extras/ci/client-qt-gnulinux/Jenkinsfile +++ b/extras/ci/client-qt-gnulinux/Jenkinsfile @@ -85,7 +85,7 @@ pipeline { } } - /*stage('Build project') { + stage('Build project') { steps { script { def jenkinsUID = sh(returnStdout: true, script: 'id -u jenkins').replaceAll("\n", '').trim() @@ -95,44 +95,50 @@ pipeline { docker.image('client-validation').withRun('-t -u '+jenkinsUser+' -v '+pwd()+':/foo:rw -w /foo -e BATCH_MODE=1', '/bin/bash') { container -> code:{ - def base_cmd = 'docker exec -t '+container.id+" sh -c '" - def exec_cmd = { cmd -> sh base_cmd+cmd+"'" } + stages { + stage('Build Client') { + steps { + script { + def base_cmd = 'docker exec -t '+container.id+" sh -c '" + def exec_cmd = { cmd -> sh base_cmd+cmd+"'" } - def dockerTopDir = '/foo' - def daemonDir = dockerTopDir + '/daemon' - def clientDir = dockerTopDir + '/client-qt' - def installDir = dockerTopDir + '/install' - - stage('Build Client') { - steps { - script { - ansiColor('css') { - exec_cmd(""" - cd ${clientDir} - mkdir build - cd build - cmake .. -DCMAKE_INSTALL_PREFIX=${installDir}/client-qt \ - -DLIBJAMI_INCLUDE_DIR=${daemonDir}/src/jami \ - -DLIBJAMI_XML_INTERFACES_DIR=${daemonDir}/bin/dbus \ - -DCMAKE_PREFIX_PATH=/usr/lib/libqt-jami \ - -DENABLE_TESTS=True - make -j${cpuCount} - make install - """) + def dockerTopDir = '/foo' + def daemonDir = dockerTopDir + '/daemon' + def clientDir = dockerTopDir + '/client-qt' + def installDir = dockerTopDir + '/install' + ansiColor('css') { + exec_cmd(""" + cd ${clientDir} + mkdir build + cd build + cmake .. -DCMAKE_INSTALL_PREFIX=${installDir}/client-qt \ + -DLIBJAMI_INCLUDE_DIR=${daemonDir}/src/jami \ + -DLIBJAMI_XML_INTERFACES_DIR=${daemonDir}/bin/dbus \ + -DCMAKE_PREFIX_PATH=/usr/lib/libqt-jami \ + -DENABLE_TESTS=True + make -j${cpuCount} + make install + """) + } } } } - } - stage('Run Tests') { - steps { - script { - ansiColor('css') { - 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 + """) + } } } } @@ -141,6 +147,6 @@ pipeline { } } } - }*/ + } } }