From ded4693141936dfd7e295468fb5d3865b573df1d Mon Sep 17 00:00:00 2001
From: reid <yapishu@users.noreply.github.com>
Date: Wed, 8 Feb 2023 20:50:33 -0600
Subject: [PATCH 01/32] Check arch in install script

---
 release/groundseg_install.sh | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/release/groundseg_install.sh b/release/groundseg_install.sh
index 82a8edb8..a8b527f3 100755
--- a/release/groundseg_install.sh
+++ b/release/groundseg_install.sh
@@ -9,6 +9,7 @@ ACC=Native-Planet
 REPO=GroundSeg
 BRANCH=main
 TAG=v1.0.7
+DEVICE_ARCH=$(uname -m)
 
 # Directory to save the scrips
 SAVE_DIR=/opt/nativeplanet/groundseg
@@ -18,8 +19,13 @@ sudo mkdir -p $SAVE_DIR
 sudo systemctl stop groundseg
 
 # Download GroundSeg binary
+if [[ $DEVICE_ARCH == "aarch64" ]]; then
+sudo wget -O $SAVE_DIR/groundseg \
+  https://github.com/$ACC/$REPO/releases/download/$TAG/groundseg_arm64
+elif [[ $DEVICE_ARCH == "x86_64" ]]; then
 sudo wget -O $SAVE_DIR/groundseg \
   https://github.com/$ACC/$REPO/releases/download/$TAG/groundseg
+fi
 
 sudo chmod +x $SAVE_DIR/groundseg
 

From 7f82830069abb6aea482e000c690f4b3c5e78d51 Mon Sep 17 00:00:00 2001
From: reid <yapishu@users.noreply.github.com>
Date: Wed, 8 Feb 2023 21:43:51 -0600
Subject: [PATCH 02/32] Add multiarch bin build and call child job

---
 Jenkinsfile | 21 ++++++++++++++++++---
 1 file changed, 18 insertions(+), 3 deletions(-)

