diff --git a/Jenkinsfile b/Jenkinsfile index ba3db71..3e22f2b 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -44,29 +44,6 @@ pipeline { } stage('Deploy and Save') { parallel { - stage('Run API Tests') { - steps { - sh '''cd fbla_ui - dart pub get - dart run ./fbla-api/test/fbla_api_test.dart''' - } - } - stage('Deploy Local Web UI') { - steps { - script { - def remote = [ - name : 'HostServer', - host : '192.168.0.216', - user : '$JOBLINK_LOCAL_USER', - password : '$JOBLINK_LOCAL_PASSWD', - allowAnyHosts: true, - ] - sshRemove(path: '/home/$JOBLINK_LOCAL_USER/fbla-webserver/webfiles/fbla', remote: remote) - sshPut(from: 'build/web/', into: '/home/$JOBLINK_LOCAL_USER/fbla-webserver', remote: remote) - sshCommand remote: remote, command: "mv /home/$JOBLINK_LOCAL_USER/fbla-webserver/web /home/$JOBLINK_LOCAL_USER/fbla-webserver/webfiles/fbla" - } - } - } stage('Save Other Builds') { steps { script { @@ -126,7 +103,31 @@ pipeline { } } } + stage('Deploy Local Web UI') { + steps { + script { + def remote = [ + name : 'HostServer', + host : '192.168.0.216', + user : '$JOBLINK_LOCAL_USER', + password : '$JOBLINK_LOCAL_PASSWD', + allowAnyHosts: true, + ] + sh 'echo $JOBLINK_LOCAL_USER $JOBLINK_LOCAL_PASSWD' + sshRemove(path: '/home/$JOBLINK_LOCAL_USER/fbla-webserver/webfiles/fbla', remote: remote) + sshPut(from: 'build/web/', into: '/home/$JOBLINK_LOCAL_USER/fbla-webserver', remote: remote) + sshCommand remote: remote, command: "mv /home/$JOBLINK_LOCAL_USER/fbla-webserver/web /home/$JOBLINK_LOCAL_USER/fbla-webserver/webfiles/fbla" + } + } + } + stage('Run API Tests') { + steps { + sh '''cd fbla-api + dart pub get + dart run ./test/fbla_api_test.dart''' + } + } } } } -} \ No newline at end of file +}