Skip to content

Commit

Permalink
Merge pull request #2 from siklu/ATE-293
Browse files Browse the repository at this point in the history
ATE 293 - improvements to server
  • Loading branch information
moshellib authored Oct 27, 2021
2 parents 208b520 + 706e634 commit 28c5a57
Show file tree
Hide file tree
Showing 15 changed files with 195 additions and 140 deletions.
2 changes: 1 addition & 1 deletion binders/difido-generic-binder/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<parent>
<artifactId>difido-parent</artifactId>
<groupId>il.co.topq.difido</groupId>
<version>3.1.00-SNAPSHOT</version>
<version>3.1.01-SIKLU</version>
<relativePath>../../difido-parent</relativePath>
</parent>
<properties>
Expand Down
2 changes: 1 addition & 1 deletion binders/difido-testng/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<parent>
<artifactId>difido-parent</artifactId>
<groupId>il.co.topq.difido</groupId>
<version>3.1.00-SNAPSHOT</version>
<version>3.1.01-SIKLU</version>
<relativePath>../../difido-parent</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion difido-parent/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>il.co.topq.difido</groupId>
<artifactId>difido-parent</artifactId>
<version>3.1.00-SNAPSHOT</version>
<version>3.1.01-SIKLU</version>
<name>Difido Parent</name>
<packaging>pom</packaging>
<organization>
Expand Down
2 changes: 1 addition & 1 deletion difido-reports-common/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<parent>
<artifactId>difido-parent</artifactId>
<groupId>il.co.topq.difido</groupId>
<version>3.1.00-SNAPSHOT</version>
<version>3.1.01-SIKLU</version>
<relativePath>../difido-parent</relativePath>
</parent>
<dependencies>
Expand Down
2 changes: 1 addition & 1 deletion examples/jsystem-example/so-project/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<parent>
<artifactId>difido-parent</artifactId>
<groupId>il.co.topq.difido</groupId>
<version>3.1.00-SNAPSHOT</version>
<version>3.1.01-SIKLU</version>
<relativePath>../../../difido-parent</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion examples/jsystem-example/tests-project/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<parent>
<artifactId>difido-parent</artifactId>
<groupId>il.co.topq.difido</groupId>
<version>3.1.00-SNAPSHOT</version>
<version>3.1.01-SIKLU</version>
<relativePath>../../../difido-parent</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion examples/testng-example/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<parent>
<artifactId>difido-parent</artifactId>
<groupId>il.co.topq.difido</groupId>
<version>3.1.00-SNAPSHOT</version>
<version>3.1.01-SIKLU</version>
<relativePath>../../difido-parent</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion server/difido-server-plugins-common/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<parent>
<groupId>il.co.topq.difido</groupId>
<artifactId>difido-parent</artifactId>
<version>3.1.00-SNAPSHOT</version>
<version>3.1.01-SIKLU</version>
<relativePath>../../difido-parent</relativePath>
</parent>
<dependencies>
Expand Down
30 changes: 30 additions & 0 deletions server/difido-server/config/difido.service
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
# instrucrtion on how to install as service: (ubuntu >=20.04)
# installation directory is assumed to be /opt/difido-server
# sudo cp difido.service /etc/systemd/system/
# sudo systemctl daemon-reload
# sudo systemctl enable difido.service
# sudo systemctl start difido
# sudo systemctl status difido

[Unit]
Description=Difido Reporter server
[Service]
User=root
# The configuration file application.properties should be here:

#change this to your workspace
WorkingDirectory=/opt/difido-server

#path to executable.
#executable is a bash script which calls jar file
ExecStart=/opt/difido-server/bin/start.sh

#SuccessExitStatus=143
TimeoutStopSec=10
Restart=on-failure
RestartSec=5
After=network-online.target
Wants=network-online.target

[Install]
WantedBy=multi-user.target
7 changes: 6 additions & 1 deletion server/difido-server/config/difido_config.properties
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ plugin.classes=il.co.topq.report.plugins.mail.DefaultMailPlugin
# If no headers specified, The default values will be kept.
# The 'id' and 'description' headers are always added to the view, so there is no need to add them here.
# Notice that this is case sensitive.
execution.table.headers=Serial;Date;Time;Duration;# Tests;# Successful;# Warnings;# Failed;# Machines;Active;Locked;
execution.table.headers=SUT;Serial;Date;Time;Duration;# Tests;# Successful;# Warnings;# Failed;# Machines;Active;Locked;

# ';' separated list of names and links that will be displayed in the navigation bar of the Difido web page.
# This is useful for making the Difido a portal for all the different web based system that are related to the automation.
Expand Down Expand Up @@ -85,3 +85,8 @@ archiver.delete.after.archive=true
archiver.delete.from.elastic=false
archiver.min.reports.age=10
archiver.max.to.archive=1000

