Commit 8c120f06 authored by Sonia Zorba's avatar Sonia Zorba
Browse files

Fixed build.sh e gitlab-ci after creation of TASMAN-bom

parent e922d689
Pipeline #101 passed with stage
in 17 seconds
build: build:
script: "cd TASMAN-core; mvn clean install -P Test -Dmysql_host=localhost -Dmysql_port=3306 -Dmysql_user=tasman_tester -D mysql_password=tasman_tester -Dpostgres_host=localhost -Dpostgres_port=5432 -Dpostgres_user=tasman_tester -Dpostgres_password=tasman_tester -Dpostgres_database=tasman_test" script: "cd TASMAN-bom; mvn clean install; cd ../TASMAN-core; mvn clean install -P Test -Dmysql_host=localhost -Dmysql_port=3306 -Dmysql_user=tasman_tester -D mysql_password=tasman_tester -Dpostgres_host=localhost -Dpostgres_port=5432 -Dpostgres_user=tasman_tester -Dpostgres_password=tasman_tester -Dpostgres_database=tasman_test"
...@@ -15,6 +15,8 @@ See also the [CHANGELOG](CHANGELOG.md). ...@@ -15,6 +15,8 @@ See also the [CHANGELOG](CHANGELOG.md).
3. `./build.sh <command>`, commands are: 3. `./build.sh <command>`, commands are:
* **core** build only TASMAN core * **core** build only TASMAN core
* **test**: run tests; you need to create a `test.properties` file containing a configuration for connecting to a MySQL and a Postgres test database * **test**: run tests; you need to create a `test.properties` file containing a configuration for connecting to a MySQL and a Postgres test database
* MySQL testing database needs to have `default-storage-engine = innodb` configured into `/etc/my.cnf`
* Postgres 9.3+ is required
* **glassfish**: build GlassFish war package * **glassfish**: build GlassFish war package
* **tomcat**: build Tomcat war package (using config.properties file) * **tomcat**: build Tomcat war package (using config.properties file)
* **embedded**: build embedded package (to be run _locally!_) * **embedded**: build embedded package (to be run _locally!_)
......
...@@ -24,7 +24,9 @@ function add_properties { ...@@ -24,7 +24,9 @@ function add_properties {
} }
function build_core { function build_core {
cd TASMAN-core cd TASMAN-bom
mvn -q clean install
cd ../TASMAN-core
mvn -q clean install mvn -q clean install
if [ "$?" -ne 0 ]; then if [ "$?" -ne 0 ]; then
echo "[ERROR] Error in ${FUNCNAME[0]}" echo "[ERROR] Error in ${FUNCNAME[0]}"
...@@ -35,7 +37,9 @@ function build_core { ...@@ -35,7 +37,9 @@ function build_core {
} }
function test_core { function test_core {
cd TASMAN-core cd TASMAN-bom
mvn -q clean install
cd ../TASMAN-core
$(add_properties "mvn clean install -P test" $test_config_file) $(add_properties "mvn clean install -P test" $test_config_file)
if [ "$?" -ne 0 ]; then if [ "$?" -ne 0 ]; then
echo "[ERROR] Error in ${FUNCNAME[0]}" echo "[ERROR] Error in ${FUNCNAME[0]}"
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment