From 6cfe5cf57527bab6fc119f1b90501d3d5edf2b82 Mon Sep 17 00:00:00 2001 From: Philip Durbin Date: Tue, 3 Oct 2023 10:14:07 -0400 Subject: [PATCH 1/3] update jacoco path for unit tests #325 --- tasks/jacoco-generate_report.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tasks/jacoco-generate_report.yml b/tasks/jacoco-generate_report.yml index 694fbd2..1fe0513 100644 --- a/tasks/jacoco-generate_report.yml +++ b/tasks/jacoco-generate_report.yml @@ -16,7 +16,7 @@ mode: '0755' - name: merge jacoco exec files - shell: 'java -jar {{ dataverse.jacoco.home }}/lib/jacococli.jar merge {{ payara_dir }}/glassfish/domains/{{ dataverse.payara.domain }}/config/jacoco.exec {{ dataverse.srcdir }}/target/jacoco.exec --destfile {{ dataverse.srcdir }}/target/jacoco_merged.exec' + shell: 'java -jar {{ dataverse.jacoco.home }}/lib/jacococli.jar merge {{ payara_dir }}/glassfish/domains/{{ dataverse.payara.domain }}/config/jacoco.exec {{ dataverse.srcdir }}/target/coverage-reports/jacoco-unit.exec --destfile {{ dataverse.srcdir }}/target/jacoco_merged.exec' args: chdir: '{{ dataverse.jacoco.home }}' From d83118388dab48353be16aac7c3aa524e0fd1283 Mon Sep 17 00:00:00 2001 From: Philip Durbin Date: Tue, 3 Oct 2023 16:11:42 -0400 Subject: [PATCH 2/3] Update ec2-create-instance.sh, fix coverage-reports/jacoco-unit.exec --- ec2/ec2-create-instance.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ec2/ec2-create-instance.sh b/ec2/ec2-create-instance.sh index bdb58e1..63912bc 100755 --- a/ec2/ec2-create-instance.sh +++ b/ec2/ec2-create-instance.sh @@ -257,7 +257,7 @@ if [ ! -z "$LOCAL_LOG_PATH" ]; then rsync -av -e "ssh -i $PEM_FILE" --ignore-missing-args $AWS_USER@$PUBLIC_DNS:/tmp/dataverse/mvn.out $LOCAL_LOG_PATH/ # 4 jacoco rsync -av -e "ssh -i $PEM_FILE" --ignore-missing-args $AWS_USER@$PUBLIC_DNS:/tmp/dataverse/target/coverage-it $LOCAL_LOG_PATH/ - rsync -av -e "ssh -i $PEM_FILE" --ignore-missing-args $AWS_USER@$PUBLIC_DNS:/tmp/dataverse/target/*.exec $LOCAL_LOG_PATH/ + rsync -av -e "ssh -i $PEM_FILE" --ignore-missing-args $AWS_USER@$PUBLIC_DNS:/tmp/dataverse/target/coverage-reports/jacoco-unit.exec $LOCAL_LOG_PATH/ rsync -av -e "ssh -i $PEM_FILE" --ignore-missing-args $AWS_USER@$PUBLIC_DNS:/tmp/dataverse/target/classes $LOCAL_LOG_PATH/ rsync -av -e "ssh -i $PEM_FILE" --ignore-missing-args $AWS_USER@$PUBLIC_DNS:/tmp/dataverse/src $LOCAL_LOG_PATH/ # 5 server.logs From 382ff0dd1b36d6c588bd7bfce341f6ae47d225aa Mon Sep 17 00:00:00 2001 From: Philip Durbin Date: Wed, 4 Oct 2023 15:02:05 -0400 Subject: [PATCH 3/3] Update ec2-create-instance.sh get merged file --- ec2/ec2-create-instance.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/ec2/ec2-create-instance.sh b/ec2/ec2-create-instance.sh index 63912bc..abd6882 100755 --- a/ec2/ec2-create-instance.sh +++ b/ec2/ec2-create-instance.sh @@ -258,6 +258,7 @@ if [ ! -z "$LOCAL_LOG_PATH" ]; then # 4 jacoco rsync -av -e "ssh -i $PEM_FILE" --ignore-missing-args $AWS_USER@$PUBLIC_DNS:/tmp/dataverse/target/coverage-it $LOCAL_LOG_PATH/ rsync -av -e "ssh -i $PEM_FILE" --ignore-missing-args $AWS_USER@$PUBLIC_DNS:/tmp/dataverse/target/coverage-reports/jacoco-unit.exec $LOCAL_LOG_PATH/ + rsync -av -e "ssh -i $PEM_FILE" --ignore-missing-args $AWS_USER@$PUBLIC_DNS:/tmp/dataverse/target/jacoco_merged.exec $LOCAL_LOG_PATH/ rsync -av -e "ssh -i $PEM_FILE" --ignore-missing-args $AWS_USER@$PUBLIC_DNS:/tmp/dataverse/target/classes $LOCAL_LOG_PATH/ rsync -av -e "ssh -i $PEM_FILE" --ignore-missing-args $AWS_USER@$PUBLIC_DNS:/tmp/dataverse/src $LOCAL_LOG_PATH/ # 5 server.logs