reformat jenkinsfile again x2

Jenkinsfile

@@ -1,7 +1,7 @@
 pipeline {
   agent any
   stages {
-    stage('Flutter Cleanup') {
+    stage('Flutter Cleanup/Update') {
       steps {
         sh '''flutter upgrade --force
         flutter pub upgrade
@@ -10,129 +10,132 @@ pipeline {
         flutter clean'''
       }
     }
-    parallel {
+    stage('Build API & UI') {
-      stages {
-        stage('Start API') {
-          steps {
-            sh '''docker image prune -f
-      docker build --no-cache -t fbla-api .
-      docker-compose down
-      docker-compose up -d'''
-          }
-        }
 
-        stage('Run Tests') {
+        parallel {
-          steps {
+          stages {
-            sh '''dart pub install
+            stage('Start API') {
-      dart run ./test/fbla_api_test.dart'''
-          }
-        }
-      }
-      stages {
-        stage('Build') {
-          parallel {
-            stage('Web Build') {
               steps {
-                sh 'flutter build web --release --base-href /fbla/'
+                sh '''docker image prune -f
+          docker build --no-cache -t fbla-api .
+          docker-compose down
+          docker-compose up -d'''
               }
             }
 
-            stage('Build Linux') {
+            stage('Run Tests') {
               steps {
-                sh 'flutter build linux --release'
+                sh '''dart pub install
-              }
+          dart run ./test/fbla_api_test.dart'''
-            }
-
-            stage('Build APK') {
-              steps {
-                sh 'flutter build apk --release'
               }
             }
           }
-        }
+          stages {
-
+            stage('Build') {
-        stage('Deploy and Save') {
+              parallel {
-          parallel {
+                stage('Web Build') {
-            stage('Deploy Web Local') {
+                  steps {
-              steps {
+                    sh 'flutter build web --release --base-href /fbla/'
-                script {
+                  }
-                  def remote = [
-                    name: 'HostServer',
-                    host: '192.168.0.216',
-                    user: '${env.JOBLINK_LOCAL_USER}',
-                    password: '${env.JOBLINK_LOCAL_PASSWD}',
-                    allowAnyHosts: true,
-                  ]
-                  sshRemove(path: '/home/${env.JOBLINK_LOCAL_USER}/fbla-webserver/webfiles/fbla', remote: remote)
-                  sshPut(from: 'build/web/', into: '/home/${env.JOBLINK_LOCAL_USER}/fbla-webserver', remote: remote)
-                  sshCommand remote: remote, command: "mv /home/${env.JOBLINK_LOCAL_USER}/fbla-webserver/web /home/${env.JOBLINK_LOCAL_USER}/fbla-webserver/webfiles/fbla"
                 }
-              }
-            }
 
-            stage('Save Other Builds') {
+                stage('Build Linux') {
-              steps {
+                  steps {
-                script {
+                    sh 'flutter build linux --release'
-                  def remote = [
+                  }
-                    name: 'HostServer',
+                }
-                    host: '192.168.0.216',
+
-                    user: '${env.JOBLINK_LOCAL_USER}',
+                stage('Build APK') {
-                    password: '${env.JOBLINK_LOCAL_PASSWD}',
+                  steps {
-                    allowAnyHosts: true,
+                    sh 'flutter build apk --release'
-                  ]
-                  if(env.BRANCH_NAME == 'main') {
-                    sshRemove(path: '/home/${env.JOBLINK_LOCAL_USER}/builds/main/linux', remote: remote)
-                    sshCommand remote: remote, command: "mkdir /home/${env.JOBLINK_LOCAL_USER}/builds/main/linux"
-                    sshPut(from: 'build/linux/x64/release', into: '/home/${env.JOBLINK_LOCAL_USER}/builds/main/linux', remote: remote)
-                    sshCommand remote: remote, command: "mv /home/${env.JOBLINK_LOCAL_USER}/builds/main/linux/release/* /home/${env.JOBLINK_LOCAL_USER}/builds/main/linux"
-                    sshCommand remote: remote, command: "rm -R /home/${env.JOBLINK_LOCAL_USER}/builds/main/linux/release/"
-                    sshRemove(path: '/home/${env.JOBLINK_LOCAL_USER}/builds/main/apk', remote: remote)
-                    sshCommand remote: remote, command: "mkdir /home/${env.JOBLINK_LOCAL_USER}/builds/main/apk"
-                    sshPut(from: 'build/app/outputs/apk/release', into: '/home/${env.JOBLINK_LOCAL_USER}/builds/main/apk', remote: remote)
-                    sshCommand remote: remote, command: "mv /home/${env.JOBLINK_LOCAL_USER}/builds/main/apk/release/* /home/${env.JOBLINK_LOCAL_USER}/builds/main/apk"
-                    sshCommand remote: remote, command: "rm -R /home/${env.JOBLINK_LOCAL_USER}/builds/main/apk/release/"
-                  } else {
-                    sshRemove(path: '/home/${env.JOBLINK_LOCAL_USER}/builds/dev/linux', remote: remote)
-                    sshCommand remote: remote, command: "mkdir /home/${env.JOBLINK_LOCAL_USER}/builds/dev/linux"
-                    sshPut(from: 'build/linux/x64/release', into: '/home/${env.JOBLINK_LOCAL_USER}/builds/dev/linux', remote: remote)
-                    sshCommand remote: remote, command: "mv /home/${env.JOBLINK_LOCAL_USER}/builds/dev/linux/release/* /home/${env.JOBLINK_LOCAL_USER}/builds/dev/linux"
-                    sshCommand remote: remote, command: "rm -R /home/${env.JOBLINK_LOCAL_USER}/builds/dev/linux/release/"
-                    sshRemove(path: '/home/${env.JOBLINK_LOCAL_USER}/builds/dev/apk', remote: remote)
-                    sshCommand remote: remote, command: "mkdir /home/${env.JOBLINK_LOCAL_USER}/builds/dev/apk"
-                    sshPut(from: 'build/app/outputs/apk/release', into: '/home/${env.JOBLINK_LOCAL_USER}/builds/dev/apk', remote: remote)
-                    sshCommand remote: remote, command: "mv /home/${env.JOBLINK_LOCAL_USER}/builds/dev/apk/release/* /home/${env.JOBLINK_LOCAL_USER}/builds/dev/apk"
-                    sshCommand remote: remote, command: "rm -R /home/${env.JOBLINK_LOCAL_USER}/builds/dev/apk/release/"
                   }
                 }
               }
             }
-          }
-        }
 
-        stage('Deploy Remote') {
+            stage('Deploy and Save') {
-          when {
+              parallel {
-            expression {
+                stage('Deploy Web Local') {
-              env.BRANCH_NAME == 'main'
+                  steps {
+                    script {
+                      def remote = [
+                        name: 'HostServer',
+                        host: '192.168.0.216',
+                        user: '${env.JOBLINK_LOCAL_USER}',
+                        password: '${env.JOBLINK_LOCAL_PASSWD}',
+                        allowAnyHosts: true,
+                      ]
+                      sshRemove(path: '/home/${env.JOBLINK_LOCAL_USER}/fbla-webserver/webfiles/fbla', remote: remote)
+                      sshPut(from: 'build/web/', into: '/home/${env.JOBLINK_LOCAL_USER}/fbla-webserver', remote: remote)
+                      sshCommand remote: remote, command: "mv /home/${env.JOBLINK_LOCAL_USER}/fbla-webserver/web /home/${env.JOBLINK_LOCAL_USER}/fbla-webserver/webfiles/fbla"
+                    }
+                  }
+                }
+
+                stage('Save Other Builds') {
+                  steps {
+                    script {
+                      def remote = [
+                        name: 'HostServer',
+                        host: '192.168.0.216',
+                        user: '${env.JOBLINK_LOCAL_USER}',
+                        password: '${env.JOBLINK_LOCAL_PASSWD}',
+                        allowAnyHosts: true,
+                      ]
+                      if(env.BRANCH_NAME == 'main') {
+                        sshRemove(path: '/home/${env.JOBLINK_LOCAL_USER}/builds/main/linux', remote: remote)
+                        sshCommand remote: remote, command: "mkdir /home/${env.JOBLINK_LOCAL_USER}/builds/main/linux"
+                        sshPut(from: 'build/linux/x64/release', into: '/home/${env.JOBLINK_LOCAL_USER}/builds/main/linux', remote: remote)
+                        sshCommand remote: remote, command: "mv /home/${env.JOBLINK_LOCAL_USER}/builds/main/linux/release/* /home/${env.JOBLINK_LOCAL_USER}/builds/main/linux"
+                        sshCommand remote: remote, command: "rm -R /home/${env.JOBLINK_LOCAL_USER}/builds/main/linux/release/"
+                        sshRemove(path: '/home/${env.JOBLINK_LOCAL_USER}/builds/main/apk', remote: remote)
+                        sshCommand remote: remote, command: "mkdir /home/${env.JOBLINK_LOCAL_USER}/builds/main/apk"
+                        sshPut(from: 'build/app/outputs/apk/release', into: '/home/${env.JOBLINK_LOCAL_USER}/builds/main/apk', remote: remote)
+                        sshCommand remote: remote, command: "mv /home/${env.JOBLINK_LOCAL_USER}/builds/main/apk/release/* /home/${env.JOBLINK_LOCAL_USER}/builds/main/apk"
+                        sshCommand remote: remote, command: "rm -R /home/${env.JOBLINK_LOCAL_USER}/builds/main/apk/release/"
+                      } else {
+                        sshRemove(path: '/home/${env.JOBLINK_LOCAL_USER}/builds/dev/linux', remote: remote)
+                        sshCommand remote: remote, command: "mkdir /home/${env.JOBLINK_LOCAL_USER}/builds/dev/linux"
+                        sshPut(from: 'build/linux/x64/release', into: '/home/${env.JOBLINK_LOCAL_USER}/builds/dev/linux', remote: remote)
+                        sshCommand remote: remote, command: "mv /home/${env.JOBLINK_LOCAL_USER}/builds/dev/linux/release/* /home/${env.JOBLINK_LOCAL_USER}/builds/dev/linux"
+                        sshCommand remote: remote, command: "rm -R /home/${env.JOBLINK_LOCAL_USER}/builds/dev/linux/release/"
+                        sshRemove(path: '/home/${env.JOBLINK_LOCAL_USER}/builds/dev/apk', remote: remote)
+                        sshCommand remote: remote, command: "mkdir /home/${env.JOBLINK_LOCAL_USER}/builds/dev/apk"
+                        sshPut(from: 'build/app/outputs/apk/release', into: '/home/${env.JOBLINK_LOCAL_USER}/builds/dev/apk', remote: remote)
+                        sshCommand remote: remote, command: "mv /home/${env.JOBLINK_LOCAL_USER}/builds/dev/apk/release/* /home/${env.JOBLINK_LOCAL_USER}/builds/dev/apk"
+                        sshCommand remote: remote, command: "rm -R /home/${env.JOBLINK_LOCAL_USER}/builds/dev/apk/release/"
+                      }
+                    }
+                  }
+                }
+              }
             }
-          }
+
-          steps {
+            stage('Deploy Remote') {
-            script {
+              when {
-              def remote = [
+                expression {
-                name: 'MarinoDev',
+                  env.BRANCH_NAME == 'main'
-                host: 'marinodev.com',
+                }
-                port: 21098,
+              }
-                user: '${env.JOBLINK_REMOTE_USER}',
+              steps {
-                identityFile: '/var/jenkins_home/marinoDevPrivateKey',
+                script {
-                passphrase: '${env.JOBLINK_REMOTE_PASSWD}',
+                  def remote = [
-                allowAnyHosts: true,
+                    name: 'MarinoDev',
-              ]
+                    host: 'marinodev.com',
-              sshRemove(path: '/home/${env.JOBLINK_REMOTE_USER}/public_html/fbla', remote: remote)
+                    port: 21098,
-              sshPut(from: '/var/jenkins_home/workspace/fbla-ui_main/build/web/', into: '/home/${env.JOBLINK_REMOTE_USER}/public_html/', remote: remote)
+                    user: '${env.JOBLINK_REMOTE_USER}',
-              sshCommand remote: remote, command: "mv /home/${env.JOBLINK_REMOTE_USER}/public_html/web /home/${env.JOBLINK_REMOTE_USER}/public_html/fbla"
+                    identityFile: '/var/jenkins_home/marinoDevPrivateKey',
+                    passphrase: '${env.JOBLINK_REMOTE_PASSWD}',
+                    allowAnyHosts: true,
+                  ]
+                  sshRemove(path: '/home/${env.JOBLINK_REMOTE_USER}/public_html/fbla', remote: remote)
+                  sshPut(from: '/var/jenkins_home/workspace/fbla-ui_main/build/web/', into: '/home/${env.JOBLINK_REMOTE_USER}/public_html/', remote: remote)
+                  sshCommand remote: remote, command: "mv /home/${env.JOBLINK_REMOTE_USER}/public_html/web /home/${env.JOBLINK_REMOTE_USER}/public_html/fbla"
+                }
+              }
             }
           }
         }
-      }
     }
   }
 }

fbla_ui/Jenkinsfile

@@ -1,4 +1,125 @@
 pipeline {
   agent any
+  stages {
+    stage('Flutter Cleanup') {
+      steps {
+        sh '''flutter upgrade --force
+flutter pub upgrade
+flutter --version
+flutter doctor
+flutter clean'''
+      }
+    }
 
+    stage('Build') {
+      parallel {
+        stage('Web Build') {
+          steps {
+            sh 'flutter build web --release --base-href /fbla/'
+          }
+        }
+
+        stage('Build Linux') {
+          steps {
+            sh 'flutter build linux --release'
+          }
+        }
+
+        stage('Build APK') {
+          steps {
+            sh 'flutter build apk --release'
+          }
+        }
+
+      }
+    }
+
+    stage('Deploy and Save') {
+      parallel {
+        stage('Deploy Web Local') {
+          steps {
+            script {
+              def remote = [
+                name: 'HostServer',
+                host: '192.168.0.216',
+                user: 'fbla',
+                password: 'fbla',
+                allowAnyHosts: true,
+              ]
+              sshRemove(path: '/home/fbla/fbla-webserver/webfiles/fbla', remote: remote)
+              sshPut(from: 'build/web/', into: '/home/fbla/fbla-webserver', remote: remote)
+              sshCommand remote: remote, command: "mv /home/fbla/fbla-webserver/web /home/fbla/fbla-webserver/webfiles/fbla"
+            }
+
+          }
+        }
+
+        stage('Save Other Builds') {
+          steps {
+            script {
+              def remote = [
+                name: 'HostServer',
+                host: '192.168.0.216',
+                user: 'fbla',
+                password: 'fbla',
+                allowAnyHosts: true,
+              ]
+              if(env.BRANCH_NAME == 'main') {
+                sshRemove(path: '/home/fbla/builds/main/linux', remote: remote)
+                sshCommand remote: remote, command: "mkdir /home/fbla/builds/main/linux"
+                sshPut(from: 'build/linux/x64/release', into: '/home/fbla/builds/main/linux', remote: remote)
+                sshCommand remote: remote, command: "mv /home/fbla/builds/main/linux/release/* /home/fbla/builds/main/linux"
+                sshCommand remote: remote, command: "rm -R /home/fbla/builds/main/linux/release/"
+                sshRemove(path: '/home/fbla/builds/main/apk', remote: remote)
+                sshCommand remote: remote, command: "mkdir /home/fbla/builds/main/apk"
+                sshPut(from: 'build/app/outputs/apk/release', into: '/home/fbla/builds/main/apk', remote: remote)
+                sshCommand remote: remote, command: "mv /home/fbla/builds/main/apk/release/* /home/fbla/builds/main/apk"
+                sshCommand remote: remote, command: "rm -R /home/fbla/builds/main/apk/release/"
+              } else {
+                sshRemove(path: '/home/fbla/builds/dev/linux', remote: remote)
+                sshCommand remote: remote, command: "mkdir /home/fbla/builds/dev/linux"
+                sshPut(from: 'build/linux/x64/release', into: '/home/fbla/builds/dev/linux', remote: remote)
+                sshCommand remote: remote, command: "mv /home/fbla/builds/dev/linux/release/* /home/fbla/builds/dev/linux"
+                sshCommand remote: remote, command: "rm -R /home/fbla/builds/dev/linux/release/"
+                sshRemove(path: '/home/fbla/builds/dev/apk', remote: remote)
+                sshCommand remote: remote, command: "mkdir /home/fbla/builds/dev/apk"
+                sshPut(from: 'build/app/outputs/apk/release', into: '/home/fbla/builds/dev/apk', remote: remote)
+                sshCommand remote: remote, command: "mv /home/fbla/builds/dev/apk/release/* /home/fbla/builds/dev/apk"
+                sshCommand remote: remote, command: "rm -R /home/fbla/builds/dev/apk/release/"
+              }
+            }
+
+          }
+        }
+
+      }
+    }
+
+    stage('Deploy Remote') {
+      when {
+        expression {
+          env.BRANCH_NAME == 'main'
+        }
+
+      }
+      steps {
+        script {
+          def remote = [
+            name: 'MarinoDev',
+            host: 'marinodev.com',
+            port: 21098,
+            user: 'mariehdi',
+            identityFile: '/var/jenkins_home/marinoDevPrivateKey',
+            passphrase: 'marinodev',
+            allowAnyHosts: true,
+          ]
+          sshRemove(path: '/home/mariehdi/public_html/fbla', remote: remote)
+          sshPut(from: '/var/jenkins_home/workspace/fbla-ui_main/build/web/', into: '/home/mariehdi/public_html/', remote: remote)
+          sshCommand remote: remote, command: "mv /home/mariehdi/public_html/web /home/mariehdi/public_html/fbla"
+        }
+
+      }
+    }
+
+  }
 }