From 42cdbce4a88426fb2f6c7150e1c9e601559c7023 Mon Sep 17 00:00:00 2001
From: aptalca <aptalca@linuxserver.io>
Date: Tue, 24 Aug 2021 17:09:55 -0400
Subject: [PATCH] build on native armhf

---
 Jenkinsfile      | 13 +++++++++----
 jenkins-vars.yml |  2 +-
 2 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/Jenkinsfile b/Jenkinsfile
index a1f26a6..f486c99 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -354,7 +354,9 @@ pipeline {
     // Build Docker container for push to LS Repo
     stage('Build-Single') {
       when {
-        environment name: 'MULTIARCH', value: 'false'
+        expression {
+          env.MULTIARCH == 'false' || params.PACKAGE_CHECK == 'true' 
+        }
         environment name: 'EXIT_STATUS', value: ''
       }
       steps {
@@ -379,7 +381,10 @@ pipeline {
     // Build MultiArch Docker containers for push to LS Repo
     stage('Build-Multi') {
       when {
-        environment name: 'MULTIARCH', value: 'true'
+        allOf {
+          environment name: 'MULTIARCH', value: 'true'
+          expression { params.PACKAGE_CHECK == 'false' }
+        }
         environment name: 'EXIT_STATUS', value: ''
       }
       parallel {
@@ -405,7 +410,7 @@ pipeline {
         }
         stage('Build ARMHF') {
           agent {
-            label 'X86-64-MULTI'
+            label 'ARMHF-NATIVE'
           }
           steps {
             echo "Running on node: ${NODE_NAME}"
@@ -439,7 +444,7 @@ pipeline {
         }
         stage('Build ARM64') {
           agent {
-            label 'X86-64-MULTI'
+            label 'ARM64'
           }
           steps {
             echo "Running on node: ${NODE_NAME}"
diff --git a/jenkins-vars.yml b/jenkins-vars.yml
index a99e957..d9fdcad 100644
--- a/jenkins-vars.yml
+++ b/jenkins-vars.yml
@@ -6,7 +6,7 @@ external_type: os
 release_type: prerelease
 release_tag: fedora
 ls_branch: fedora
-use_qemu: true
+armhf_native: true
 repo_vars:
   - BUILD_VERSION_ARG = 'XRDP_VERSION'
   - LS_USER = 'linuxserver'