From a250da54f061ac4726e0ee5f0520715544428d8b Mon Sep 17 00:00:00 2001
From: Evgeny Subotin <“evgeny.subotin@gigaspaces.com”>
Date: Tue, 21 May 2024 11:51:21 +0300
Subject: [PATCH 1/4] Initial java17 commit
---
.../submitter_deploy/files/submitter-env.ini | 2 +-
docker/Dockerfile | 18 +-
docker/docker-build.sh | 5 +-
newman-analytics/bin/newman-crontab.file | 2 +-
.../resources/crons/alert/alert.properties | 8 +
.../crons/cleanse/cleanse.properties | 4 +
.../crons/suitediff/body-template.st | 65 +
.../crons/suitediff/subject-template.st | 1 +
.../crons/suitediff/suitediff.properties | 14 +
newman-server/config/realm.properties | 7925 +++++++++++++++++
newman-server/web/elm/favicon.ico | Bin 0 -> 318 bytes
11 files changed, 8032 insertions(+), 12 deletions(-)
create mode 100644 newman-analytics/resources/crons/alert/alert.properties
create mode 100644 newman-analytics/resources/crons/cleanse/cleanse.properties
create mode 100644 newman-analytics/resources/crons/suitediff/body-template.st
create mode 100644 newman-analytics/resources/crons/suitediff/subject-template.st
create mode 100644 newman-analytics/resources/crons/suitediff/suitediff.properties
create mode 100644 newman-server/config/realm.properties
create mode 100644 newman-server/web/elm/favicon.ico
diff --git a/ansible/roles/submitter_deploy/files/submitter-env.ini b/ansible/roles/submitter_deploy/files/submitter-env.ini
index 6e2cc157..b3e253cb 100755
--- a/ansible/roles/submitter_deploy/files/submitter-env.ini
+++ b/ansible/roles/submitter_deploy/files/submitter-env.ini
@@ -39,4 +39,4 @@ JOB_CONFIG_DEFAULT = OPENJDK_17
AGENT_GROUPS_DEFAULT = AWSAgents,Spotinst Java Agents,DotNet,Bynet
#AGENT_GROUPS_DEFAULT = Spotinst Java Agents,DotNet,Bynet
DAILY_JOB_PRIORITY_DEFAULT = 0
-NIGHTLY_JOB_PRIORITY_DEFAULT = 3
\ No newline at end of file
+NIGHTLY_JOB_PRIORITY_DEFAULT = 3
diff --git a/docker/Dockerfile b/docker/Dockerfile
index 575ad5d8..67a0c4f0 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -2,11 +2,11 @@ FROM ubuntu
ARG user=newman
ARG group=newman
-ARG uid=1000
-ARG gid=1000
+ARG uid=1025
+ARG gid=1025
RUN apt-get update -y
-RUN apt-get install wget nano -y
+RUN apt-get install wget vim nano -y
# Jenkins is run with user `newman`, uid = 1000
@@ -16,8 +16,8 @@ RUN groupadd -g ${gid} ${group} \
&& useradd -d "/home/${user}" -u ${uid} -g ${gid} -m -s /bin/bash ${user}
# Install Java.
-RUN apt-get install openjdk-8-jdk -y
-ENV JAVA_HOME /usr/lib/jvm/java-8-openjdk-amd64/
+RUN apt-get install openjdk-17-jdk -y && apt-get clean
+ENV JAVA_HOME /usr/lib/jvm/java-17-openjdk-amd64/
# Install Maven
RUN wget --no-verbose -O /tmp/apache-maven-3.3.9.tar.gz \
@@ -63,10 +63,12 @@ RUN echo 'installing elm' && \
ENV PATH=/home/${user}/.npm-global/:$PATH
ENV globalDir="/home/${user}/.npm-global/"
-RUN cd ${globalDir} && wget --no-verbose -O "${globalDir}"/elm.tar.gz https://github.com/elm-lang/elm-platform/releases/download/0.18.0-exp/elm-platform-linux-64bit.tar.gz && \
- tar -zxvf "${globalDir}"/elm.tar.gz
+RUN echo ELM
+RUN cd ${globalDir} && \
+ wget --no-verbose -O "${globalDir}"/elm.tar.gz https://github.com/elm-lang/elm-platform/releases/download/0.18.0-exp/elm-platform-linux-64bit.tar.gz && \
+ tar -zxvf "${globalDir}"/elm.tar.gz
-#RUN npm install -g elm@0.18.0
+#RUN npm install -g elm@0.19.0
VOLUME /newman/
ENV PATH=$JAVA_HOME/bin:$PATH
diff --git a/docker/docker-build.sh b/docker/docker-build.sh
index 007e375a..042e8fde 100755
--- a/docker/docker-build.sh
+++ b/docker/docker-build.sh
@@ -1,6 +1,7 @@
#!/bin/bash
DIRNAME=`cd $(dirname ${BASH_SOURCE[0]}) && pwd`
-docker build --build-arg user=$USER --build-arg uid=$(id -u) --build-arg gid=$(id -g) -t newman ${DIRNAME}
+#docker build --build-arg user=$USER --build-arg uid=$(id -u) --build-arg gid=$(id -g) -t newman ${DIRNAME}
+docker build -t newman ${DIRNAME}
-docker pull mongo
\ No newline at end of file
+docker pull mongo
diff --git a/newman-analytics/bin/newman-crontab.file b/newman-analytics/bin/newman-crontab.file
index 26e94c20..1990e9ca 100755
--- a/newman-analytics/bin/newman-crontab.file
+++ b/newman-analytics/bin/newman-crontab.file
@@ -19,4 +19,4 @@
00 7,10,15 * * * cd /data/newman/newman/newman-analytics/bin && ./newman-analytics.sh ../resources/crons/alert/alert.properties > /data/newman/newman/newman-analytics/logs/alert.log 2>&1
00 7,10,15 * * * cd /data/newman/newman/newman-analytics/bin && ./diskspace.sh > /data/newman/newman/newman-analytics/logs/ds_alert.log 2>&1
-#@reboot . /etc/environment; cd /home/xap/newman-server; ./run.sh
+@reboot crontab /data/newman/newman/newman-analytics/bin/newman-crontab.file
diff --git a/newman-analytics/resources/crons/alert/alert.properties b/newman-analytics/resources/crons/alert/alert.properties
new file mode 100644
index 00000000..7b5a6d2c
--- /dev/null
+++ b/newman-analytics/resources/crons/alert/alert.properties
@@ -0,0 +1,8 @@
+cronjob-class = com.gigaspaces.newman.crons.alert.DiskSpaceAlertCronJob
+
+# mailman properties
+mail.account.username =
+mail.account.password =
+mail.message.recipients = rnd@gigaspaces.com
+
+crons.alert.capacityThreshold = 70
diff --git a/newman-analytics/resources/crons/cleanse/cleanse.properties b/newman-analytics/resources/crons/cleanse/cleanse.properties
new file mode 100644
index 00000000..4be25961
--- /dev/null
+++ b/newman-analytics/resources/crons/cleanse/cleanse.properties
@@ -0,0 +1,4 @@
+cronjob-class = com.gigaspaces.newman.crons.cleanse.CleanseCronJob
+
+crons.cleanse.numberOfDaysToNotDelete = 20
+
diff --git a/newman-analytics/resources/crons/suitediff/body-template.st b/newman-analytics/resources/crons/suitediff/body-template.st
new file mode 100644
index 00000000..2b08314a
--- /dev/null
+++ b/newman-analytics/resources/crons/suitediff/body-template.st
@@ -0,0 +1,65 @@
+
+
+ $if(hiss)$
+
+
Failing Tests that need your attention:
+ $hiss:{
+ * $it.suiteName$ -
$it.testName$
+ }$
+
+
Skipped Suites:
+ $suitesThatDidNotParticipate: {
+ $it$,
+ }$
+
+ Summary:
+ $if(summary.increasingDiff)$(+$summary.totalIncreasingDiff$ ↑)$endif$
+ $if(summary.decreasingDiff)$($summary.totalDecreasingDiff$ ↓)$endif$
+
$totalSuites$ suites,
+
$totalPassed$ passed, $totalFailed$ failed, $totalFailedx$ failedx3
+
+
+
+ | Suite |
+ Failures |
+ Total |
+
+ $diffs:{
+
+ | $it.suiteName$ |
+
+ $it.failedTests$
+ $if(it.increasingDiffFailedTests)$(+$it.diffFailedTests$ ↑)
+ $elseif(it.decreasingDiffFailedTests)$($it.diffFailedTests$ ↓)
+ $endif$
+ |
+
+ $it.totalTests$
+ $if(it.increasingDiffTotalTests)$(+$it.diffTotalTests$ ↑)
+ $elseif(it.decreasingDiffTotalTests)$($it.diffTotalTests$ ↓)
+ $endif$
+ |
+
+ }$
+
+