reformat jenkinsfile again x3

Jenkinsfile

@@ -10,130 +10,133 @@ pipeline {
         flutter clean'''
       }
     }
-    stage('Build API & UI') {
+    stage('') {
-
         parallel {
-          stages {
+          stage('') {
-            stage('Start API') {
+              stages {
-              steps {
+                stage('Start API') {
-                sh '''docker image prune -f
+                  steps {
-          docker build --no-cache -t fbla-api .
+                    sh '''docker image prune -f
-          docker-compose down
+              docker build --no-cache -t fbla-api .
-          docker-compose up -d'''
+              docker-compose down
-              }
+              docker-compose up -d'''
-            }
+                  }
+                }
 
-            stage('Run Tests') {
+                stage('Run Tests') {
-              steps {
+                  steps {
-                sh '''dart pub install
+                    sh '''dart pub install
-          dart run ./test/fbla_api_test.dart'''
+              dart run ./test/fbla_api_test.dart'''
+                  }
+                }
               }
-            }
           }
-          stages {
+          stage('') {
-            stage('Build') {
+              stages {
-              parallel {
+                stage('Build') {
-                stage('Web Build') {
+                  parallel {
-                  steps {
+                    stage('Web Build') {
-                    sh 'flutter build web --release --base-href /fbla/'
+                      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: '${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/"
+                          }
+                        }
+                      }
+                    }
+                  }
+                }
+
+                stage('Deploy Remote') {
+                  when {
+                    expression {
+                      env.BRANCH_NAME == 'main'
+                    }
+                  }
+                  steps {
+                    script {
+                      def remote = [
+                        name: 'MarinoDev',
+                        host: 'marinodev.com',
+                        port: 21098,
+                        user: '${env.JOBLINK_REMOTE_USER}',
+                        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"
+                    }
+                  }
                 }
               }
-              steps {
-                script {
-                  def remote = [
-                    name: 'MarinoDev',
-                    host: 'marinodev.com',
-                    port: 21098,
-                    user: '${env.JOBLINK_REMOTE_USER}',
-                    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"
-                }
-              }
-            }
           }
         }
     }