From 1606cbbf5c0117d890bf0571888549aa2b58c40f Mon Sep 17 00:00:00 2001
From: "Edward M. Kagan" <pagan@tabor.one>
Date: Wed, 3 Nov 2021 18:50:34 +0300
Subject: [PATCH] Preload script and mire verbose testing on wrk

---
 scripts/preload-docker-images.sh | 25 +++++++++++++++++++++++++
 scripts/test-all.sh              | 12 +++++-------
 scripts/wrk-test.sh              | 12 ++++++------
 3 files changed, 36 insertions(+), 13 deletions(-)
 create mode 100755 scripts/preload-docker-images.sh

diff --git a/scripts/preload-docker-images.sh b/scripts/preload-docker-images.sh
new file mode 100755
index 0000000..96a2728
--- /dev/null
+++ b/scripts/preload-docker-images.sh
@@ -0,0 +1,25 @@
+./collect-jars.sh
+
+preload_image () {
+  xterm -e "docker run --rm -it $1:$2 java --version" &
+}
+modules=( 'quarkus-resteasy-jackson' 'quarkus-resteasy-jsonb' 'jersey-grizzly2' 'jersey-jdk-http' 'jersey-simple-http' 'jersey-jetty' 'jersey-netty' 'jersey-netty' 'jersey-netty' 'jersey-netty' 'rawnetty' 'jooby-netty' 'jooby-jetty' 'jooby-undertow' 'resteasy-jdk-http' 'resteasy-netty' 'resteasy-reactor-netty' 'resteasy-vertx' 'resteasy-undertow' 'cxf-jetty' 'cxf-netty' 'cxf-undertow' )
+versions=( '11' '17' )
+for version in "${versions[@]}"
+do
+  jkds=( 'amazoncorretto' 'azul/zulu-openjdk' 'azul/zulu-openjdk-alpine' 'eclipse-temurin' 'openjdk' )
+  for jdk in "${jkds[@]}"
+  do
+    preload_image $jdk $version
+  done
+done
+
+versions=( '11-alpine' '17-alpine' )
+for version in "${versions[@]}"
+do
+  jkds=( 'amazoncorretto' 'eclipse-temurin' 'openjdk' )
+  for jdk in "${jkds[@]}"
+  do
+    preload_image $jdk $version
+  done
+done
diff --git a/scripts/test-all.sh b/scripts/test-all.sh
index 7ee66fb..29a7b73 100755
--- a/scripts/test-all.sh
+++ b/scripts/test-all.sh
@@ -2,17 +2,15 @@
 
 test () {
   parentdir="$(dirname "$(pwd)")"
-  
   xterm -e "docker run --rm -it -p 8080:8080 -w /root -v $parentdir/docker/jars/$1:/root $2:$3 java -jar app.jar" &
   TEST_DOCKER_PID=$!
   sleep 1
-  ./wrk-test.sh $1 $2 $3 12 100 15
+  ./wrk-test.sh $1 $2 $3 12 100 1
   sleep 1
   kill $TEST_DOCKER_PID
-  sleep 1
 }
 modules=( 'quarkus-resteasy-jackson' 'quarkus-resteasy-jsonb' 'jersey-grizzly2' 'jersey-jdk-http' 'jersey-simple-http' 'jersey-jetty' 'jersey-netty' 'jersey-netty' 'jersey-netty' 'jersey-netty' 'rawnetty' 'jooby-netty' 'jooby-jetty' 'jooby-undertow' 'resteasy-jdk-http' 'resteasy-netty' 'resteasy-reactor-netty' 'resteasy-vertx' 'resteasy-undertow' 'cxf-jetty' 'cxf-netty' 'cxf-undertow' )
-versions=( '8' '11' '17' )
+versions=( '11' '17' )
 for version in "${versions[@]}"
 do
   jkds=( 'amazoncorretto' 'azul/zulu-openjdk' 'azul/zulu-openjdk-alpine' 'eclipse-temurin' 'openjdk' )
@@ -20,12 +18,12 @@ do
   do
     for module in "${modules[@]}"
     do
-      test $version $jdk $module
+      test $module $jdk $version
     done
   done
 done
 
-versions=( '8-alpine' '11-alpine' '17-alpine' )
+versions=( '11-alpine' '17-alpine' )
 for version in "${versions[@]}"
 do
   jkds=( 'amazoncorretto' 'eclipse-temurin' 'openjdk' )
@@ -33,7 +31,7 @@ do
   do
     for module in "${modules[@]}"
     do
-      test $version $jdk $module
+      test $module $jdk $version
     done
   done
 done
diff --git a/scripts/wrk-test.sh b/scripts/wrk-test.sh
index 40960b6..62fe370 100755
--- a/scripts/wrk-test.sh
+++ b/scripts/wrk-test.sh
@@ -1,9 +1,9 @@
-# echo "Module: $1";
-# echo "JDK image: $2";
-# echo "JDK version: $3";
-# echo "Threads: $4";
-# echo "Connections: $5";
-# echo "Duration: $6";
+echo "Module: $1";
+echo "JDK image: $2";
+echo "JDK version: $3";
+echo "Threads: $4";
+echo "Connections: $5";
+echo "Duration: $6";
 
 jdk_suffix=$2
 jdkim="$(echo $jdk_suffix | sed -e 's/\//@/g')"