From f51670bdc0a71789176ef7b29c8fb72d0c3e43d5 Mon Sep 17 00:00:00 2001 From: Jerry Flood Date: Wed, 17 Apr 2019 14:54:16 -0400 Subject: [PATCH] Add cmso-sonar to generate jacoco files Issue-ID: OPTFRA-474 Change-Id: I0a1cd03708fda09255ada655df727acfa7498d09 Signed-off-by: Jerry Flood --- cmso-robot/pom.xml | 26 --- .../src/test/resources/integration.properties | 5 - .../cmso-optimizer/etc/config/cadi.properties | 0 .../cmso-optimizer/etc/config/liquibase.properties | 0 .../cmso-optimizer/etc/config/optimizer.properties | 0 .../cmso-optimizer/etc/startDbinitService.sh | 0 .../cmso-optimizer/etc/startJacocoService.sh | 0 .../cmso-service/etc/config/cadi.properties | 0 .../cmso-service/etc/config/cmso.properties | 0 .../cmso-service/etc/config/liquibase.properties | 0 .../cmso-service/etc/config/optimizer.properties | 0 .../cmso-service/etc/config/ticketmgt.properties | 0 .../cmso-service/etc/startDbinitService.sh | 0 .../cmso-service/etc/startJacocoService.sh | 0 .../cmso-ticketmgt/etc/config/cadi.properties | 0 .../cmso-ticketmgt/etc/config/ticketmgt.properties | 0 .../cmso-ticketmgt/etc/startJacocoService.sh | 0 .../cmso-topology/etc/config/cadi.properties | 0 .../cmso-topology/etc/config/topology.properties | 0 .../cmso-topology/etc/startJacocoService.sh | 0 .../docker/integration}/docker-compose.yml | 0 .../docker/integration}/ete_test.sh | 0 cmso-sonar/docker/integration/mariadb/conf1/my.cnf | 194 +++++++++++++++++++++ cmso-sonar/docker/integration/mariadb/conf2/my.cnf | 193 ++++++++++++++++++++ cmso-sonar/docker/integration/mariadb/conf3/my.cnf | 193 ++++++++++++++++++++ cmso-sonar/docker/script/TagVersion.groovy | 40 +++++ cmso-sonar/pom.xml | 119 +++++++++++++ .../onap/optf/cmso/it/IT_FullIntegrationTest.java | 2 +- .../src/test/resources/integration.properties | 5 + pom.xml | 1 + 30 files changed, 746 insertions(+), 32 deletions(-) delete mode 100644 cmso-robot/src/test/resources/integration.properties rename {cmso-robot/docker/cmso-service => cmso-sonar/docker/integration}/cmso-optimizer/etc/config/cadi.properties (100%) rename {cmso-robot/docker/cmso-service => cmso-sonar/docker/integration}/cmso-optimizer/etc/config/liquibase.properties (100%) rename {cmso-robot/docker/cmso-service => cmso-sonar/docker/integration}/cmso-optimizer/etc/config/optimizer.properties (100%) rename {cmso-robot/docker/cmso-service => cmso-sonar/docker/integration}/cmso-optimizer/etc/startDbinitService.sh (100%) rename {cmso-robot/docker/cmso-service => cmso-sonar/docker/integration}/cmso-optimizer/etc/startJacocoService.sh (100%) rename {cmso-robot/docker/cmso-service => cmso-sonar/docker/integration}/cmso-service/etc/config/cadi.properties (100%) rename {cmso-robot/docker/cmso-service => cmso-sonar/docker/integration}/cmso-service/etc/config/cmso.properties (100%) rename {cmso-robot/docker/cmso-service => cmso-sonar/docker/integration}/cmso-service/etc/config/liquibase.properties (100%) rename {cmso-robot/docker/cmso-service => cmso-sonar/docker/integration}/cmso-service/etc/config/optimizer.properties (100%) rename {cmso-robot/docker/cmso-service => cmso-sonar/docker/integration}/cmso-service/etc/config/ticketmgt.properties (100%) rename {cmso-robot/docker/cmso-service => cmso-sonar/docker/integration}/cmso-service/etc/startDbinitService.sh (100%) rename {cmso-robot/docker/cmso-service => cmso-sonar/docker/integration}/cmso-service/etc/startJacocoService.sh (100%) rename {cmso-robot/docker/cmso-service => cmso-sonar/docker/integration}/cmso-ticketmgt/etc/config/cadi.properties (100%) rename {cmso-robot/docker/cmso-service => cmso-sonar/docker/integration}/cmso-ticketmgt/etc/config/ticketmgt.properties (100%) rename {cmso-robot/docker/cmso-service => cmso-sonar/docker/integration}/cmso-ticketmgt/etc/startJacocoService.sh (100%) rename {cmso-robot/docker/cmso-service => cmso-sonar/docker/integration}/cmso-topology/etc/config/cadi.properties (100%) rename {cmso-robot/docker/cmso-service => cmso-sonar/docker/integration}/cmso-topology/etc/config/topology.properties (100%) rename {cmso-robot/docker/cmso-service => cmso-sonar/docker/integration}/cmso-topology/etc/startJacocoService.sh (100%) rename {cmso-robot/docker/cmso-service => cmso-sonar/docker/integration}/docker-compose.yml (100%) rename {cmso-robot/docker/cmso-service => cmso-sonar/docker/integration}/ete_test.sh (100%) create mode 100644 cmso-sonar/docker/integration/mariadb/conf1/my.cnf create mode 100644 cmso-sonar/docker/integration/mariadb/conf2/my.cnf create mode 100644 cmso-sonar/docker/integration/mariadb/conf3/my.cnf create mode 100644 cmso-sonar/docker/script/TagVersion.groovy create mode 100644 cmso-sonar/pom.xml rename {cmso-robot => cmso-sonar}/src/test/java/org/onap/optf/cmso/it/IT_FullIntegrationTest.java (98%) create mode 100644 cmso-sonar/src/test/resources/integration.properties diff --git a/cmso-robot/pom.xml b/cmso-robot/pom.xml index 89c6019..8146afd 100644 --- a/cmso-robot/pom.xml +++ b/cmso-robot/pom.xml @@ -136,32 +136,6 @@ - - org.jacoco - jacoco-maven-plugin - - - post-integration-test - post-integration-test - - report - - - ${project.basedir}/target/code-coverage/service.jacoco.exec - ${project.basedir}/target/site/jacoco-it - - service/** - - - **/gen/** - **/generated-sources/** - **/yang-gen/** - **/pax/** - - - - - optf-cmso-robot diff --git a/cmso-robot/src/test/resources/integration.properties b/cmso-robot/src/test/resources/integration.properties deleted file mode 100644 index 8fcc7b5..0000000 --- a/cmso-robot/src/test/resources/integration.properties +++ /dev/null @@ -1,5 +0,0 @@ -base.path=./ -jacoco.exec.dest=target/code-coverage -jacoco.exec.classes=target/classes -source.classes.folders=service|../cmso-service/target/classes -jacoco.exec.source.files=docker/cmso-service/cmso-service/logs/service.jacoco.exec \ No newline at end of file diff --git a/cmso-robot/docker/cmso-service/cmso-optimizer/etc/config/cadi.properties b/cmso-sonar/docker/integration/cmso-optimizer/etc/config/cadi.properties similarity index 100% rename from cmso-robot/docker/cmso-service/cmso-optimizer/etc/config/cadi.properties rename to cmso-sonar/docker/integration/cmso-optimizer/etc/config/cadi.properties diff --git a/cmso-robot/docker/cmso-service/cmso-optimizer/etc/config/liquibase.properties b/cmso-sonar/docker/integration/cmso-optimizer/etc/config/liquibase.properties similarity index 100% rename from cmso-robot/docker/cmso-service/cmso-optimizer/etc/config/liquibase.properties rename to cmso-sonar/docker/integration/cmso-optimizer/etc/config/liquibase.properties diff --git a/cmso-robot/docker/cmso-service/cmso-optimizer/etc/config/optimizer.properties b/cmso-sonar/docker/integration/cmso-optimizer/etc/config/optimizer.properties similarity index 100% rename from cmso-robot/docker/cmso-service/cmso-optimizer/etc/config/optimizer.properties rename to cmso-sonar/docker/integration/cmso-optimizer/etc/config/optimizer.properties diff --git a/cmso-robot/docker/cmso-service/cmso-optimizer/etc/startDbinitService.sh b/cmso-sonar/docker/integration/cmso-optimizer/etc/startDbinitService.sh similarity index 100% rename from cmso-robot/docker/cmso-service/cmso-optimizer/etc/startDbinitService.sh rename to cmso-sonar/docker/integration/cmso-optimizer/etc/startDbinitService.sh diff --git a/cmso-robot/docker/cmso-service/cmso-optimizer/etc/startJacocoService.sh b/cmso-sonar/docker/integration/cmso-optimizer/etc/startJacocoService.sh similarity index 100% rename from cmso-robot/docker/cmso-service/cmso-optimizer/etc/startJacocoService.sh rename to cmso-sonar/docker/integration/cmso-optimizer/etc/startJacocoService.sh diff --git a/cmso-robot/docker/cmso-service/cmso-service/etc/config/cadi.properties b/cmso-sonar/docker/integration/cmso-service/etc/config/cadi.properties similarity index 100% rename from cmso-robot/docker/cmso-service/cmso-service/etc/config/cadi.properties rename to cmso-sonar/docker/integration/cmso-service/etc/config/cadi.properties diff --git a/cmso-robot/docker/cmso-service/cmso-service/etc/config/cmso.properties b/cmso-sonar/docker/integration/cmso-service/etc/config/cmso.properties similarity index 100% rename from cmso-robot/docker/cmso-service/cmso-service/etc/config/cmso.properties rename to cmso-sonar/docker/integration/cmso-service/etc/config/cmso.properties diff --git a/cmso-robot/docker/cmso-service/cmso-service/etc/config/liquibase.properties b/cmso-sonar/docker/integration/cmso-service/etc/config/liquibase.properties similarity index 100% rename from cmso-robot/docker/cmso-service/cmso-service/etc/config/liquibase.properties rename to cmso-sonar/docker/integration/cmso-service/etc/config/liquibase.properties diff --git a/cmso-robot/docker/cmso-service/cmso-service/etc/config/optimizer.properties b/cmso-sonar/docker/integration/cmso-service/etc/config/optimizer.properties similarity index 100% rename from cmso-robot/docker/cmso-service/cmso-service/etc/config/optimizer.properties rename to cmso-sonar/docker/integration/cmso-service/etc/config/optimizer.properties diff --git a/cmso-robot/docker/cmso-service/cmso-service/etc/config/ticketmgt.properties b/cmso-sonar/docker/integration/cmso-service/etc/config/ticketmgt.properties similarity index 100% rename from cmso-robot/docker/cmso-service/cmso-service/etc/config/ticketmgt.properties rename to cmso-sonar/docker/integration/cmso-service/etc/config/ticketmgt.properties diff --git a/cmso-robot/docker/cmso-service/cmso-service/etc/startDbinitService.sh b/cmso-sonar/docker/integration/cmso-service/etc/startDbinitService.sh similarity index 100% rename from cmso-robot/docker/cmso-service/cmso-service/etc/startDbinitService.sh rename to cmso-sonar/docker/integration/cmso-service/etc/startDbinitService.sh diff --git a/cmso-robot/docker/cmso-service/cmso-service/etc/startJacocoService.sh b/cmso-sonar/docker/integration/cmso-service/etc/startJacocoService.sh similarity index 100% rename from cmso-robot/docker/cmso-service/cmso-service/etc/startJacocoService.sh rename to cmso-sonar/docker/integration/cmso-service/etc/startJacocoService.sh diff --git a/cmso-robot/docker/cmso-service/cmso-ticketmgt/etc/config/cadi.properties b/cmso-sonar/docker/integration/cmso-ticketmgt/etc/config/cadi.properties similarity index 100% rename from cmso-robot/docker/cmso-service/cmso-ticketmgt/etc/config/cadi.properties rename to cmso-sonar/docker/integration/cmso-ticketmgt/etc/config/cadi.properties diff --git a/cmso-robot/docker/cmso-service/cmso-ticketmgt/etc/config/ticketmgt.properties b/cmso-sonar/docker/integration/cmso-ticketmgt/etc/config/ticketmgt.properties similarity index 100% rename from cmso-robot/docker/cmso-service/cmso-ticketmgt/etc/config/ticketmgt.properties rename to cmso-sonar/docker/integration/cmso-ticketmgt/etc/config/ticketmgt.properties diff --git a/cmso-robot/docker/cmso-service/cmso-ticketmgt/etc/startJacocoService.sh b/cmso-sonar/docker/integration/cmso-ticketmgt/etc/startJacocoService.sh similarity index 100% rename from cmso-robot/docker/cmso-service/cmso-ticketmgt/etc/startJacocoService.sh rename to cmso-sonar/docker/integration/cmso-ticketmgt/etc/startJacocoService.sh diff --git a/cmso-robot/docker/cmso-service/cmso-topology/etc/config/cadi.properties b/cmso-sonar/docker/integration/cmso-topology/etc/config/cadi.properties similarity index 100% rename from cmso-robot/docker/cmso-service/cmso-topology/etc/config/cadi.properties rename to cmso-sonar/docker/integration/cmso-topology/etc/config/cadi.properties diff --git a/cmso-robot/docker/cmso-service/cmso-topology/etc/config/topology.properties b/cmso-sonar/docker/integration/cmso-topology/etc/config/topology.properties similarity index 100% rename from cmso-robot/docker/cmso-service/cmso-topology/etc/config/topology.properties rename to cmso-sonar/docker/integration/cmso-topology/etc/config/topology.properties diff --git a/cmso-robot/docker/cmso-service/cmso-topology/etc/startJacocoService.sh b/cmso-sonar/docker/integration/cmso-topology/etc/startJacocoService.sh similarity index 100% rename from cmso-robot/docker/cmso-service/cmso-topology/etc/startJacocoService.sh rename to cmso-sonar/docker/integration/cmso-topology/etc/startJacocoService.sh diff --git a/cmso-robot/docker/cmso-service/docker-compose.yml b/cmso-sonar/docker/integration/docker-compose.yml similarity index 100% rename from cmso-robot/docker/cmso-service/docker-compose.yml rename to cmso-sonar/docker/integration/docker-compose.yml diff --git a/cmso-robot/docker/cmso-service/ete_test.sh b/cmso-sonar/docker/integration/ete_test.sh similarity index 100% rename from cmso-robot/docker/cmso-service/ete_test.sh rename to cmso-sonar/docker/integration/ete_test.sh diff --git a/cmso-sonar/docker/integration/mariadb/conf1/my.cnf b/cmso-sonar/docker/integration/mariadb/conf1/my.cnf new file mode 100644 index 0000000..c6631fb --- /dev/null +++ b/cmso-sonar/docker/integration/mariadb/conf1/my.cnf @@ -0,0 +1,194 @@ +# Example MySQL config file for medium systems. +# +# This is for a system with memory 8G where MySQL plays +# an important part, or systems up to 128M where MySQL is used together with +# other programs (such as a web server) +# +# In this file, you can use all long options that a program supports. +# If you want to know which options a program supports, run the program +# with the "--help" option. + +# The following options will be passed to all MySQL clients +##[client] +##user = root +##port = 3306 +##socket = //opt/app/mysql/mysql.sock + +# Here follows entries for some specific programs + +# The MySQL server +[mysqld] +##performance_schema + +slow_query_log =ON +long_query_time =2 +slow_query_log_file =//var/lib/mysql/slow_query.log +##basedir = //opt/app/mysql/product/mariadb-10.1.11-linux-x86_64 +##datadir = //opt/app/mysql/data +##port = 3306 +##socket = //opt/app/mysql/mysql.sock +skip-external-locking +explicit_defaults_for_timestamp = true +skip-symbolic-links +local-infile = 0 +#ignore_db_dir=lost+found +key_buffer_size = 16M +max_allowed_packet = 4M +table_open_cache = 100 +sort_buffer_size = 512K +net_buffer_length = 8K +read_buffer_size = 256K +read_rnd_buffer_size = 512K +myisam_sort_buffer_size = 8M +max_connections = 500 +lower_case_table_names = 1 +thread_stack = 256K +thread_cache_size = 25 +query_cache_size = 8M +query_cache_type = 0 +query_prealloc_size = 512K +query_cache_limit = 1M + +# Password validation +##plugin-load-add=simple_password_check.so +##simple_password_check_other_characters=0 + +# Audit Log settings +plugin-load-add=server_audit.so +server_audit=FORCE_PLUS_PERMANENT +server_audit_file_path=//var/lib/mysql/audit.log +server_audit_file_rotate_size=50M +server_audit_events=CONNECT,QUERY,TABLE +server_audit_logging=on + +# Don't listen on a TCP/IP port at all. This can be a security enhancement, +# if all processes that need to connect to mysqld run on the same host. +# All interaction with mysqld must be made via Unix sockets or named pipes. +# Note that using this option without enabling named pipes on Windows +# (via the "enable-named-pipe" option) will render mysqld useless! +# +#skip-networking + +# Replication Master Server (default) +# binary logging is required for replication +##log-bin=//var/lib/mysql/mysql-bin + +# binary logging format - mixed recommended +binlog_format=row + +# required unique id between 1 and 2^32 - 1 +# defaults to 1 if master-host is not set +# but will not function as a master if omitted + +# Replication Slave (comment out master section to use this) +# +# To configure this host as a replication slave, you can choose between +# two methods : +# +# 1) Use the CHANGE MASTER TO command (fully described in our manual) - +# the syntax is: +# +# CHANGE MASTER TO MASTER_HOST=, MASTER_PORT=, +# MASTER_USER=, MASTER_PASSWORD= ; +# +# where you replace , , by quoted strings and +# by the master's port number (3306 by default). +# +# Example: +# +# CHANGE MASTER TO MASTER_HOST='125.564.12.1', MASTER_PORT=3306, +# MASTER_USER='joe', MASTER_PASSWORD='secret'; +# +# OR +# +# 2) Set the variables below. However, in case you choose this method, then +# start replication for the first time (even unsuccessfully, for example +# if you mistyped the password in master-password and the slave fails to +# connect), the slave will create a master.info file, and any later +# change in this file to the variables' values below will be ignored and +# overridden by the content of the master.info file, unless you shutdown +# the slave server, delete master.info and restart the slaver server. +# For that reason, you may want to leave the lines below untouched +# (commented) and instead use CHANGE MASTER TO (see above) +# +# required unique id between 2 and 2^32 - 1 +# (and different from the master) +# defaults to 2 if master-host is set +# but will not function as a slave if omitted +#server-id = 2 +# +# The replication master for this slave - required +#master-host = +# +# The username the slave will use for authentication when connecting +# to the master - required +#master-user = +# +# The password the slave will authenticate with when connecting to +# the master - required +#master-password = +# +# The port the master is listening on. +# optional - defaults to 3306 +#master-port = +# +# binary logging - not required for slaves, but recommended +#log-bin=mysql-bin + +# Uncomment the following if you are using InnoDB tables +##innodb_data_home_dir = //opt/app/mysql/data +##innodb_data_file_path = ibdata1:20M:autoextend:max:32G +##innodb_log_group_home_dir = //opt/app/mysql/iblogs +# You can set .._buffer_pool_size up to 50 - 80 % +# of RAM but beware of setting memory usage too high +innodb_buffer_pool_size = 128M +#innodb_additional_mem_pool_size = 2M +# Set .._log_file_size to 25 % of buffer pool size +innodb_log_file_size = 10M +innodb_log_files_in_group = 3 +innodb_log_buffer_size = 8M +#innodb_flush_log_at_trx_commit = 1 +innodb_lock_wait_timeout = 50 +innodb_autoextend_increment = 100 +expire_logs_days = 8 +open_files_limit = 2000 +transaction-isolation=READ-COMMITTED +####### Galera parameters ####### +## Galera Provider configuration +wsrep_provider=/usr/lib/galera/libgalera_smm.so +wsrep_provider_options="gcache.size=128M; gcache.page_size=10M" +## Galera Cluster configuration +wsrep_cluster_name="MSO-automated-tests-cluster" +wsrep_cluster_address="gcomm://" +#wsrep_cluster_address="gcomm://mariadb1,mariadb2,mariadb3" +##wsrep_cluster_address="gcomm://192.169.3.184,192.169.3.185,192.169.3.186" +## Galera Synchronization configuration +wsrep_sst_method=rsync +#wsrep_sst_method=xtrabackup-v2 +#wsrep_sst_auth="sstuser:Mon#2o!6" +## Galera Node configuration +wsrep_node_name="mariadb1" +##wsrep_node_address="192.169.3.184" +wsrep_on=OFF +## Status notification +#wsrep_notify_cmd=/opt/app/mysql/bin/wsrep_notify +####### + + +[mysqldump] +quick +max_allowed_packet = 16M + +[mysql] +no-auto-rehash +# Remove the next comment character if you are not familiar with SQL +#safe-updates + +[myisamchk] +key_buffer_size = 20971520 + +##[mysqlhotcopy] +##interactive-timeout +##[mysqld_safe] +##malloc-lib=//opt/app/mysql/local/lib/libjemalloc.so.1 +##log-error=//opt/app/mysql/log/mysqld.log \ No newline at end of file diff --git a/cmso-sonar/docker/integration/mariadb/conf2/my.cnf b/cmso-sonar/docker/integration/mariadb/conf2/my.cnf new file mode 100644 index 0000000..bf5f9c1 --- /dev/null +++ b/cmso-sonar/docker/integration/mariadb/conf2/my.cnf @@ -0,0 +1,193 @@ +# Example MySQL config file for medium systems. +# +# This is for a system with memory 8G where MySQL plays +# an important part, or systems up to 128M where MySQL is used together with +# other programs (such as a web server) +# +# In this file, you can use all long options that a program supports. +# If you want to know which options a program supports, run the program +# with the "--help" option. + +# The following options will be passed to all MySQL clients +##[client] +##user = root +##port = 3306 +##socket = //opt/app/mysql/mysql.sock + +# Here follows entries for some specific programs + +# The MySQL server +[mysqld] +##performance_schema + +slow_query_log =ON +long_query_time =2 +slow_query_log_file =//var/lib/mysql/slow_query.log +##basedir = //opt/app/mysql/product/mariadb-10.1.11-linux-x86_64 +##datadir = //opt/app/mysql/data +##port = 3306 +##socket = //opt/app/mysql/mysql.sock +skip-external-locking +explicit_defaults_for_timestamp = true +skip-symbolic-links +local-infile = 0 +#ignore_db_dir=lost+found +key_buffer_size = 16M +max_allowed_packet = 4M +table_open_cache = 100 +sort_buffer_size = 512K +net_buffer_length = 8K +read_buffer_size = 256K +read_rnd_buffer_size = 512K +myisam_sort_buffer_size = 8M +max_connections = 500 +lower_case_table_names = 1 +thread_stack = 256K +thread_cache_size = 25 +query_cache_size = 8M +query_cache_type = 0 +query_prealloc_size = 512K +query_cache_limit = 1M + +# Password validation +##plugin-load-add=simple_password_check.so +##simple_password_check_other_characters=0 + +# Audit Log settings +plugin-load-add=server_audit.so +server_audit=FORCE_PLUS_PERMANENT +server_audit_file_path=//var/lib/mysql/audit.log +server_audit_file_rotate_size=50M +server_audit_events=CONNECT,QUERY,TABLE +server_audit_logging=on + +# Don't listen on a TCP/IP port at all. This can be a security enhancement, +# if all processes that need to connect to mysqld run on the same host. +# All interaction with mysqld must be made via Unix sockets or named pipes. +# Note that using this option without enabling named pipes on Windows +# (via the "enable-named-pipe" option) will render mysqld useless! +# +#skip-networking + +# Replication Master Server (default) +# binary logging is required for replication +##log-bin=//var/lib/mysql/mysql-bin + +# binary logging format - mixed recommended +binlog_format=row + +# required unique id between 1 and 2^32 - 1 +# defaults to 1 if master-host is not set +# but will not function as a master if omitted + +# Replication Slave (comment out master section to use this) +# +# To configure this host as a replication slave, you can choose between +# two methods : +# +# 1) Use the CHANGE MASTER TO command (fully described in our manual) - +# the syntax is: +# +# CHANGE MASTER TO MASTER_HOST=, MASTER_PORT=, +# MASTER_USER=, MASTER_PASSWORD= ; +# +# where you replace , , by quoted strings and +# by the master's port number (3306 by default). +# +# Example: +# +# CHANGE MASTER TO MASTER_HOST='125.564.12.1', MASTER_PORT=3306, +# MASTER_USER='joe', MASTER_PASSWORD='secret'; +# +# OR +# +# 2) Set the variables below. However, in case you choose this method, then +# start replication for the first time (even unsuccessfully, for example +# if you mistyped the password in master-password and the slave fails to +# connect), the slave will create a master.info file, and any later +# change in this file to the variables' values below will be ignored and +# overridden by the content of the master.info file, unless you shutdown +# the slave server, delete master.info and restart the slaver server. +# For that reason, you may want to leave the lines below untouched +# (commented) and instead use CHANGE MASTER TO (see above) +# +# required unique id between 2 and 2^32 - 1 +# (and different from the master) +# defaults to 2 if master-host is set +# but will not function as a slave if omitted +#server-id = 2 +# +# The replication master for this slave - required +#master-host = +# +# The username the slave will use for authentication when connecting +# to the master - required +#master-user = +# +# The password the slave will authenticate with when connecting to +# the master - required +#master-password = +# +# The port the master is listening on. +# optional - defaults to 3306 +#master-port = +# +# binary logging - not required for slaves, but recommended +#log-bin=mysql-bin + +# Uncomment the following if you are using InnoDB tables +##innodb_data_home_dir = //opt/app/mysql/data +##innodb_data_file_path = ibdata1:20M:autoextend:max:32G +##innodb_log_group_home_dir = //opt/app/mysql/iblogs +# You can set .._buffer_pool_size up to 50 - 80 % +# of RAM but beware of setting memory usage too high +innodb_buffer_pool_size = 6380M +#innodb_additional_mem_pool_size = 2M +# Set .._log_file_size to 25 % of buffer pool size +innodb_log_file_size = 150M +innodb_log_files_in_group = 3 +innodb_log_buffer_size = 8M +#innodb_flush_log_at_trx_commit = 1 +innodb_lock_wait_timeout = 50 +innodb_autoextend_increment = 100 +expire_logs_days = 8 +open_files_limit = 2000 +transaction-isolation=READ-COMMITTED +####### Galera parameters ####### +## Galera Provider configuration +wsrep_provider=/usr/lib/galera/libgalera_smm.so +wsrep_provider_options="gcache.size=2G; gcache.page_size=1G" +## Galera Cluster configuration +wsrep_cluster_name="MSO-automated-tests-cluster" +wsrep_cluster_address="gcomm://mariadb1,mariadb2,mariadb3" +##wsrep_cluster_address="gcomm://192.169.3.184,192.169.3.185,192.169.3.186" +## Galera Synchronization configuration +wsrep_sst_method=rsync +#wsrep_sst_method=xtrabackup-v2 +#wsrep_sst_auth="sstuser:Mon#2o!6" +## Galera Node configuration +wsrep_node_name="mariadb2" +##wsrep_node_address="192.169.3.184" +wsrep_on=ON +## Status notification +#wsrep_notify_cmd=/opt/app/mysql/bin/wsrep_notify +####### + + +[mysqldump] +quick +max_allowed_packet = 16M + +[mysql] +no-auto-rehash +# Remove the next comment character if you are not familiar with SQL +#safe-updates + +[myisamchk] +key_buffer_size = 20971520 + +##[mysqlhotcopy] +##interactive-timeout +##[mysqld_safe] +##malloc-lib=//opt/app/mysql/local/lib/libjemalloc.so.1 +##log-error=//opt/app/mysql/log/mysqld.log \ No newline at end of file diff --git a/cmso-sonar/docker/integration/mariadb/conf3/my.cnf b/cmso-sonar/docker/integration/mariadb/conf3/my.cnf new file mode 100644 index 0000000..74f7a31 --- /dev/null +++ b/cmso-sonar/docker/integration/mariadb/conf3/my.cnf @@ -0,0 +1,193 @@ +# Example MySQL config file for medium systems. +# +# This is for a system with memory 8G where MySQL plays +# an important part, or systems up to 128M where MySQL is used together with +# other programs (such as a web server) +# +# In this file, you can use all long options that a program supports. +# If you want to know which options a program supports, run the program +# with the "--help" option. + +# The following options will be passed to all MySQL clients +##[client] +##user = root +##port = 3306 +##socket = //opt/app/mysql/mysql.sock + +# Here follows entries for some specific programs + +# The MySQL server +[mysqld] +##performance_schema + +slow_query_log =ON +long_query_time =2 +slow_query_log_file =//var/lib/mysql/slow_query.log +##basedir = //opt/app/mysql/product/mariadb-10.1.11-linux-x86_64 +##datadir = //opt/app/mysql/data +##port = 3306 +##socket = //opt/app/mysql/mysql.sock +skip-external-locking +explicit_defaults_for_timestamp = true +skip-symbolic-links +local-infile = 0 +#ignore_db_dir=lost+found +key_buffer_size = 16M +max_allowed_packet = 4M +table_open_cache = 100 +sort_buffer_size = 512K +net_buffer_length = 8K +read_buffer_size = 256K +read_rnd_buffer_size = 512K +myisam_sort_buffer_size = 8M +max_connections = 500 +lower_case_table_names = 1 +thread_stack = 256K +thread_cache_size = 25 +query_cache_size = 8M +query_cache_type = 0 +query_prealloc_size = 512K +query_cache_limit = 1M + +# Password validation +##plugin-load-add=simple_password_check.so +##simple_password_check_other_characters=0 + +# Audit Log settings +plugin-load-add=server_audit.so +server_audit=FORCE_PLUS_PERMANENT +server_audit_file_path=//var/lib/mysql/audit.log +server_audit_file_rotate_size=50M +server_audit_events=CONNECT,QUERY,TABLE +server_audit_logging=on + +# Don't listen on a TCP/IP port at all. This can be a security enhancement, +# if all processes that need to connect to mysqld run on the same host. +# All interaction with mysqld must be made via Unix sockets or named pipes. +# Note that using this option without enabling named pipes on Windows +# (via the "enable-named-pipe" option) will render mysqld useless! +# +#skip-networking + +# Replication Master Server (default) +# binary logging is required for replication +##log-bin=//var/lib/mysql/mysql-bin + +# binary logging format - mixed recommended +binlog_format=row + +# required unique id between 1 and 2^32 - 1 +# defaults to 1 if master-host is not set +# but will not function as a master if omitted + +# Replication Slave (comment out master section to use this) +# +# To configure this host as a replication slave, you can choose between +# two methods : +# +# 1) Use the CHANGE MASTER TO command (fully described in our manual) - +# the syntax is: +# +# CHANGE MASTER TO MASTER_HOST=, MASTER_PORT=, +# MASTER_USER=, MASTER_PASSWORD= ; +# +# where you replace , , by quoted strings and +# by the master's port number (3306 by default). +# +# Example: +# +# CHANGE MASTER TO MASTER_HOST='125.564.12.1', MASTER_PORT=3306, +# MASTER_USER='joe', MASTER_PASSWORD='secret'; +# +# OR +# +# 2) Set the variables below. However, in case you choose this method, then +# start replication for the first time (even unsuccessfully, for example +# if you mistyped the password in master-password and the slave fails to +# connect), the slave will create a master.info file, and any later +# change in this file to the variables' values below will be ignored and +# overridden by the content of the master.info file, unless you shutdown +# the slave server, delete master.info and restart the slaver server. +# For that reason, you may want to leave the lines below untouched +# (commented) and instead use CHANGE MASTER TO (see above) +# +# required unique id between 2 and 2^32 - 1 +# (and different from the master) +# defaults to 2 if master-host is set +# but will not function as a slave if omitted +#server-id = 2 +# +# The replication master for this slave - required +#master-host = +# +# The username the slave will use for authentication when connecting +# to the master - required +#master-user = +# +# The password the slave will authenticate with when connecting to +# the master - required +#master-password = +# +# The port the master is listening on. +# optional - defaults to 3306 +#master-port = +# +# binary logging - not required for slaves, but recommended +#log-bin=mysql-bin + +# Uncomment the following if you are using InnoDB tables +##innodb_data_home_dir = //opt/app/mysql/data +##innodb_data_file_path = ibdata1:20M:autoextend:max:32G +##innodb_log_group_home_dir = //opt/app/mysql/iblogs +# You can set .._buffer_pool_size up to 50 - 80 % +# of RAM but beware of setting memory usage too high +innodb_buffer_pool_size = 6380M +#innodb_additional_mem_pool_size = 2M +# Set .._log_file_size to 25 % of buffer pool size +innodb_log_file_size = 150M +innodb_log_files_in_group = 3 +innodb_log_buffer_size = 8M +#innodb_flush_log_at_trx_commit = 1 +innodb_lock_wait_timeout = 50 +innodb_autoextend_increment = 100 +expire_logs_days = 8 +open_files_limit = 2000 +transaction-isolation=READ-COMMITTED +####### Galera parameters ####### +## Galera Provider configuration +wsrep_provider=/usr/lib/galera/libgalera_smm.so +wsrep_provider_options="gcache.size=2G; gcache.page_size=1G" +## Galera Cluster configuration +wsrep_cluster_name="MSO-automated-tests-cluster" +wsrep_cluster_address="gcomm://mariadb1,mariadb2,mariadb3" +##wsrep_cluster_address="gcomm://192.169.3.184,192.169.3.185,192.169.3.186" +## Galera Synchronization configuration +wsrep_sst_method=rsync +#wsrep_sst_method=xtrabackup-v2 +#wsrep_sst_auth="sstuser:Mon#2o!6" +## Galera Node configuration +wsrep_node_name="mariadb3" +##wsrep_node_address="192.169.3.184" +wsrep_on=ON +## Status notification +#wsrep_notify_cmd=/opt/app/mysql/bin/wsrep_notify +####### + + +[mysqldump] +quick +max_allowed_packet = 16M + +[mysql] +no-auto-rehash +# Remove the next comment character if you are not familiar with SQL +#safe-updates + +[myisamchk] +key_buffer_size = 20971520 + +##[mysqlhotcopy] +##interactive-timeout +##[mysqld_safe] +##malloc-lib=//opt/app/mysql/local/lib/libjemalloc.so.1 +##log-error=//opt/app/mysql/log/mysqld.log \ No newline at end of file diff --git a/cmso-sonar/docker/script/TagVersion.groovy b/cmso-sonar/docker/script/TagVersion.groovy new file mode 100644 index 0000000..c682f7f --- /dev/null +++ b/cmso-sonar/docker/script/TagVersion.groovy @@ -0,0 +1,40 @@ +/*- + * ============LICENSE_START======================================================= + * ONAP CMSO + * ================================================================================ + * Copyright (C) 2018 AT&T Intellectual Property. All rights + * reserved. + * ================================================================================ + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * ============LICENSE_END============================================ + * =================================================================== + * + */ + +package org.onap.cmso.maven.scripts + +println project.properties['cmso.project.version']; +def versionArray; +if ( project.properties['cmso.project.version'] != null ) { + versionArray = project.properties['cmso.project.version'].split('\\.'); +} + +if ( project.properties['cmso.project.version'].endsWith("-SNAPSHOT") ) { + project.properties['project.docker.latesttag.version']=versionArray[0] + '.' + versionArray[1] + "-SNAPSHOT-latest"; + project.properties['project.docker.latesttagtimestamp.version']=versionArray[0] + '.' + versionArray[1] + "-SNAPSHOT-"+project.properties['cmso.build.timestamp']; +} else { + project.properties['project.docker.latesttag.version']=versionArray[0] + '.' + versionArray[1] + "-STAGING-latest"; + project.properties['project.docker.latesttagtimestamp.version']=versionArray[0] + '.' + versionArray[1] + "-STAGING-"+project.properties['cmso.build.timestamp']; +} + +println 'New Tag for docker:' + project.properties['project.docker.latesttag.version']; \ No newline at end of file diff --git a/cmso-sonar/pom.xml b/cmso-sonar/pom.xml new file mode 100644 index 0000000..a46add5 --- /dev/null +++ b/cmso-sonar/pom.xml @@ -0,0 +1,119 @@ + + + + 4.0.0 + + + org.onap.optf.cmso + cmso + 1.0.1-SNAPSHOT + + + org.onap.optf.cmso + cmso-sonar + + cmso-sonar + Maven Porject for Running CMSO CSIT for Code Coverage + + + yyyyMMdd'T'HHmmss'Z' + + ${project.version} + ${maven.build.timestamp} + + cmso-robot + Dublin + org.onap.optf + cmso-sonar + + ${maven.build.timestamp} + UTF-8 + UTF-8 + yyyyMMdd'T'HHmmss'Z' + + localhost:5000 + nexus3.onap.org:10001 + false + false + false + false + + + + + commons-io + commons-io + 2.6 + + + junit + junit + 4.12 + + + + + + org.codehaus.groovy.maven + gmaven-plugin + 1.0 + + + validate + + execute + + + ${project.basedir}/docker/script/TagVersion.groovy + + + + + + org.jacoco + jacoco-maven-plugin + + + post-integration-test1 + post-integration-test + + report + + + ${project.basedir}/target/code-coverage/service.jacoco.exec + ${project.basedir}/target/site/service-it + + service/** + + + **/gen/** + **/generated-sources/** + **/yang-gen/** + **/pax/** + + + + + + + optf-cmso-sonar + + diff --git a/cmso-robot/src/test/java/org/onap/optf/cmso/it/IT_FullIntegrationTest.java b/cmso-sonar/src/test/java/org/onap/optf/cmso/it/IT_FullIntegrationTest.java similarity index 98% rename from cmso-robot/src/test/java/org/onap/optf/cmso/it/IT_FullIntegrationTest.java rename to cmso-sonar/src/test/java/org/onap/optf/cmso/it/IT_FullIntegrationTest.java index 53aa8d6..d90d85d 100644 --- a/cmso-robot/src/test/java/org/onap/optf/cmso/it/IT_FullIntegrationTest.java +++ b/cmso-sonar/src/test/java/org/onap/optf/cmso/it/IT_FullIntegrationTest.java @@ -119,7 +119,7 @@ public class IT_FullIntegrationTest { ProcessBuilder processBuilder = new ProcessBuilder(); List command = new ArrayList<>(); String basepath = env.getProperty("base.path", "./"); - File workdir = new File(basepath + "docker/cmso-service"); + File workdir = new File(env.getProperty("workdir", "./docker/integration")); command.add("/bin/bash"); command.add("-x"); command.add(basepath + "ete_test.sh"); diff --git a/cmso-sonar/src/test/resources/integration.properties b/cmso-sonar/src/test/resources/integration.properties new file mode 100644 index 0000000..7d2f84c --- /dev/null +++ b/cmso-sonar/src/test/resources/integration.properties @@ -0,0 +1,5 @@ +base.path=./ +jacoco.exec.dest=target/code-coverage +jacoco.exec.classes=target/classes +source.classes.folders=service|../cmso-service/target/classes,optimizer +jacoco.exec.source.files=docker/integration/cmso-service/logs/service.jacoco.exec,docker/integration/cmso-service/logs/optimizer.jacoco.exec \ No newline at end of file diff --git a/pom.xml b/pom.xml index 5f8175e..d1a50cd 100644 --- a/pom.xml +++ b/pom.xml @@ -68,6 +68,7 @@ cmso-optimizer cmso-ticketmgt cmso-robot + cmso-sonar -- 2.16.6