From 5c258241c1928bb4822ce9106198ba52db3b8b98 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20Blin?= Date: Fri, 2 Dec 2022 12:14:27 -0500 Subject: [PATCH] jenkinsfile: stages is not recognized Change-Id: I124df97bff609d897d617bf2fd9f4c5d1b81f5a8 --- extras/ci/client-qt-gnulinux/Jenkinsfile | 74 ++++++++++++------------ 1 file changed, 36 insertions(+), 38 deletions(-) diff --git a/extras/ci/client-qt-gnulinux/Jenkinsfile b/extras/ci/client-qt-gnulinux/Jenkinsfile index 72eb43b20..1743c8795 100644 --- a/extras/ci/client-qt-gnulinux/Jenkinsfile +++ b/extras/ci/client-qt-gnulinux/Jenkinsfile @@ -95,50 +95,48 @@ pipeline { docker.image('client-validation').withRun('-t -u '+jenkinsUser+' -v '+pwd()+':/foo:rw -w /foo -e BATCH_MODE=1', '/bin/bash') { container -> code:{ - stages { - stage('Build Client') { - steps { - script { - def base_cmd = 'docker exec -t '+container.id+" sh -c '" - def exec_cmd = { cmd -> sh base_cmd+cmd+"'" } + 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' - 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 { - def base_cmd = 'docker exec -t '+container.id+" sh -c '" - def exec_cmd = { cmd -> sh base_cmd+cmd+"'" } + 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 - """) - } + def dockerTopDir = '/foo' + def clientDir = dockerTopDir + '/client-qt' + ansiColor('css') { + exec_cmd(""" + cd ${clientDir} + cd tests/qml + ../../../build/tests/qml_tests + """) } } }