From d23375e28b2983449b79f0ce31ad525ea9e6ff8a Mon Sep 17 00:00:00 2001
From: trianta <gregcraw2001@gmail.com>
Date: Tue, 24 Feb 2026 05:05:53 -0600
Subject: [PATCH] jenkins: finally fix pipeline

---
 Jenkinsfile | 30 ++++++------------------------
 1 file changed, 6 insertions(+), 24 deletions(-)

diff --git a/Jenkinsfile b/Jenkinsfile
index e0e71b7..40b0259 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -2,21 +2,15 @@ pipeline {
     agent none
     stages {
         stage('Checkout') {
-            when {
-                beforeAgent true
-                expression { return env.GIT_BRANCH =~ 'main' }
-            }
             agent { label 'agent-12' }
+            when { expression { return env.GIT_BRANCH == 'origin/main' } }
             steps {
                 checkout scm
             }
         }
         stage('Build') {
-            when {
-                beforeAgent true
-                expression { return env.GIT_BRANCH =~ 'origin/main' }
-            }
             agent { label 'agent-12' }
+            when { expression { return env.GIT_BRANCH == 'origin/main' } }
             steps {
                 script {
                     docker.build('trianta.dev:latest')
@@ -24,33 +18,24 @@ pipeline {
             }
         }
         stage('Deploy') {
-            when {
-                beforeAgent true
-                expression { return env.GIT_BRANCH =~ 'origin/main' }
-            }
             agent { label 'agent-12' }
+            when { expression { return env.GIT_BRANCH == 'origin/main' } }
             steps {
                 sh 'docker stop trianta.dev && docker rm trianta.dev || exit 0'
                 sh 'docker run -d -e USER=scv -e USER_UID=1001 -e USER_GID=1001 --restart=unless-stopped -p 3466:80 --name trianta.dev trianta.dev:latest'
             }
         }
         stage('Test Checkout') {
-            when {
-                beforeAgent true
-                expression { return !(env.GIT_BRANCH =~ 'origin/main') }
-            }
             agent { label 'agent-13' }
+            when { expression { return env.GIT_BRANCH != 'origin/main' } }
             steps {
                 sh 'echo $GIT_BRANCH'
                 checkout scm
             }
         }
         stage('Test Build') {
-            when {
-                beforeAgent true
-                expression { return !(env.GIT_BRANCH =~ 'origin/main') }
-            }
             agent { label 'agent-13' }
+            when { expression { return env.GIT_BRANCH != 'origin/main' } }
             steps {
                 script {
                     docker.build('test.trianta.dev:latest')
@@ -58,11 +43,8 @@ pipeline {
             }
         }
         stage('Test Deploy') {
-            when {
-                beforeAgent true
-                expression { return !(env.GIT_BRANCH =~ 'origin/main') }
-            }
             agent { label 'agent-13' }
+            when { expression { return env.GIT_BRANCH != 'origin/main' } }
             steps {
                 sh 'docker stop test.trianta.dev && docker rm test.trianta.dev || exit 0'
                 sh 'docker run -d -e USER=scv -e USER_UID=1001 -e USER_GID=1001 --restart=unless-stopped -p 3466:80 --name test.trianta.dev test.trianta.dev:latest'