diff --git a/Jenkinsfile b/Jenkinsfile
index 0c5d30cd..9f817f60 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -27,9 +27,19 @@ pipeline {
             steps {
                 script {
                     if( "${tag}" == "latest" ) {
-                        sh 'mv ./release/version.csv /opt/groundseg/version/'
-                        sh 'mv ./release/standard_install.sh /opt/groundseg/get/install.sh'
-                        sh 'mv ./release/groundseg_install.sh /opt/groundseg/get/only.sh'
+                        sh '''
+                        mkdir -p /opt/groundseg/version/bin && cd ./build-scripts
+                        docker build --tag nativeplanet/groundseg-builder:3.10.9-test .
+                        cd .. && docker run -v "$(pwd)/binary":/binary -v "$(pwd)/api":/api nativeplanet/groundseg-builder:3.10.9
+                        chmod +x ./binary/groundseg
+                        mv ./binary/groundseg /opt/groundseg/version/bin/groundseg_x64
+                        '''
+                        build job: "GroundSeg-ARM", wait: true
+                        sh '''
+                        mv ./release/version.csv /opt/groundseg/version/
+                        mv ./release/standard_install.sh /opt/groundseg/get/install.sh
+                        mv ./release/groundseg_install.sh /opt/groundseg/get/only.sh
+                        '''
                     }
                     if( "${tag}" == "edge" ) {
                         sh 'mv ./release/version_edge.csv /opt/groundseg/version/'
@@ -38,4 +48,9 @@ pipeline {
             }
         }
     }
+    post {
+        always {
+            cleanWs deleteDirs: true, notFailBuild: true
+        }
+    }
 }

From 53157504ca9a29e90afbe95afa6f85f9aba06691 Mon Sep 17 00:00:00 2001
From: reid <yapishu@users.noreply.github.com>
Date: Wed, 8 Feb 2023 22:22:37 -0600
Subject: [PATCH 03/32] stash files between jenkins nodes

---
 Jenkinsfile | 46 ++++++++++++++++++++++++++++++++++++++++++----
 1 file changed, 42 insertions(+), 4 deletions(-)

diff --git a/Jenkinsfile b/Jenkinsfile
index 9f817f60..45feeb09 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -9,7 +9,7 @@ pipeline {
         ).trim()
     }
     stages {
-        stage('Build') {
+        stage('amd64build') {
             environment {
                 tag = sh ( 
                     script: '''
@@ -29,12 +29,51 @@ pipeline {
                     if( "${tag}" == "latest" ) {
                         sh '''
                         mkdir -p /opt/groundseg/version/bin && cd ./build-scripts
-                        docker build --tag nativeplanet/groundseg-builder:3.10.9-test .
+                        docker build --tag nativeplanet/groundseg-builder:3.10.9 .
                         cd .. && docker run -v "$(pwd)/binary":/binary -v "$(pwd)/api":/api nativeplanet/groundseg-builder:3.10.9
                         chmod +x ./binary/groundseg
                         mv ./binary/groundseg /opt/groundseg/version/bin/groundseg_x64
                         '''
-                        build job: "GroundSeg-ARM", wait: true
+                    }
+                }
+            }
+        }
+        node('NP ARM server') {
+            stages {
+                stage('arm64build') {
+                    steps {
+                        git url: 'https://github.com/Native-Planet/GroundSeg.git'
+                        script {
+                            if( "${tag}" == "latest" ) {
+                                sh '''
+                                cd build-scripts
+                                docker build --tag nativeplanet/groundseg-builder:3.10.9 .
+                                cd ..
+                                docker run -v "$(pwd)/binary":/binary -v "$(pwd)/api":/api nativeplanet/groundseg-builder:3.10.9
+                                mv binary/groundseg binary/groundseg_arm64
+                                cd ui
+                                docker buildx build --push --tag nativeplanet/groundseg-webui:latest --platform linux/amd64,linux/arm64 .
+                                '''
+                            }
+                        }
+                    }
+                }
+                stage('stash') {
+                    stash includes: 'binary/**', name: 'groundseg_arm64'
+                }
+            }
+        }
+    stages {
+        stage('unstash') {
+            String binPath = '/opt/groundseg/version/bin/'
+            dir (binPath) {
+                unstash 'groundseg_arm64'
+            }
+        }
+        stage('postbuild') {
+            steps {
+                script {
+                    if( "${tag}" == "latest" ) {
                         sh '''
                         mv ./release/version.csv /opt/groundseg/version/
                         mv ./release/standard_install.sh /opt/groundseg/get/install.sh
@@ -44,7 +83,6 @@ pipeline {
                     if( "${tag}" == "edge" ) {
                         sh 'mv ./release/version_edge.csv /opt/groundseg/version/'
                     }
-                }
             }
         }
     }

From 12516b3e6d50df8a5344cb6daf9fcb3c57775753 Mon Sep 17 00:00:00 2001
From: reid <yapishu@users.noreply.github.com>
Date: Wed, 8 Feb 2023 22:33:09 -0600
Subject: [PATCH 04/32] arm-test branch testing

---
 Jenkinsfile | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/Jenkinsfile b/Jenkinsfile
index 45feeb09..d6decbf1 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -17,6 +17,8 @@ pipeline {
                             echo "latest"
                         elif [ "${environ}" = "edge" ]; then
                             echo "edge"
+                        elif [ "${environ}" = "arm-test" ]; then
+                            echo "arm-test"
                         else
                             echo "nobuild"
                         fi
@@ -26,13 +28,13 @@ pipeline {
             }
             steps {
                 script {
-                    if( "${tag}" == "latest" ) {
+                    if( "${tag}" == "arm-test" ) {
                         sh '''
                         mkdir -p /opt/groundseg/version/bin && cd ./build-scripts
                         docker build --tag nativeplanet/groundseg-builder:3.10.9 .
                         cd .. && docker run -v "$(pwd)/binary":/binary -v "$(pwd)/api":/api nativeplanet/groundseg-builder:3.10.9
                         chmod +x ./binary/groundseg
-                        mv ./binary/groundseg /opt/groundseg/version/bin/groundseg_x64
+                        mv ./binary/groundseg /opt/groundseg/version/bin/groundseg_amd64
                         '''
                     }
                 }
@@ -44,7 +46,7 @@ pipeline {
                     steps {
                         git url: 'https://github.com/Native-Planet/GroundSeg.git'
                         script {
-                            if( "${tag}" == "latest" ) {
+                            if( "${tag}" == "arm-test" ) {
                                 sh '''
                                 cd build-scripts
                                 docker build --tag nativeplanet/groundseg-builder:3.10.9 .
@@ -52,7 +54,7 @@ pipeline {
                                 docker run -v "$(pwd)/binary":/binary -v "$(pwd)/api":/api nativeplanet/groundseg-builder:3.10.9
                                 mv binary/groundseg binary/groundseg_arm64
                                 cd ui
-                                docker buildx build --push --tag nativeplanet/groundseg-webui:latest --platform linux/amd64,linux/arm64 .
+                                # echo docker buildx build --push --tag nativeplanet/groundseg-webui:latest --platform linux/amd64,linux/arm64 .
                                 '''
                             }
                         }

From 44305634a6ee709dfffc543b6c127dca6091aabb Mon Sep 17 00:00:00 2001
From: reid <yapishu@users.noreply.github.com>
Date: Wed, 8 Feb 2023 22:35:33 -0600
Subject: [PATCH 05/32] arm-test

---
 Jenkinsfile | 42 ++++++++++++++++++++++--------------------
 1 file changed, 22 insertions(+), 20 deletions(-)

diff --git a/Jenkinsfile b/Jenkinsfile
index d6decbf1..3f59a4c3 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -40,31 +40,32 @@ pipeline {
                 }
             }
         }
-        node('NP ARM server') {
-            stages {
-                stage('arm64build') {
-                    steps {
-                        git url: 'https://github.com/Native-Planet/GroundSeg.git'
-                        script {
-                            if( "${tag}" == "arm-test" ) {
-                                sh '''
-                                cd build-scripts
-                                docker build --tag nativeplanet/groundseg-builder:3.10.9 .
-                                cd ..
-                                docker run -v "$(pwd)/binary":/binary -v "$(pwd)/api":/api nativeplanet/groundseg-builder:3.10.9
-                                mv binary/groundseg binary/groundseg_arm64
-                                cd ui
-                                # echo docker buildx build --push --tag nativeplanet/groundseg-webui:latest --platform linux/amd64,linux/arm64 .
-                                '''
-                            }
+    }
+    node('NP ARM server') {
+        stages {
+            stage('arm64build') {
+                steps {
+                    git url: 'https://github.com/Native-Planet/GroundSeg.git'
+                    script {
+                        if( "${tag}" == "arm-test" ) {
+                            sh '''
+                            cd build-scripts
+                            docker build --tag nativeplanet/groundseg-builder:3.10.9 .
+                            cd ..
+                            docker run -v "$(pwd)/binary":/binary -v "$(pwd)/api":/api nativeplanet/groundseg-builder:3.10.9
+                            mv binary/groundseg binary/groundseg_arm64
+                            cd ui
+                            # echo docker buildx build --push --tag nativeplanet/groundseg-webui:latest --platform linux/amd64,linux/arm64 .
+                            '''
                         }
                     }
                 }
-                stage('stash') {
-                    stash includes: 'binary/**', name: 'groundseg_arm64'
-                }
+            }
+            stage('stash') {
+                stash includes: 'binary/**', name: 'groundseg_arm64'
             }
         }
+    }
     stages {
         stage('unstash') {
             String binPath = '/opt/groundseg/version/bin/'
@@ -94,3 +95,4 @@ pipeline {
         }
     }
 }
+}

From d32c7764f5fbb1fa012dcaeeb19818b5cfa0844f Mon Sep 17 00:00:00 2001
From: reid <yapishu@users.noreply.github.com>
Date: Thu, 9 Feb 2023 11:04:08 -0600
Subject: [PATCH 06/32] arm-test

---
 Jenkinsfile | 15 ++++-----------
 1 file changed, 4 insertions(+), 11 deletions(-)

diff --git a/Jenkinsfile b/Jenkinsfile
index 3f59a4c3..e678d372 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -41,9 +41,8 @@ pipeline {
             }
         }
     }
-    node('NP ARM server') {
-        stages {
-            stage('arm64build') {
+    stage('arm64build') {
+        agent { node { label 'arm' } }
                 steps {
                     git url: 'https://github.com/Native-Planet/GroundSeg.git'
                     script {
@@ -57,23 +56,18 @@ pipeline {
                             cd ui
                             # echo docker buildx build --push --tag nativeplanet/groundseg-webui:latest --platform linux/amd64,linux/arm64 .
                             '''
+                            stash includes: 'binary/**', name: 'groundseg_arm64'
                         }
                     }
                 }
             }
-            stage('stash') {
-                stash includes: 'binary/**', name: 'groundseg_arm64'
-            }
         }
     }
-    stages {
-        stage('unstash') {
+        stage('postbuild') {
             String binPath = '/opt/groundseg/version/bin/'
             dir (binPath) {
                 unstash 'groundseg_arm64'
             }
-        }
-        stage('postbuild') {
             steps {
                 script {
                     if( "${tag}" == "latest" ) {
@@ -95,4 +89,3 @@ pipeline {
         }
     }
 }
-}

From bb441b592b5ab3fb93e97d7b840b4fb2c79e38b9 Mon Sep 17 00:00:00 2001
From: reid <yapishu@users.noreply.github.com>
Date: Thu, 9 Feb 2023 11:06:02 -0600
Subject: [PATCH 07/32] arm-test

---
 Jenkinsfile | 37 +++++++++++++++++--------------------
 1 file changed, 17 insertions(+), 20 deletions(-)

diff --git a/Jenkinsfile b/Jenkinsfile
index e678d372..f808be91 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -40,29 +40,26 @@ pipeline {
                 }
             }
         }
-    }
-    stage('arm64build') {
-        agent { node { label 'arm' } }
-                steps {
-                    git url: 'https://github.com/Native-Planet/GroundSeg.git'
-                    script {
-                        if( "${tag}" == "arm-test" ) {
-                            sh '''
-                            cd build-scripts
-                            docker build --tag nativeplanet/groundseg-builder:3.10.9 .
-                            cd ..
-                            docker run -v "$(pwd)/binary":/binary -v "$(pwd)/api":/api nativeplanet/groundseg-builder:3.10.9
-                            mv binary/groundseg binary/groundseg_arm64
-                            cd ui
-                            # echo docker buildx build --push --tag nativeplanet/groundseg-webui:latest --platform linux/amd64,linux/arm64 .
-                            '''
-                            stash includes: 'binary/**', name: 'groundseg_arm64'
+        stage('arm64build') {
+            agent { node { label 'arm' } }
+                    steps {
+                        git url: 'https://github.com/Native-Planet/GroundSeg.git'
+                        script {
+                            if( "${tag}" == "arm-test" ) {
+                                sh '''
+                                cd build-scripts
+                                docker build --tag nativeplanet/groundseg-builder:3.10.9 .
+                                cd ..
+                                docker run -v "$(pwd)/binary":/binary -v "$(pwd)/api":/api nativeplanet/groundseg-builder:3.10.9
+                                mv binary/groundseg binary/groundseg_arm64
+                                cd ui
+                                # echo docker buildx build --push --tag nativeplanet/groundseg-webui:latest --platform linux/amd64,linux/arm64 .
+                                '''
+                                stash includes: 'binary/**', name: 'groundseg_arm64'
+                            }
                         }
                     }
                 }
-            }
-        }
-    }
         stage('postbuild') {
             String binPath = '/opt/groundseg/version/bin/'
             dir (binPath) {

From 25979c6ba357248e90874cbde4ed7c6336a91976 Mon Sep 17 00:00:00 2001
From: reid <yapishu@users.noreply.github.com>
Date: Thu, 9 Feb 2023 11:06:33 -0600
Subject: [PATCH 08/32] Update Jenkinsfile

---
 Jenkinsfile | 1 +
 1 file changed, 1 insertion(+)

diff --git a/Jenkinsfile b/Jenkinsfile
index f808be91..ee4435fe 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -86,3 +86,4 @@ pipeline {
         }
     }
 }
+}

From 76b205b82ff344ad6d2c28902f98ac8f0453bf7e Mon Sep 17 00:00:00 2001
From: reid <yapishu@users.noreply.github.com>
Date: Thu, 9 Feb 2023 11:07:41 -0600
Subject: [PATCH 09/32] Update Jenkinsfile

---
 Jenkinsfile | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/Jenkinsfile b/Jenkinsfile
index ee4435fe..37eef2e0 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -61,11 +61,11 @@ pipeline {
                     }
                 }
         stage('postbuild') {
-            String binPath = '/opt/groundseg/version/bin/'
-            dir (binPath) {
-                unstash 'groundseg_arm64'
-            }
             steps {
+                String binPath = '/opt/groundseg/version/bin/'
+                dir (binPath) {
+                    unstash 'groundseg_arm64'
+                }
                 script {
                     if( "${tag}" == "latest" ) {
                         sh '''

From b096bc6e5494aba263350d4eb3bf42257d55675a Mon Sep 17 00:00:00 2001
From: reid <yapishu@users.noreply.github.com>
Date: Thu, 9 Feb 2023 11:11:22 -0600
Subject: [PATCH 10/32] Update Jenkinsfile

---
 Jenkinsfile | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/Jenkinsfile b/Jenkinsfile
index 37eef2e0..f72dae60 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -79,11 +79,11 @@ pipeline {
                     }
             }
         }
-    }
-    post {
-        always {
-            cleanWs deleteDirs: true, notFailBuild: true
         }
     }
-}
+        post {
+            always {
+                cleanWs deleteDirs: true, notFailBuild: true
+            }
+        }
 }

From 276cfbce75b18506f0c726c5eb1551a374b17ee0 Mon Sep 17 00:00:00 2001
From: reid <yapishu@users.noreply.github.com>
Date: Thu, 9 Feb 2023 11:13:39 -0600
Subject: [PATCH 11/32] Update Jenkinsfile

---
 Jenkinsfile | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/Jenkinsfile b/Jenkinsfile
index f72dae60..5d0ee3c8 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -62,9 +62,8 @@ pipeline {
                 }
         stage('postbuild') {
             steps {
-                String binPath = '/opt/groundseg/version/bin/'
-                dir (binPath) {
-                    unstash 'groundseg_arm64'
+                dir('/opt/groundseg/version/bin/'){
+                unstash 'groundseg_arm64'
                 }
                 script {
                     if( "${tag}" == "latest" ) {

From faeff35313fbe6f615647da5ca28724b520b46fa Mon Sep 17 00:00:00 2001
From: reid <yapishu@users.noreply.github.com>
Date: Thu, 9 Feb 2023 12:00:39 -0600
Subject: [PATCH 12/32] Update Jenkinsfile

---
 Jenkinsfile | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/Jenkinsfile b/Jenkinsfile
index 5d0ee3c8..18ca37f2 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -30,9 +30,13 @@ pipeline {
                 script {
                     if( "${tag}" == "arm-test" ) {
                         sh '''
-                        mkdir -p /opt/groundseg/version/bin && cd ./build-scripts
+                        echo "debug: building amd64"
+                        mkdir -p /opt/groundseg/version/bin
+                        cd ./build-scripts
                         docker build --tag nativeplanet/groundseg-builder:3.10.9 .
-                        cd .. && docker run -v "$(pwd)/binary":/binary -v "$(pwd)/api":/api nativeplanet/groundseg-builder:3.10.9
+                        cd ..
+                        ls
+                        docker run -v "$(pwd)/binary":/binary -v "$(pwd)/api":/api nativeplanet/groundseg-builder:3.10.9
                         chmod +x ./binary/groundseg
                         mv ./binary/groundseg /opt/groundseg/version/bin/groundseg_amd64
                         '''
@@ -47,6 +51,7 @@ pipeline {
                         script {
                             if( "${tag}" == "arm-test" ) {
                                 sh '''
+                                echo "debug: building arm64"
                                 cd build-scripts
                                 docker build --tag nativeplanet/groundseg-builder:3.10.9 .
                                 cd ..
@@ -55,7 +60,7 @@ pipeline {
                                 cd ui
                                 # echo docker buildx build --push --tag nativeplanet/groundseg-webui:latest --platform linux/amd64,linux/arm64 .
                                 '''
-                                stash includes: 'binary/**', name: 'groundseg_arm64'
+                                stash includes: 'binary/groundseg_arm64', name: 'groundseg_arm64'
                             }
                         }
                     }

From eaae68b4b5d3a0b9644d93fa6db17aeaccb08353 Mon Sep 17 00:00:00 2001
From: reid <yapishu@users.noreply.github.com>
Date: Thu, 9 Feb 2023 12:03:48 -0600
Subject: [PATCH 13/32] Update Jenkinsfile

---
 Jenkinsfile | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Jenkinsfile b/Jenkinsfile
index 18ca37f2..88844ec2 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -35,8 +35,8 @@ pipeline {
                         cd ./build-scripts
                         docker build --tag nativeplanet/groundseg-builder:3.10.9 .
                         cd ..
-                        ls
-                        docker run -v "$(pwd)/binary":/binary -v "$(pwd)/api":/api nativeplanet/groundseg-builder:3.10.9
+                        ls api
+                        docker run -v ./binary:/binary -v ./api:/api nativeplanet/groundseg-builder:3.10.9
                         chmod +x ./binary/groundseg
                         mv ./binary/groundseg /opt/groundseg/version/bin/groundseg_amd64
                         '''

From 9e93dd58a3a7aa2990edc984ee190131658cf95e Mon Sep 17 00:00:00 2001
From: reid <yapishu@users.noreply.github.com>
Date: Thu, 9 Feb 2023 12:06:52 -0600
Subject: [PATCH 14/32] Update Jenkinsfile

---
 Jenkinsfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Jenkinsfile b/Jenkinsfile
index 88844ec2..da979b0e 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -36,7 +36,7 @@ pipeline {
                         docker build --tag nativeplanet/groundseg-builder:3.10.9 .
                         cd ..
                         ls api
-                        docker run -v ./binary:/binary -v ./api:/api nativeplanet/groundseg-builder:3.10.9
+                        docker run -v $(pwd)/binary:/binary -v $(pwd)/api:/api nativeplanet/groundseg-builder:3.10.9
                         chmod +x ./binary/groundseg
                         mv ./binary/groundseg /opt/groundseg/version/bin/groundseg_amd64
                         '''

From fa3e2641f1f93f8f699dee5fd83cd46319d5008a Mon Sep 17 00:00:00 2001
From: reid <yapishu@users.noreply.github.com>
Date: Thu, 9 Feb 2023 12:15:10 -0600
Subject: [PATCH 15/32] Update Jenkinsfile

---
 Jenkinsfile | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/Jenkinsfile b/Jenkinsfile
index da979b0e..f4033b22 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -55,12 +55,15 @@ pipeline {
                                 cd build-scripts
                                 docker build --tag nativeplanet/groundseg-builder:3.10.9 .
                                 cd ..
-                                docker run -v "$(pwd)/binary":/binary -v "$(pwd)/api":/api nativeplanet/groundseg-builder:3.10.9
+                                rm -rf /var/jenkins_home/tmp
+                                mkdir -p /var/jenkins_home/tmp
+                                cp -r api /var/jenkins_home/tmp
+                                docker run -v /home/np/np-cicd/jenkins_conf/tmp/binary:/binary -v /home/np/np-cicd/jenkins_conf/tmp/api:/api nativeplanet/groundseg-builder:3.10.9
                                 mv binary/groundseg binary/groundseg_arm64
                                 cd ui
                                 # echo docker buildx build --push --tag nativeplanet/groundseg-webui:latest --platform linux/amd64,linux/arm64 .
                                 '''
-                                stash includes: 'binary/groundseg_arm64', name: 'groundseg_arm64'
+                                stash includes: '/var/jenkins_home/tmp/binary/groundseg_arm64', name: 'groundseg_arm64'
                             }
                         }
                     }

From d1d3c4f7b3bfed04a8b8891a1e8997f8246beeca Mon Sep 17 00:00:00 2001
From: reid <yapishu@users.noreply.github.com>
Date: Thu, 9 Feb 2023 12:20:49 -0600
Subject: [PATCH 16/32] Update Jenkinsfile

---
 Jenkinsfile | 18 ++++++++----------
 1 file changed, 8 insertions(+), 10 deletions(-)

diff --git a/Jenkinsfile b/Jenkinsfile
index f4033b22..9d3e97e9 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -35,10 +35,12 @@ pipeline {
                         cd ./build-scripts
                         docker build --tag nativeplanet/groundseg-builder:3.10.9 .
                         cd ..
-                        ls api
-                        docker run -v $(pwd)/binary:/binary -v $(pwd)/api:/api nativeplanet/groundseg-builder:3.10.9
-                        chmod +x ./binary/groundseg
-                        mv ./binary/groundseg /opt/groundseg/version/bin/groundseg_amd64
+                        rm -rf /var/jenkins_home/tmp
+                        mkdir -p /var/jenkins_home/tmp
+                        cp -r api /var/jenkins_home/tmp
+                        docker run -v /home/np/np-cicd/jenkins_conf/tmp/binary:/binary -v /home/np/np-cicd/jenkins_conf/tmp/api:/api nativeplanet/groundseg-builder:3.10.9
+                        chmod +x /var/jenkins_home/tmp/binary/groundseg
+                        mv /var/jenkins_home/tmp/binary/groundseg /opt/groundseg/version/bin/groundseg_amd64
                         '''
                     }
                 }
@@ -51,19 +53,15 @@ pipeline {
                         script {
                             if( "${tag}" == "arm-test" ) {
                                 sh '''
-                                echo "debug: building arm64"
                                 cd build-scripts
                                 docker build --tag nativeplanet/groundseg-builder:3.10.9 .
                                 cd ..
-                                rm -rf /var/jenkins_home/tmp
-                                mkdir -p /var/jenkins_home/tmp
-                                cp -r api /var/jenkins_home/tmp
-                                docker run -v /home/np/np-cicd/jenkins_conf/tmp/binary:/binary -v /home/np/np-cicd/jenkins_conf/tmp/api:/api nativeplanet/groundseg-builder:3.10.9
+                                docker run -v "$(pwd)/binary":/binary -v "$(pwd)/api":/api nativeplanet/groundseg-builder:3.10.9
                                 mv binary/groundseg binary/groundseg_arm64
                                 cd ui
                                 # echo docker buildx build --push --tag nativeplanet/groundseg-webui:latest --platform linux/amd64,linux/arm64 .
                                 '''
-                                stash includes: '/var/jenkins_home/tmp/binary/groundseg_arm64', name: 'groundseg_arm64'
+                                stash includes: 'binary/groundseg_arm64', name: 'groundseg_arm64'
                             }
                         }
                     }

From 7a9f2ac55310283053115efd56c1c93b5d6415f2 Mon Sep 17 00:00:00 2001
From: reid <yapishu@users.noreply.github.com>
Date: Thu, 9 Feb 2023 12:40:54 -0600
Subject: [PATCH 17/32] Update Jenkinsfile

---
 Jenkinsfile | 1 -
 1 file changed, 1 deletion(-)

diff --git a/Jenkinsfile b/Jenkinsfile
index 9d3e97e9..28703362 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -49,7 +49,6 @@ pipeline {
         stage('arm64build') {
             agent { node { label 'arm' } }
                     steps {
-                        git url: 'https://github.com/Native-Planet/GroundSeg.git'
                         script {
                             if( "${tag}" == "arm-test" ) {
                                 sh '''

From f455d5fabc03280aba1843a9e8320c7bfb156b13 Mon Sep 17 00:00:00 2001
From: reid <yapishu@users.noreply.github.com>
Date: Thu, 9 Feb 2023 13:18:49 -0600
Subject: [PATCH 18/32] Update Jenkinsfile

---
 Jenkinsfile | 60 +++++++++++++++++++++++++++++++----------------------
 1 file changed, 35 insertions(+), 25 deletions(-)

diff --git a/Jenkinsfile b/Jenkinsfile
index 28703362..74236d40 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -30,41 +30,51 @@ pipeline {
                 script {
                     if( "${tag}" == "arm-test" ) {
                         sh '''
-                        echo "debug: building amd64"
-                        mkdir -p /opt/groundseg/version/bin
-                        cd ./build-scripts
+                        mkdir -p /opt/groundseg/version/bin && cd ./build-scripts
                         docker build --tag nativeplanet/groundseg-builder:3.10.9 .
-                        cd ..
-                        rm -rf /var/jenkins_home/tmp
-                        mkdir -p /var/jenkins_home/tmp
-                        cp -r api /var/jenkins_home/tmp
-                        docker run -v /home/np/np-cicd/jenkins_conf/tmp/binary:/binary -v /home/np/np-cicd/jenkins_conf/tmp/api:/api nativeplanet/groundseg-builder:3.10.9
-                        chmod +x /var/jenkins_home/tmp/binary/groundseg
-                        mv /var/jenkins_home/tmp/binary/groundseg /opt/groundseg/version/bin/groundseg_amd64
+                        cd .. && docker run -v "$(pwd)/binary":/binary -v "$(pwd)/api":/api nativeplanet/groundseg-builder:3.10.9
+                        chmod +x ./binary/groundseg
+                        mv ./binary/groundseg /opt/groundseg/version/bin/groundseg_amd64
                         '''
                     }
                 }
             }
         }
         stage('arm64build') {
+            environment {
+                tag = sh ( 
+                    script: '''
+                        if [ "${environ}" = "main" ]; then
+                            echo "latest"
+                        elif [ "${environ}" = "edge" ]; then
+                            echo "edge"
+                        elif [ "${environ}" = "arm-test" ]; then
+                            echo "arm-test"
+                        else
+                            echo "nobuild"
+                        fi
+                    ''',
+                    returnStdout: true
+                ).trim()
+            }
             agent { node { label 'arm' } }
-                    steps {
-                        script {
-                            if( "${tag}" == "arm-test" ) {
-                                sh '''
-                                cd build-scripts
-                                docker build --tag nativeplanet/groundseg-builder:3.10.9 .
-                                cd ..
-                                docker run -v "$(pwd)/binary":/binary -v "$(pwd)/api":/api nativeplanet/groundseg-builder:3.10.9
-                                mv binary/groundseg binary/groundseg_arm64
-                                cd ui
-                                # echo docker buildx build --push --tag nativeplanet/groundseg-webui:latest --platform linux/amd64,linux/arm64 .
-                                '''
-                                stash includes: 'binary/groundseg_arm64', name: 'groundseg_arm64'
-                            }
-                        }
+            steps {
+                script {
+                    if( "${tag}" == "arm-test" ) {
+                        sh '''
+                        cd build-scripts
+                        docker build --tag nativeplanet/groundseg-builder:3.10.9 .
+                        cd ..
+                        docker run -v "$(pwd)/binary":/binary -v "$(pwd)/api":/api nativeplanet/groundseg-builder:3.10.9
+                        mv binary/groundseg binary/groundseg_arm64
+                        cd ui
+                        # echo docker buildx build --push --tag nativeplanet/groundseg-webui:latest --platform linux/amd64,linux/arm64 .
+                        '''
+                        stash includes: 'binary/**', name: 'groundseg_arm64'
                     }
                 }
+            }
+                }
         stage('postbuild') {
             steps {
                 dir('/opt/groundseg/version/bin/'){

From c121b4d3e65b8c4012ccdebf9e8db6d48086337a Mon Sep 17 00:00:00 2001
From: reid <yapishu@users.noreply.github.com>
Date: Thu, 9 Feb 2023 13:23:01 -0600
Subject: [PATCH 19/32] Update Jenkinsfile

---
 Jenkinsfile | 32 +++++++++++++++++++++++++++-----
 1 file changed, 27 insertions(+), 5 deletions(-)

diff --git a/Jenkinsfile b/Jenkinsfile
index 74236d40..2c5f4c6e 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -30,11 +30,17 @@ pipeline {
                 script {
                     if( "${tag}" == "arm-test" ) {
                         sh '''
-                        mkdir -p /opt/groundseg/version/bin && cd ./build-scripts
+                        echo "debug: building amd64"
+                        mkdir -p /opt/groundseg/version/bin
+                        cd ./build-scripts
                         docker build --tag nativeplanet/groundseg-builder:3.10.9 .
-                        cd .. && docker run -v "$(pwd)/binary":/binary -v "$(pwd)/api":/api nativeplanet/groundseg-builder:3.10.9
-                        chmod +x ./binary/groundseg
-                        mv ./binary/groundseg /opt/groundseg/version/bin/groundseg_amd64
+                        cd ..
+                        rm -rf /var/jenkins_home/tmp
+                        mkdir -p /var/jenkins_home/tmp
+                        cp -r api /var/jenkins_home/tmp
+                        docker run -v /home/np/np-cicd/jenkins_conf/tmp/binary:/binary -v /home/np/np-cicd/jenkins_conf/tmp/api:/api nativeplanet/groundseg-builder:3.10.9
+                        chmod +x /var/jenkins_home/tmp/binary/groundseg
+                        mv /var/jenkins_home/tmp/binary/groundseg /opt/groundseg/version/bin/groundseg_amd64
                         '''
                     }
                 }
@@ -70,12 +76,28 @@ pipeline {
                         cd ui
                         # echo docker buildx build --push --tag nativeplanet/groundseg-webui:latest --platform linux/amd64,linux/arm64 .
                         '''
-                        stash includes: 'binary/**', name: 'groundseg_arm64'
+                        stash includes: 'binary/groundseg_arm64', name: 'groundseg_arm64'
                     }
                 }
             }
                 }
         stage('postbuild') {
+            environment {
+                tag = sh ( 
+                    script: '''
+                        if [ "${environ}" = "main" ]; then
+                            echo "latest"
+                        elif [ "${environ}" = "edge" ]; then
+                            echo "edge"
+                        elif [ "${environ}" = "arm-test" ]; then
+                            echo "arm-test"
+                        else
+                            echo "nobuild"
+                        fi
+                    ''',
+                    returnStdout: true
+                ).trim()
+            }
             steps {
                 dir('/opt/groundseg/version/bin/'){
                 unstash 'groundseg_arm64'

From 028bdb596b72f0b0250d4d3d223711adb6056eb8 Mon Sep 17 00:00:00 2001
From: reid <yapishu@users.noreply.github.com>
Date: Thu, 9 Feb 2023 14:00:30 -0600
Subject: [PATCH 20/32] Update Jenkinsfile

---
 Jenkinsfile | 89 ++++++++++++++++-------------------------------------
 1 file changed, 26 insertions(+), 63 deletions(-)

diff --git a/Jenkinsfile b/Jenkinsfile
index 2c5f4c6e..2aa83644 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -1,107 +1,70 @@
 pipeline {
     agent any
     environment {
-        environ = sh ( 
+        tag = sh ( 
             script: '''
-                echo $BRANCH_NAME|sed 's@origin/@@g'
+                environ=`echo $BRANCH_NAME|sed 's@origin/@@g'`
+                if [ "${environ}" = "main" ]; then
+                    echo "latest"
+                elif [ "${environ}" = "edge" ]; then
+                    echo "edge"
+                elif [ "${environ}" = "arm-test" ]; then
+                    echo "arm-test"
+                else
+                    echo "nobuild"
+                fi
             ''',
             returnStdout: true
         ).trim()
     }
     stages {
         stage('amd64build') {
-            environment {
-                tag = sh ( 
-                    script: '''
-                        if [ "${environ}" = "main" ]; then
-                            echo "latest"
-                        elif [ "${environ}" = "edge" ]; then
-                            echo "edge"
-                        elif [ "${environ}" = "arm-test" ]; then
-                            echo "arm-test"
-                        else
-                            echo "nobuild"
-                        fi
-                    ''',
-                    returnStdout: true
-                ).trim()
-            }
             steps {
                 script {
                     if( "${tag}" == "arm-test" ) {
                         sh '''
                         echo "debug: building amd64"
-                        mkdir -p /opt/groundseg/version/bin
-                        cd ./build-scripts
-                        docker build --tag nativeplanet/groundseg-builder:3.10.9 .
-                        cd ..
-                        rm -rf /var/jenkins_home/tmp
-                        mkdir -p /var/jenkins_home/tmp
-                        cp -r api /var/jenkins_home/tmp
-                        docker run -v /home/np/np-cicd/jenkins_conf/tmp/binary:/binary -v /home/np/np-cicd/jenkins_conf/tmp/api:/api nativeplanet/groundseg-builder:3.10.9
-                        chmod +x /var/jenkins_home/tmp/binary/groundseg
-                        mv /var/jenkins_home/tmp/binary/groundseg /opt/groundseg/version/bin/groundseg_amd64
+                        echo mkdir -p /opt/groundseg/version/bin
+                        echo cd ./build-scripts
+                        echo docker build --tag nativeplanet/groundseg-builder:3.10.9 .
+                        echo cd ..
+                        echo rm -rf /var/jenkins_home/tmp
+                        echo mkdir -p /var/jenkins_home/tmp
+                        echo cp -r api /var/jenkins_home/tmp
+                        echo docker run -v /home/np/np-cicd/jenkins_conf/tmp/binary:/binary -v /home/np/np-cicd/jenkins_conf/tmp/api:/api nativeplanet/groundseg-builder:3.10.9
+                        echo chmod +x /var/jenkins_home/tmp/binary/groundseg
+                        echo mv /var/jenkins_home/tmp/binary/groundseg /opt/groundseg/version/bin/groundseg_amd64
                         '''
                     }
                 }
             }
         }
         stage('arm64build') {
-            environment {
-                tag = sh ( 
-                    script: '''
-                        if [ "${environ}" = "main" ]; then
-                            echo "latest"
-                        elif [ "${environ}" = "edge" ]; then
-                            echo "edge"
-                        elif [ "${environ}" = "arm-test" ]; then
-                            echo "arm-test"
-                        else
-                            echo "nobuild"
-                        fi
-                    ''',
-                    returnStdout: true
-                ).trim()
-            }
             agent { node { label 'arm' } }
             steps {
                 script {
                     if( "${tag}" == "arm-test" ) {
                         sh '''
+                        echo "debug: building arm64"
                         cd build-scripts
                         docker build --tag nativeplanet/groundseg-builder:3.10.9 .
                         cd ..
                         docker run -v "$(pwd)/binary":/binary -v "$(pwd)/api":/api nativeplanet/groundseg-builder:3.10.9
-                        mv binary/groundseg binary/groundseg_arm64
                         cd ui
-                        # echo docker buildx build --push --tag nativeplanet/groundseg-webui:latest --platform linux/amd64,linux/arm64 .
+                        # echo docker buildx build --push --tag nativeplanet/groundseg-webui:${tag} --platform linux/amd64,linux/arm64 .
                         '''
-                        stash includes: 'binary/groundseg_arm64', name: 'groundseg_arm64'
+                        stash includes: 'binary/groundseg', name: 'groundseg_arm64'
                     }
                 }
             }
                 }
         stage('postbuild') {
-            environment {
-                tag = sh ( 
-                    script: '''
-                        if [ "${environ}" = "main" ]; then
-                            echo "latest"
-                        elif [ "${environ}" = "edge" ]; then
-                            echo "edge"
-                        elif [ "${environ}" = "arm-test" ]; then
-                            echo "arm-test"
-                        else
-                            echo "nobuild"
-                        fi
-                    ''',
-                    returnStdout: true
-                ).trim()
-            }
             steps {
+                sh 'echo "debug: post-build actions"'
                 dir('/opt/groundseg/version/bin/'){
                 unstash 'groundseg_arm64'
                 }
+                sh 'mv /opt/groundseg/version/bin/groundseg /opt/groundseg/version/bin/groundseg_arm64'
                 script {
                     if( "${tag}" == "latest" ) {
                         sh '''

From 269bd726c941af836c46cc59283510b356cb877c Mon Sep 17 00:00:00 2001
From: reid <yapishu@users.noreply.github.com>
Date: Thu, 9 Feb 2023 14:28:33 -0600
Subject: [PATCH 21/32] working

---
 Jenkinsfile | 41 +++++++++++++++++++++--------------------
 1 file changed, 21 insertions(+), 20 deletions(-)

diff --git a/Jenkinsfile b/Jenkinsfile
index 2aa83644..8ac11a37 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -8,8 +8,6 @@ pipeline {
                     echo "latest"
                 elif [ "${environ}" = "edge" ]; then
                     echo "edge"
-                elif [ "${environ}" = "arm-test" ]; then
-                    echo "arm-test"
                 else
                     echo "nobuild"
                 fi
@@ -21,19 +19,19 @@ pipeline {
         stage('amd64build') {
             steps {
                 script {
-                    if( "${tag}" == "arm-test" ) {
+                    if( "${tag}" != "nobuild" ) {
                         sh '''
                         echo "debug: building amd64"
-                        echo mkdir -p /opt/groundseg/version/bin
-                        echo cd ./build-scripts
-                        echo docker build --tag nativeplanet/groundseg-builder:3.10.9 .
-                        echo cd ..
-                        echo rm -rf /var/jenkins_home/tmp
-                        echo mkdir -p /var/jenkins_home/tmp
-                        echo cp -r api /var/jenkins_home/tmp
-                        echo docker run -v /home/np/np-cicd/jenkins_conf/tmp/binary:/binary -v /home/np/np-cicd/jenkins_conf/tmp/api:/api nativeplanet/groundseg-builder:3.10.9
-                        echo chmod +x /var/jenkins_home/tmp/binary/groundseg
-                        echo mv /var/jenkins_home/tmp/binary/groundseg /opt/groundseg/version/bin/groundseg_amd64
+                        mkdir -p /opt/groundseg/version/bin
+                        cd ./build-scripts
+                        docker build --tag nativeplanet/groundseg-builder:3.10.9 .
+                        cd ..
+                        rm -rf /var/jenkins_home/tmp
+                        mkdir -p /var/jenkins_home/tmp
+                        cp -r api /var/jenkins_home/tmp
+                        docker run -v /home/np/np-cicd/jenkins_conf/tmp/binary:/binary -v /home/np/np-cicd/jenkins_conf/tmp/api:/api nativeplanet/groundseg-builder:3.10.9
+                        chmod +x /var/jenkins_home/tmp/binary/groundseg
+                        mv /var/jenkins_home/tmp/binary/groundseg /opt/groundseg/version/bin/groundseg_amd64
                         '''
                     }
                 }
@@ -43,7 +41,7 @@ pipeline {
             agent { node { label 'arm' } }
             steps {
                 script {
-                    if( "${tag}" == "arm-test" ) {
+                    if( "${tag}" != "nobuild" ) {
                         sh '''
                         echo "debug: building arm64"
                         cd build-scripts
@@ -51,7 +49,7 @@ pipeline {
                         cd ..
                         docker run -v "$(pwd)/binary":/binary -v "$(pwd)/api":/api nativeplanet/groundseg-builder:3.10.9
                         cd ui
-                        # echo docker buildx build --push --tag nativeplanet/groundseg-webui:${tag} --platform linux/amd64,linux/arm64 .
+                        docker buildx build --push --tag nativeplanet/groundseg-webui:${tag} --platform linux/amd64,linux/arm64 .
                         '''
                         stash includes: 'binary/groundseg', name: 'groundseg_arm64'
                     }
@@ -60,12 +58,15 @@ pipeline {
                 }
         stage('postbuild') {
             steps {
-                sh 'echo "debug: post-build actions"'
-                dir('/opt/groundseg/version/bin/'){
-                unstash 'groundseg_arm64'
-                }
-                sh 'mv /opt/groundseg/version/bin/groundseg /opt/groundseg/version/bin/groundseg_arm64'
                 script {
+                    if( "${tag}" != "nobuild" ){  
+                        sh 'echo "debug: post-build actions"'
+                        dir('/opt/groundseg/version/bin/'){
+                        unstash 'groundseg_arm64'
+                        }
+                        sh 'mv /opt/groundseg/version/bin/binary/groundseg /opt/groundseg/version/bin/groundseg_arm64'
+                        sh 'rm -rf /opt/groundseg/version/bin/binary/'
+                    }
                     if( "${tag}" == "latest" ) {
                         sh '''
                         mv ./release/version.csv /opt/groundseg/version/

From 36fc3e2858f553644872c60dd972af250ecd0140 Mon Sep 17 00:00:00 2001
From: reid <yapishu@users.noreply.github.com>
Date: Thu, 9 Feb 2023 14:32:23 -0600
Subject: [PATCH 22/32] Update Jenkinsfile

---
 Jenkinsfile | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Jenkinsfile b/Jenkinsfile
index 8ac11a37..1aa63ed7 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -31,7 +31,7 @@ pipeline {
                         cp -r api /var/jenkins_home/tmp
                         docker run -v /home/np/np-cicd/jenkins_conf/tmp/binary:/binary -v /home/np/np-cicd/jenkins_conf/tmp/api:/api nativeplanet/groundseg-builder:3.10.9
                         chmod +x /var/jenkins_home/tmp/binary/groundseg
-                        mv /var/jenkins_home/tmp/binary/groundseg /opt/groundseg/version/bin/groundseg_amd64
+                        mv /var/jenkins_home/tmp/binary/groundseg /opt/groundseg/version/bin/groundseg_amd64_${tag}
                         '''
                     }
                 }
@@ -64,7 +64,7 @@ pipeline {
                         dir('/opt/groundseg/version/bin/'){
                         unstash 'groundseg_arm64'
                         }
-                        sh 'mv /opt/groundseg/version/bin/binary/groundseg /opt/groundseg/version/bin/groundseg_arm64'
+                        sh 'sudo mv /opt/groundseg/version/bin/binary/groundseg /opt/groundseg/version/bin/groundseg_arm64_${tag}'
                         sh 'rm -rf /opt/groundseg/version/bin/binary/'
                     }
                     if( "${tag}" == "latest" ) {

From fcba5f89b3a6eb490c14d78d8a70bac553a21fc9 Mon Sep 17 00:00:00 2001
From: reid <yapishu@users.noreply.github.com>
Date: Thu, 9 Feb 2023 15:01:09 -0600
Subject: [PATCH 23/32] Update Jenkinsfile

---
 Jenkinsfile | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/Jenkinsfile b/Jenkinsfile
index 1aa63ed7..cf78578b 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -20,6 +20,8 @@ pipeline {
             steps {
                 script {
                     if( "${tag}" != "nobuild" ) {
+                        git url: 'https://github.com/Native-Planet.git',
+                            branch: "${tag}"
                         sh '''
                         echo "debug: building amd64"
                         mkdir -p /opt/groundseg/version/bin
@@ -42,6 +44,8 @@ pipeline {
             steps {
                 script {
                     if( "${tag}" != "nobuild" ) {
+                        git url: 'https://github.com/Native-Planet.git',
+                            branch: "${tag}"
                         sh '''
                         echo "debug: building arm64"
                         cd build-scripts

From a6882bc5daf550fb43f9ea9fec3de385a9ad2b22 Mon Sep 17 00:00:00 2001
From: reid <yapishu@users.noreply.github.com>
Date: Thu, 9 Feb 2023 15:19:14 -0600
Subject: [PATCH 24/32] Update Jenkinsfile

---
 Jenkinsfile | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/Jenkinsfile b/Jenkinsfile
index cf78578b..e9877fcc 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -21,6 +21,7 @@ pipeline {
                 script {
                     if( "${tag}" != "nobuild" ) {
                         git url: 'https://github.com/Native-Planet.git',
+                            credentialsId: 'Github token',
                             branch: "${tag}"
                         sh '''
                         echo "debug: building amd64"
@@ -45,6 +46,7 @@ pipeline {
                 script {
                     if( "${tag}" != "nobuild" ) {
                         git url: 'https://github.com/Native-Planet.git',
+                            credentialsId: 'Github token',
                             branch: "${tag}"
                         sh '''
                         echo "debug: building arm64"

From 0069f94265472b0fd999a39d8bae06e05087bd65 Mon Sep 17 00:00:00 2001
From: reid <yapishu@users.noreply.github.com>
Date: Thu, 9 Feb 2023 15:31:46 -0600
Subject: [PATCH 25/32] Update Jenkinsfile

---
 Jenkinsfile | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Jenkinsfile b/Jenkinsfile
index e9877fcc..91fabd08 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -20,7 +20,7 @@ pipeline {
             steps {
                 script {
                     if( "${tag}" != "nobuild" ) {
-                        git url: 'https://github.com/Native-Planet.git',
+                        git url: 'https://github.com/Native-Planet/GroundSeg.git',
                             credentialsId: 'Github token',
                             branch: "${tag}"
                         sh '''
@@ -45,7 +45,7 @@ pipeline {
             steps {
                 script {
                     if( "${tag}" != "nobuild" ) {
-                        git url: 'https://github.com/Native-Planet.git',
+                        git url: 'https://github.com/Native-Planet/GroundSeg.git',
                             credentialsId: 'Github token',
                             branch: "${tag}"
                         sh '''

From ff5dbd6415854fabb49f32a73ff9cd7d50fc2cad Mon Sep 17 00:00:00 2001
From: reid <yapishu@users.noreply.github.com>
Date: Thu, 9 Feb 2023 16:13:40 -0600
Subject: [PATCH 26/32] Update Jenkinsfile

---
 Jenkinsfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Jenkinsfile b/Jenkinsfile
index 91fabd08..4f6a76c9 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -70,7 +70,7 @@ pipeline {
                         dir('/opt/groundseg/version/bin/'){
                         unstash 'groundseg_arm64'
                         }
-                        sh 'sudo mv /opt/groundseg/version/bin/binary/groundseg /opt/groundseg/version/bin/groundseg_arm64_${tag}'
+                        sh 'mv /opt/groundseg/version/bin/binary/groundseg /opt/groundseg/version/bin/groundseg_arm64_${tag}'
                         sh 'rm -rf /opt/groundseg/version/bin/binary/'
                     }
                     if( "${tag}" == "latest" ) {

From ccef0707fec70ebec48c3c2dc7dbeb7ad2d363de Mon Sep 17 00:00:00 2001
From: nallux-dozryl <nallux-dozryl@protonmail.com>
Date: Wed, 15 Feb 2023 09:41:49 +0800
Subject: [PATCH 27/32] updated wireguard refresher

---
 api/groundseg.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/api/groundseg.py b/api/groundseg.py
index 1a7c8a2b..03d70c45 100755
--- a/api/groundseg.py
+++ b/api/groundseg.py
@@ -251,8 +251,8 @@ def wireguard_refresher():
                 copied = orchestrator._urbits
                 for p in list(copied):
                     if copied[p].running and copied[p].config['network'] != "none":
-                        res = requests.get(f"https://{copied[p].config['wg_url']}")
-                        if res.status_code != 200: 
+                        res = requests.get(f"https://{copied[p].config['wg_url']}/~_~/healthz")
+                        if res.status_code == 502: 
                             Log.log_groundseg("Anchor connection is broken. Restarting")
                             orchestrator.restart_anchor()
                             break

From fc88fc8b2056c28ce3a8339755c3481afc1a2160 Mon Sep 17 00:00:00 2001
From: nallux-dozryl <nallux-dozryl@protonmail.com>
Date: Thu, 16 Feb 2023 04:44:17 +0800
Subject: [PATCH 28/32] added arm support

---
 Jenkinsfile         | 4 ++--
 api/groundseg.py    | 6 ++++++
 api/orchestrator.py | 2 +-
 ui/src/lib/api.js   | 2 +-
 4 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/Jenkinsfile b/Jenkinsfile
index 4f6a76c9..4af554ec 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -4,9 +4,9 @@ pipeline {
         tag = sh ( 
             script: '''
                 environ=`echo $BRANCH_NAME|sed 's@origin/@@g'`
-                if [ "${environ}" = "main" ]; then
+                if [ "${environ}" = "master" ]; then
                     echo "latest"
-                elif [ "${environ}" = "edge" ]; then
+                elif [ "${environ}" = "dev" ]; then
                     echo "edge"
                 else
                     echo "nobuild"
diff --git a/api/groundseg.py b/api/groundseg.py
index 03d70c45..d525092e 100755
--- a/api/groundseg.py
+++ b/api/groundseg.py
@@ -9,6 +9,7 @@
 import requests
 import urllib.request
 import nmcli
+import platform
 import subprocess
 import html_templates
 
@@ -54,6 +55,11 @@ def check_bin_updates():
                 Log.log_groundseg(f"Latest version: {new_name}")
                 Log.log_groundseg("Downloading new groundseg binary")
 
+                if platform.machine() == 'x86_64':
+                    dl_url = f"{dl_url}_amd64"
+                else:
+                    dl_url = f"{dl_url}_arm64"
+
                 r = requests.get(dl_url)
                 f = open(f"{orchestrator.config['CFG_DIR']}/groundseg_new", 'wb')
                 for chunk in r.iter_content(chunk_size=512 * 1024):
diff --git a/api/orchestrator.py b/api/orchestrator.py
index d7c47f02..ad854052 100755
--- a/api/orchestrator.py
+++ b/api/orchestrator.py
@@ -44,7 +44,7 @@ class Orchestrator:
     _disk = None
 
     # GroundSeg
-    gs_version = 'v1.0.7'
+    gs_version = 'v1.0.8'
     _vm = False
     _npbox = False
     _c2c_mode = False
diff --git a/ui/src/lib/api.js b/ui/src/lib/api.js
index bfcf99e9..a69f2e8c 100644
--- a/ui/src/lib/api.js
+++ b/ui/src/lib/api.js
@@ -1,6 +1,6 @@
 import { writable } from 'svelte/store'
 
-export const webuiVersion = 'v1.0.7'
+export const webuiVersion = 'v1.0.8'
 
 //
 // fade transition params

From 96bb06b988626d8d84d8375b2a6f462f817fc471 Mon Sep 17 00:00:00 2001
From: nallux-dozryl <nallux-dozryl@protonmail.com>
Date: Thu, 16 Feb 2023 04:56:53 +0800
Subject: [PATCH 29/32] replace tag with environ in Jenkinsfile

---
 Jenkinsfile | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Jenkinsfile b/Jenkinsfile
index 4af554ec..ae50049b 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -22,7 +22,7 @@ pipeline {
                     if( "${tag}" != "nobuild" ) {
                         git url: 'https://github.com/Native-Planet/GroundSeg.git',
                             credentialsId: 'Github token',
-                            branch: "${tag}"
+                            branch: "${environ}"
                         sh '''
                         echo "debug: building amd64"
                         mkdir -p /opt/groundseg/version/bin
@@ -47,7 +47,7 @@ pipeline {
                     if( "${tag}" != "nobuild" ) {
                         git url: 'https://github.com/Native-Planet/GroundSeg.git',
                             credentialsId: 'Github token',
-                            branch: "${tag}"
+                            branch: "${environ}"
                         sh '''
                         echo "debug: building arm64"
                         cd build-scripts

From 0d5ac01a10a35d309b5303c4e3e1f6a55020d790 Mon Sep 17 00:00:00 2001
From: nallux-dozryl <nallux-dozryl@protonmail.com>
Date: Thu, 16 Feb 2023 05:00:33 +0800
Subject: [PATCH 30/32] removed git blocks from Jenkinsfile

---
 Jenkinsfile | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/Jenkinsfile b/Jenkinsfile
index ae50049b..d182fd71 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -20,9 +20,6 @@ pipeline {
             steps {
                 script {
                     if( "${tag}" != "nobuild" ) {
-                        git url: 'https://github.com/Native-Planet/GroundSeg.git',
-                            credentialsId: 'Github token',
-                            branch: "${environ}"
                         sh '''
                         echo "debug: building amd64"
                         mkdir -p /opt/groundseg/version/bin
@@ -45,9 +42,6 @@ pipeline {
             steps {
                 script {
                     if( "${tag}" != "nobuild" ) {
-                        git url: 'https://github.com/Native-Planet/GroundSeg.git',
-                            credentialsId: 'Github token',
-                            branch: "${environ}"
                         sh '''
                         echo "debug: building arm64"
                         cd build-scripts

From a3638686fc6363d920e4f105c43a1eb69eb2d387 Mon Sep 17 00:00:00 2001
From: nallux-dozryl <nallux-dozryl@protonmail.com>
Date: Thu, 16 Feb 2023 06:39:50 +0800
Subject: [PATCH 31/32] updated to v1.0.8

---
 release/version.csv      | 1 +
 release/version_edge.csv | 1 +
 2 files changed, 2 insertions(+)

diff --git a/release/version.csv b/release/version.csv
index 17ca5f5c..406f7952 100644
--- a/release/version.csv
+++ b/release/version.csv
@@ -1,3 +1,4 @@
+v1.0.8,24c09a8b94207c5530657960f67d151d311f00d934f21d4748bd3c6256699fb9,https://github.com/Native-Planet/GroundSeg/releases/download/v1.0.7/groundseg
 v1.0.7,ca6537e03928107b3cf5f8277e9d3d9427bd30750e0f4378a8b50b725848ccce,https://github.com/Native-Planet/GroundSeg/releases/download/v1.0.7/groundseg
 v1.0.6,c690950cc5e0aabd2b62f3f2106c8934b3ce726d961903871af656a301ddeb97,https://github.com/Native-Planet/GroundSeg/releases/download/v1.0.6/groundseg
 v1.0.5,53a693f855b3a0d92120bc5f6244e7a2c91b89f9511f9224b99afdb2b7b56fad,https://github.com/Native-Planet/GroundSeg/releases/download/v1.0.5/groundseg
diff --git a/release/version_edge.csv b/release/version_edge.csv
index e15fdfb5..0a89d25d 100644
--- a/release/version_edge.csv
+++ b/release/version_edge.csv
@@ -1,3 +1,4 @@
+v1.0.8,24c09a8b94207c5530657960f67d151d311f00d934f21d4748bd3c6256699fb9,https://github.com/Native-Planet/GroundSeg/releases/download/v1.0.7/groundseg
 v1.0.7,ca6537e03928107b3cf5f8277e9d3d9427bd30750e0f4378a8b50b725848ccce,https://github.com/Native-Planet/GroundSeg/releases/download/v1.0.7/groundseg
 v1.0.6,c690950cc5e0aabd2b62f3f2106c8934b3ce726d961903871af656a301ddeb97,https://github.com/Native-Planet/GroundSeg/releases/download/v1.0.6/groundseg
 v1.0.5,53a693f855b3a0d92120bc5f6244e7a2c91b89f9511f9224b99afdb2b7b56fad,https://github.com/Native-Planet/GroundSeg/releases/download/v1.0.5/groundseg

From b5d08cdc12539f7736bdcce02da9abe9ca7d618f Mon Sep 17 00:00:00 2001
From: nallux-dozryl <nallux-dozryl@protonmail.com>
Date: Thu, 16 Feb 2023 06:41:32 +0800
Subject: [PATCH 32/32] bumped install script version

---
 release/groundseg_install.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/release/groundseg_install.sh b/release/groundseg_install.sh
index a8b527f3..eb261b86 100755
--- a/release/groundseg_install.sh
+++ b/release/groundseg_install.sh
@@ -8,7 +8,7 @@ sudo firewall-cmd --reload
 ACC=Native-Planet
 REPO=GroundSeg
 BRANCH=main
-TAG=v1.0.7
+TAG=v1.0.8
 DEVICE_ARCH=$(uname -m)
 
 # Directory to save the scrips