From 132063ba536e3453c367a7f7a4b23fcb01120ca6 Mon Sep 17 00:00:00 2001 From: Mesbah Date: Fri, 24 Aug 2018 14:22:10 -0400 Subject: [PATCH] Add Payara mp metrics tck to external test build Signed-off-by: Mesbah --- thirdparty_containers/payara-mp-tck/build.xml | 38 +++++++++ .../payara-mp-tck/dockerfile/Dockerfile | 78 +++++++++++++++++++ .../payara-mp-tck/dockerfile/payara-mp-tck.sh | 70 +++++++++++++++++ .../payara-mp-tck/playlist.xml | 36 +++++++++ 4 files changed, 222 insertions(+) create mode 100644 thirdparty_containers/payara-mp-tck/build.xml create mode 100644 thirdparty_containers/payara-mp-tck/dockerfile/Dockerfile create mode 100644 thirdparty_containers/payara-mp-tck/dockerfile/payara-mp-tck.sh create mode 100644 thirdparty_containers/payara-mp-tck/playlist.xml diff --git a/thirdparty_containers/payara-mp-tck/build.xml b/thirdparty_containers/payara-mp-tck/build.xml new file mode 100644 index 0000000000..524c3e1bb6 --- /dev/null +++ b/thirdparty_containers/payara-mp-tck/build.xml @@ -0,0 +1,38 @@ + + + + + Build payara-mp-tck Docker image + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/thirdparty_containers/payara-mp-tck/dockerfile/Dockerfile b/thirdparty_containers/payara-mp-tck/dockerfile/Dockerfile new file mode 100644 index 0000000000..9226d896f0 --- /dev/null +++ b/thirdparty_containers/payara-mp-tck/dockerfile/Dockerfile @@ -0,0 +1,78 @@ +# 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. + +# This Dockerfile in thirdparty_containers/payara-mp-tck/dockerfile dir is used to create an image with +# AdoptOpenJDK jdk binary installed. Basic test dependent executions +# are installed during the building process. +# +# Build example: `docker build -t adoptopenjdk-payara-mp-tck .` +# +# This Dockerfile builds image based on adoptopenjdk/openjdk8:latest. +# If you want to build image based on other images, please use +# `--build-arg list` to specify your base image +# +# Build example: `docker build --build-arg IMAGE_NAME= --build-arg IMAGE_VERSION= -t adoptopenjdk-payara-mp-tck .` + +ARG SDK=openjdk8 +ARG IMAGE_NAME=adoptopenjdk/$SDK +ARG IMAGE_VERSION=latest + +FROM $IMAGE_NAME:$IMAGE_VERSION + +# Install test dependent executable files +RUN apt-get update \ + && apt-get -y install \ + ant \ + apt-transport-https \ + ca-certificates \ + dirmngr \ + curl \ + git \ + make \ + unzip \ + vim \ + wget \ + python3-pip python3-dev \ + && cd /usr/local/bin \ + && ln -s /usr/bin/python3 python \ + && pip3 install --upgrade pip + +WORKDIR / +ENV PAYARA_HOME $WORKDIR + +# Install Maven +RUN mkdir -p /usr/share/maven \ + && cd /usr/share/maven \ + && wget --no-check-certificate --no-cookies https://archive.apache.org/dist/maven/maven-3/3.5.3/binaries/apache-maven-3.5.3-bin.zip \ + && unzip apache-maven-3.5.3-bin.zip \ + && rm -rf apache-maven-3.5.3-bin.zip \ + && ln -s /usr/share/maven/apache-maven-3.5.3/bin/mvn /usr/bin/mvn \ + && cd / + +VOLUME ["/java"] +ENV JAVA_HOME=/java \ + PATH=/java/bin:$PATH \ + JAVA_TOOL_OPTIONS="-Dfile.encoding=UTF8" + +COPY ./dockerfile/payara-mp-tck.sh /payara-mp-tck.sh + +#Download and unzip Payara full distribution +RUN curl -L -o /tmp/payara-5.182.zip https://search.maven.org/remotecontent?filepath=fish/payara/distributions/payara/5.182/payara-5.182.zip && \ + unzip /tmp/payara-5.182.zip -d / && \ + rm -f /tmp/payara-5.182.zip + +# Clone the Pyara MicroProfile-TCK-Runners +RUN pwd +RUN git clone https://github.com/payara/MicroProfile-TCK-Runners + +ENTRYPOINT ["/bin/bash", "/payara-mp-tck.sh"] +CMD ["--version"] diff --git a/thirdparty_containers/payara-mp-tck/dockerfile/payara-mp-tck.sh b/thirdparty_containers/payara-mp-tck/dockerfile/payara-mp-tck.sh new file mode 100644 index 0000000000..23f8fbf347 --- /dev/null +++ b/thirdparty_containers/payara-mp-tck/dockerfile/payara-mp-tck.sh @@ -0,0 +1,70 @@ +#/bin/bash +# 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. +# + +if [ -d /java/jre/bin ];then + echo "Using mounted Java8" + export JAVA_BIN=/java/jre/bin + export JAVA_HOME=/java + export PATH=$JAVA_BIN:$PATH + java -version +elif [ -d /java/bin ]; then + echo "Using mounted Java9" + export JAVA_BIN=/java/bin + export JAVA_HOME=/java + export PATH=$JAVA_BIN:$PATH + java -version +else + echo "Using docker image default Java" + java_path=$(type -p java) + suffix="/java" + java_root=${java_path%$suffix} + export JAVA_BIN="$java_root" + echo "JAVA_BIN is: $JAVA_BIN" + $JAVA_BIN/java -version +fi + +TEST_SUITE=$1 + +echo "PATH is : $PATH" +echo "JAVA_HOME is : $JAVA_HOME" +echo "ANT_HOME is: $ANT_HOME" +echo "type -p java is :" +type -p java +echo "java -version is: \n" +java -version +cd ${PAYARA_HOME}/ +ls . +pwd + +#Start Payara server +${PAYARA_HOME}/payara5/bin/asadmin start-domain + +#Start MicroProfile-Metrics TCK +cd ${PAYARA_HOME}/MicroProfile-TCK-Runners/MicroProfile-Metrics/tck-runner +mvn -Ppayara-server-remote test + +#Start MicroProfile-Fault-Tolerance TCK +cd ${PAYARA_HOME}/MicroProfile-TCK-Runners/MicroProfile-Fault-Tolerance/tck-runner +mvn -Ppayara-server-remote test + +#Start MicroProfile-Config TCK +cd ${PAYARA_HOME}/MicroProfile-TCK-Runners/MicroProfile-Config/tck-runner +mvn -Ppayara-server-remote test + +#Start MicroProfile-OpenAPI TCK +cd ${PAYARA_HOME}/MicroProfile-TCK-Runners/MicroProfile-OpenAPI/tck-runner +mvn -Ppayara-server-remote test + +#Stop Payara server +${PAYARA_HOME}/payara5/bin/asadmin stop-domain \ No newline at end of file diff --git a/thirdparty_containers/payara-mp-tck/playlist.xml b/thirdparty_containers/payara-mp-tck/playlist.xml new file mode 100644 index 0000000000..88bec3509c --- /dev/null +++ b/thirdparty_containers/payara-mp-tck/playlist.xml @@ -0,0 +1,36 @@ + + + + + payara_microprofile_tck + docker run -v $(JDK_HOME):/java --name payara-mp-tck adoptopenjdk-payara-mp-tck:latest; \ + docker cp payara-mp-tck:/MicroProfile-TCK-Runners/MicroProfile-Metrics/tck-runner/target/surefire-reports $(REPORTDIR)/external_test_reports; \ + docker cp payara-mp-tck:/MicroProfile-TCK-Runners/MicroProfile-Fault-Tolerance/tck-runner/target/surefire-reports/junitreports $(REPORTDIR)/external_test_reports; \ + docker cp payara-mp-tck:/MicroProfile-TCK-Runners/MicroProfile-Config/tck-runner/target/surefire-reports/junitreports $(REPORTDIR)/external_test_reports; \ + docker cp payara-mp-tck:/MicroProfile-TCK-Runners/MicroProfile-OpenAPI/tck-runner/target/surefire-reports/junitreports $(REPORTDIR)/external_test_reports; \ + docker rm payara-mp-tck; \ + $(TEST_STATUS) + + SE80 + SE90 + + + extended + + + external + + +