#spring.jpa.hibernate.ddl-auto=update
#spring.datasource.url=jdbc:mysql://${MYSQL_HOST:localhost}:3306/difido
#spring.datasource.username=
#spring.datasource.password=
241 changes: 115 additions & 126 deletions server/difido-server/config/mapping.json
Original file line number Diff line number Diff line change
@@ -1,128 +1,117 @@
{
"settings": {
"index": {
"number_of_shards": 2,
"number_of_replicas": 1
}
},
"mappings": {
"test": {
"dynamic_templates": [
{
"long_prop": {
"match": "long_*",
"match_mapping_type": "string",
"mapping": {
"type": "long",
"index": false
}
}
},
{
"int_prop": {
"match": "int_*",
"match_mapping_type": "string",
"mapping": {
"type": "integer",
"index": false
}
}
},
{
"double_prop": {
"match": "double_*",
"match_mapping_type": "string",
"mapping": {
"type": "double",
"index": false
}
}
},
{
"float_prop": {
"match": "float_*",
"match_mapping_type": "string",
"mapping": {
"type": "float",
"index": false
}
}
},
{
"date_prop": {
"match": "date_*",
"match_mapping_type": "string",
"mapping": {
"type": "date",
"index": false,
"format": "yyyy/MM/dd HH:mm:ss"
}
}
},
{
"notanalyzed": {
"match": "*",
"unmatch": "^(long_|int_|double_|float_|date_)$",
"match_mapping_type": "string",
"mapping": {
"type": "keyword",
"index": true
}
}
}
],
"properties": {
"name": {
"type": "keyword",
"index": true
},
"uid": {
"type": "keyword",
"index": true
},
"parent": {
"type": "keyword",
"index": true
},
"status": {
"type": "keyword",
"index": true
},
"url": {
"type": "keyword",
"index": true
},
"description": {
"type": "keyword",
"index": true
},
"execution": {
"type": "keyword",
"index": true
},
"executionId": {
"type": "long"
},
"executionDuration": {
"type": "long"
},
"machine": {
"type": "keyword",
"index": true
},
"timestamp": {
"type": "date",
"format": "yyyy/MM/dd HH:mm:ss"
},
"executionTimestamp": {
"type": "date",
"format": "yyyy/MM/dd HH:mm:ss"
},
"duration": {
"type": "long"
}
}

}
}
"settings": {
"index": {
"number_of_shards": 2,
"number_of_replicas": 1
}
},
"mappings": {
"test": {
"properties": {
"name": {
"type": "keyword",
"index": "true"
},
"uid": {
"type": "keyword",
"index": "true"
},
"parent": {
"type": "keyword",
"index": "true"
},
"status": {
"type": "keyword",
"index": "true"
},
"url": {
"type": "keyword",
"index": "true"
},
"description": {
"type": "keyword",
"index": "true"
},
"execution": {
"type": "keyword",
"index": "true"
},
"executionId": {
"type": "long"
},
"executionDuration": {
"type": "long"
},
"machine": {
"type": "keyword",
"index": "true"
},
"timestamp": {
"type": "date",
"format": "yyyy/MM/dd HH:mm:ss"
},
"executionTimestamp": {
"type": "date",
"format": "yyyy/MM/dd HH:mm:ss"
},
"duration": {
"type": "long"
}
},
"dynamic_templates": [
{
"long_prop": {
"match": "long_*",
"match_mapping_type": "string",
"mapping": {
"type": "long",
"index": "true"
}
}
},
{
"int_prop": {
"match": "int_*",
"match_mapping_type": "string",
"mapping": {
"type": "integer",
"index": "true"
}
}
},
{
"double_prop": {
"match": "double_*",
"match_mapping_type": "string",
"mapping": {
"type": "double",
"index": "true"
}
}
},
{
"date_prop": {
"match": "date_*",
"match_mapping_type": "string",
"mapping": {
"type": "date",
"index": "true",
"format": "yyyy/MM/dd HH:mm:ss"
}
}
},
{
"notanalyzed": {
"match": "*",
"unmatch": "^(long_|int_|double_|date_)$",
"match_mapping_type": "string",
"mapping": {
"type": "keyword",
"index": "true"
}
}
}
]
}
}
}
11 changes: 11 additions & 0 deletions server/difido-server/docRoot/css/indexPageStyle.css
Original file line number Diff line number Diff line change
Expand Up @@ -101,4 +101,15 @@ div.dt-buttons {
color: black;
text-decoration: none;
cursor: pointer;
}

.commentStar {
cursor: pointer;
font-size: 12pt;
color: #337ab7;
}

.commentStar:hover {
cursor: pointer;
color: #006;
}
Loading

0 comments on commit 28c5a57

Please sign in to comment.