From 6c70897ed9670274a45e13e3cc6de8b6693f6f21 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=A9bastien=20Blin?=
<sebastien.blin@savoirfairelinux.com>
Date: Fri, 2 Dec 2022 11:29:43 -0500
Subject: [PATCH] misc: fix jenkinsfile
Change-Id: I043de5cdff377624382cfa4775e56d387fabc962
---
extras/ci/client-qt-gnulinux/Jenkinsfile | 9 ++++++---
1 file changed, 6 insertions(+), 3 deletions(-)
diff --git a/extras/ci/client-qt-gnulinux/Jenkinsfile b/extras/ci/client-qt-gnulinux/Jenkinsfile
index 006f3226d..3a9947f70 100644
--- a/extras/ci/client-qt-gnulinux/Jenkinsfile
+++ b/extras/ci/client-qt-gnulinux/Jenkinsfile
@@ -22,7 +22,11 @@
// - ansicolor plugin
pipeline {
- agent 'jami-buildmachine-04.mtl.sfl'
+ agent {
+ node {
+ label 'jami-buildmachine-04.mtl.sfl'
+ }
+ }
triggers {
gerrit customUrl: '',
@@ -47,8 +51,6 @@ pipeline {
description: 'The Gerrit refspec to fetch.')
}
- def cpuCount = sh returnStdout: true, script: 'nproc || echo -n 4'
-
stage('SCM Checkout') {
deleteDir()
// Checkout jami-project to obtain daemon/LRC/client-qt repositories
@@ -77,6 +79,7 @@ pipeline {
def jenkinsUID = sh(returnStdout: true, script: 'id -u jenkins').replaceAll("\n", '').trim()
def jenkinsGID = sh(returnStdout: true, script: 'id -g jenkins').replaceAll("\n", '').trim()
def jenkinsUser = jenkinsUID+':'+jenkinsGID
+ def cpuCount = sh returnStdout: true, script: 'nproc || echo -n 4'
docker.image('client-validation').withRun('-t -u '+jenkinsUser+' -v '+pwd()+':/foo:rw -w /foo -e BATCH_MODE=1', '/bin/bash') {
container -> code:{
--
GitLab