From d350dde9941f2adccbc3d9b85d405cbff0ffa573 Mon Sep 17 00:00:00 2001 From: drake Date: Thu, 6 Jun 2024 21:31:30 -0500 Subject: [PATCH] fixes 2 --- Jenkinsfile | 37 ++++++++++++++++++-------------- fbla-api/test/fbla_api_test.dart | 3 +-- 2 files changed, 22 insertions(+), 18 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index a1195c5..bc6757d 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -17,9 +17,7 @@ pipeline { steps { sh '''cd fbla-api docker image prune -f - docker build --no-cache -t fbla-api . - docker-compose down - docker-compose up -d''' + docker build --no-cache -t fbla-api .''' } } stage('UI Web Build') { @@ -55,25 +53,25 @@ pipeline { allowAnyHosts: true, ] if (env.BRANCH_NAME == 'main') { - sshRemove(path: '/home/${env.JOBLINK_LOCAL_USER}/builds/main/linux', remote: remote) + 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: 'fbla_ui/build/linux/x64/release', into: '/home/${env.JOBLINK_LOCAL_USER}/builds/main/linux', remote: remote) + sshPut(from: 'fbla_ui/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) + 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: 'fbla_ui/build/app/outputs/apk/release', into: '/home/${env.JOBLINK_LOCAL_USER}/builds/main/apk', remote: remote) + sshPut(from: 'fbla_ui/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) + 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: 'fbla_ui/build/linux/x64/release', into: '/home/${env.JOBLINK_LOCAL_USER}/builds/dev/linux', remote: remote) + sshPut(from: 'fbla_ui/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) + 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: 'fbla_ui/build/app/outputs/apk/release', into: '/home/${env.JOBLINK_LOCAL_USER}/builds/dev/apk', remote: remote) + sshPut(from: 'fbla_ui/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/" } @@ -97,7 +95,7 @@ pipeline { passphrase : "${env.JOBLINK_REMOTE_PASSWD}", allowAnyHosts: true, ] - sshRemove(path: '/home/${env.JOBLINK_REMOTE_USER}/public_html/fbla', remote: remote) + sshRemove(path: "/home/${env.JOBLINK_REMOTE_USER}/public_html/fbla", remote: remote) sshPut(from: 'fbla_ui/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" } @@ -113,20 +111,27 @@ pipeline { password : "${env.JOBLINK_LOCAL_PASSWD}", allowAnyHosts: true, ] - sshRemove(path: '/home/${env.JOBLINK_LOCAL_USER}/fbla-webserver/webfiles/fbla', remote: remote) + sshRemove(path: "/home/${env.JOBLINK_LOCAL_USER}/fbla-webserver/webfiles/fbla", remote: remote) sshPut(from: 'fbla_ui/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('Run API Tests') { + stage('Start API') { steps { sh '''cd fbla-api - dart pub get - dart run ./test/fbla_api_test.dart''' + docker-compose down + docker-compose up -d''' } } } } } + stage('Run API Tests') { + steps { + sh '''cd fbla-api + dart pub get + dart run ./test/fbla_api_test.dart''' + } + } } diff --git a/fbla-api/test/fbla_api_test.dart b/fbla-api/test/fbla_api_test.dart index b9c78b6..c342365 100644 --- a/fbla-api/test/fbla_api_test.dart +++ b/fbla-api/test/fbla_api_test.dart @@ -42,8 +42,7 @@ void main() async { "password": "tmp" } '''; - var response = await http.post( - Uri.parse('$apiAddress, /fbla-api/createuser'), + var response = await http.post(Uri.parse('$apiAddress/fbla-api/createuser'), body: json, headers: {'Authorization': token}).timeout(const Duration(seconds: 20)); expect(response.statusCode, 200);