From 134b84b39a27bd238479dbaa6d0a3cdb0ef60fda Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=A9bastien=20Delafond?= <sdelafond@gmail.com>
Date: Thu, 2 Dec 2021 15:00:43 +0100
Subject: [PATCH] jenkins: troubleshoot #2

---
 Jenkinsfile | 31 ++++++++++++++-----------------
 1 file changed, 14 insertions(+), 17 deletions(-)

diff --git a/Jenkinsfile b/Jenkinsfile
index 4a310eb9..3ae1dadf 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -22,29 +22,26 @@ pipeline {
               def arch = "${architecture}" // FIXME: cmon now
               def repo = "${repository}" // FIXME: cmon now
 	      def name = "${arch}/${repo}"
+              def upload = "ftp"
+              def buildDir = "${env.HOME}/build-ngfw_kernels-${env.BRANCH_NAME}-${arch}-${env.BUILD_NUMBER}"
 
               jobs[name] = {
-                stage(name) {
-                  agent { label 'docker && internal' }
-
-		  environment {
-		    upload = "ftp"
-		    buildDir = "${env.HOME}/build-ngfw_kernels-${env.BRANCH_NAME}-${arch}-${env.BUILD_NUMBER}"
-		  }
-
-		  stages {
-		    stage("Prep WS ${name}") {
-		      steps { 
-			dir(buildDir) { checkout scm } }
-		    }
+                node('docker') {
+		  stage(name) {
+		    stages {
+		      stage("Prep WS ${name}") {
+			steps { 
+			  dir(buildDir) { checkout scm } }
+		      }
 
-		    stage("Build ${name}") {
-		      steps {
-			buildKernel(repo, arch, upload, buildDir)
+		      stage("Build ${name}") {
+			steps {
+			  buildKernel(repo, arch, upload, buildDir)
+			}
 		      }
 		    }
 		  }
-		}
+                }
               }
             }
           }