Add tomcat8 smoketest

settings.gradle

@@ -35,6 +35,7 @@ include 'test:webapps:bookstore-spring'
 include ':test:smoke'
 include ':test:smoke:appServers'
 include ':test:smoke:appServers:Tomcat.7'
+include ':test:smoke:appServers:Tomcat.8'
 include ':test:smoke:testApps'
 
 include ':test:smoke:framework:testCore'

test/smoke/appServers/Tomcat.8/build.gradle

@@ -0,0 +1,4 @@
+
+ext {
+	appServerShortName = 'tomcat8'
+}

test/smoke/appServers/Tomcat.8/resources/linux/deploy.sh

@@ -0,0 +1,21 @@
+#!/bin/bash
+
+if [ -z "$CATALINA_HOME" ]; then
+	echo "\$CATALINA_HOME not set" >&2
+	exit 1
+fi
+
+if [ -z "$1" ]; then
+	echo "Nothing given to deploy"
+	exit 0
+fi
+
+if [ ! -e $1 ]; then
+	echo "File '$1' does not exist" >&2
+	exit 2
+fi
+
+WARFILE=`readlink -f $1`
+BASEPATH=`basename $WARFILE .war`
+
+cp $WARFILE $CATALINA_HOME/webapps

test/smoke/appServers/Tomcat.8/resources/linux/startServer.sh

@@ -0,0 +1,8 @@
+#!/bin/sh
+
+if [ -z "$CATALINA_HOME" ]; then
+	echo "\$CATALINA_HOME not set" >&2
+	exit 1
+fi
+
+$CATALINA_HOME/bin/catalina.sh run

test/smoke/appServers/Tomcat.8/resources/linux/stopServer.sh

@@ -0,0 +1,8 @@
+#!/bin/sh
+
+if [ -z "$CATALINA_HOME" ]; then
+	echo "\$CATALINA_HOME not set" >&2
+	exit 1
+fi
+
+$CATALINA_HOME/bin/shutdown.sh

test/smoke/appServers/Tomcat.8/resources/linux/tailLastLog.sh

@@ -0,0 +1,24 @@
+#!/bin/sh
+
+if [ -z "$CATALINA_HOME" ]; then
+	echo "\$CATALINA_HOME not set" >&2
+	exit 1
+fi
+
+TODAYS_DATE=`date +%Y-%m-%d`
+LOG_FILE=$CATALINA_HOME/logs/catalina.$TODAYS_DATE.log
+
+if [ ! -z "$1" ]; then
+	LOG_FILE=$1
+fi
+
+NUM_LINES=50
+if [ ! -z "$2" ]; then
+	NUM_LINES=$2
+fi
+
+if ! tail -v -n$NUM_LINES $LOG_FILE; then
+	echo "USAGE: tailLastLog.sh [logfile] [numlines]"
+	echo "	logfile		- absolute path to logfile to tail (default="
+	echo "	numlines	- number of lines to taile (default=50)"
+fi

test/smoke/appServers/Tomcat.8/resources/linux/undeploy.sh

@@ -0,0 +1,18 @@
+#!/bin/bash
+
+if [ -z "$CATALINA_HOME" ]; then
+	echo "\$CATALINA_HOME not set" >&2
+	exit 1
+fi
+
+if [ -z "$1" ]; then
+	echo "Nothing given to undeploy"
+	exit 0
+fi
+
+if [ ! -e $CATALINA_HOME/webapps/$1 ]; then
+	echo "WAR File '$1' does not exist" >&2
+	exit 2
+fi
+
+rm $CATALINA_HOME/webapps/$1

test/smoke/appServers/Tomcat.8/tomcat8.linux.partial.dockerfile

@@ -0,0 +1,35 @@
+FROM @JRE@
+
+USER root
+WORKDIR /root/docker-compile
+
+# TODO add label?
+
+RUN mkdir /root/docker-stage
+
+# update packages and install dependencies: wget
+RUN apt-get update \
+	&& apt-get install -y wget
+
+RUN apt-get install -y procps
+
+
+ENV TOMCAT_MAJOR_VERSION 8
+ENV TOMCAT_FULL_VERSION 8.0.50
+
+# install tomcat (FXIME gpg?)
+RUN wget https://archive.apache.org/dist/tomcat/tomcat-$TOMCAT_MAJOR_VERSION/v$TOMCAT_FULL_VERSION/bin/apache-tomcat-$TOMCAT_FULL_VERSION.tar.gz \
+	&& wget https://archive.apache.org/dist/tomcat/tomcat-$TOMCAT_MAJOR_VERSION/v$TOMCAT_FULL_VERSION/bin/apache-tomcat-$TOMCAT_FULL_VERSION.tar.gz.sha1 \
+	&& sha1sum --check apache-tomcat-$TOMCAT_FULL_VERSION.tar.gz.sha1 \
+	&& tar xzvf apache-tomcat-$TOMCAT_FULL_VERSION.tar.gz \
+	&& mv ./apache-tomcat-$TOMCAT_FULL_VERSION /opt/apache-tomcat-$TOMCAT_FULL_VERSION
+
+ENV CATALINA_HOME /opt/apache-tomcat-$TOMCAT_FULL_VERSION
+ENV CATALINA_BASE /opt/apache-tomcat-$TOMCAT_FULL_VERSION
+
+ADD ./*.sh /root/docker-stage/
+
+EXPOSE 8080
+
+WORKDIR /root/docker-stage
+CMD ./startServer.sh

test/smoke/appServers/jre.master.txt

@@ -1,6 +1,4 @@
 openjdk:7-jre
 openjdk:8-jre
-openjdk:9-jre
 azul/zulu-openjdk:7
-azul/zulu-openjdk:8
-azul/zulu-openjdk:9
+azul/zulu-openjdk:8

test/smoke/framework/testCore/src/main/java/com/microsoft/applicationinsights/smoketest/AiSmokeTest.java

@@ -50,6 +50,7 @@ public abstract class AiSmokeTest {
 	@Parameters(name = "{index}: {0}, {1}, {2}")
 	public static Collection<Object[]> parameterGenerator() throws MalformedURLException, IOException {
 		List<String> appServers = Resources.readLines(Resources.getResource("appServers.txt"), Charsets.UTF_8);
+		System.out.println("Target appservers="+Arrays.toString(appServers.toArray()));
 		String os = System.getProperty("applicationinsights.smoketest.os", "linux");
 		Multimap<String, String> appServers2jres = HashMultimap.create();
 		for (String appServer : appServers) {

test/smoke/testApps/CoreAndFilter/src/smokeTest/resources/appServers.txt

@@ -1 +1,2 @@
+tomcat8
 tomcat7