From de264728f4f132d301cf78e84d40c48a0226314e Mon Sep 17 00:00:00 2001
From: Daya Adianto <dayaadianto@cs.ui.ac.id>
Date: Thu, 2 Nov 2023 12:02:11 +0700
Subject: [PATCH] Fix the URL targeted by BDD test
---
.gitlab-ci.yml | 6 +-----
.gitlab/dokku-ci-pre-deploy.sh | 4 ++--
2 files changed, 3 insertions(+), 7 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 8b7d8f7..88f0fdb 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -108,10 +108,6 @@ deploy:
SSH_PRIVATE_KEY: $DOKKU_SSH_PRIVATE_KEY
GIT_DEPTH: "0"
rules: !reference [.upstream-deploy-production-rules, rules]
- before_script:
- - chmod +x .gitlab/dokku-ci-pre-deploy.sh
- - mkdir -p ./bin
- - cp .gitlab/dokku-ci-pre-deploy.sh ./bin/ci-pre-deploy
script:
- dokku-deploy
after_script:
@@ -134,7 +130,7 @@ bdd-test:
before_script:
- apt-get update && apt-get install -y firefox
- sed -i "s#headless.mode = false#headless.mode = true#" src/test/resources/serenity.conf
- - sed -i "s#http://localhost:8080#http://sitodo-pmpl.dokku-ppl.cs.ui.ac.id#" src/test/resources/serenity.conf
+ - sed -i "s#http://localhost:8080#http://sitodo-pmpl.dokku-ppl.cs.ui.ac.id:8080#" src/test/resources/serenity.conf
script:
- mvn -P bdd clean verify
dependencies: []
diff --git a/.gitlab/dokku-ci-pre-deploy.sh b/.gitlab/dokku-ci-pre-deploy.sh
index dcd4481..17da453 100644
--- a/.gitlab/dokku-ci-pre-deploy.sh
+++ b/.gitlab/dokku-ci-pre-deploy.sh
@@ -1,5 +1,5 @@
#!/bin/sh -l
# Based on: https://github.com/dokku/ci-docker-image/pull/28
# TODO: Allow custom SPRING_PROFILES_ACTIVE set from the CI
-ssh "$SSH_REMOTE" -- config:set "$APP_NAME" "SPRING_PROFILES_ACTIVE=hsqldb"
-echo "Configured the app to run using hsqldb profile"
+ssh "$SSH_REMOTE" -- config:set "$APP_NAME" "SPRING_PROFILES_ACTIVE=postgresql"
+echo "Configured the app to run using postgresql profile"
--
GitLab