Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Enable Apache Tomee MicroProfile TCKs #1118

Merged
merged 1 commit into from
May 7, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
37 changes: 37 additions & 0 deletions thirdparty_containers/tomee/build.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,37 @@
<?xml version="1.0"?>
<project name="Tomee-Test" default="build" basedir=".">
<taskdef resource="net/sf/antcontrib/antlib.xml" />
<description>
Build Tomee test Docker image
</description>

<!-- set properties for this build -->
<property name="DEST" value="${BUILD_ROOT}/thirdparty_containers/tomee-test" />
<property name="src" location="." />

<target name="init">
<mkdir dir="${DEST}"/>
</target>

<target name="clean_image" depends="init" description="clean jenkins test docker image if there is one">
<exec executable="docker">
<arg line="rmi -f adoptopenjdk-tomee-test" />
</exec>
</target>

<target name="build_image" depends="clean_image" description="build TomEE test docker image">
<exec executable="docker" failonerror="true">
<arg line="build -t adoptopenjdk-tomee-test -f dockerfile/Dockerfile --pull . --build-arg SDK=${JVM_VERSION}" />
</exec>
</target>

<target name="dist" depends="build_image" description="generate the distribution">
<copy todir="${DEST}">
<fileset dir="${src}" includes="*.xml, *.mk"/>
</copy>
</target>

<target name="build" >
<antcall target="dist" inheritall="true" />
</target>
</project>
57 changes: 57 additions & 0 deletions thirdparty_containers/tomee/dockerfile/Dockerfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,57 @@
# 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
#
# https://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 thirdpart_containers/jenkins/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-jenkins-test -f Dockerfile ../.`
#
# 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=<image_name> --build-arg IMAGE_VERSION=<image_version >-t adoptopenjdk-jenkins-test .`

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 \
curl \
git \
unzip \
vim \
wget

# Install TomEE tests dependent
RUN apt-get update \
&& apt-get -y install \
maven

ENV JAVA_TOOL_OPTIONS="-Dfile.encoding=UTF8"

# This is the main script to run jenkins tests
COPY ./dockerfile/tomee-test.sh /tomee-test.sh

# Clone TomEE src to /tomee
WORKDIR /
RUN mkdir testResults
RUN git clone https://github.com/apache/tomee.git

ENTRYPOINT ["/bin/bash", "/tomee-test.sh"]
CMD [""]
50 changes: 50 additions & 0 deletions thirdparty_containers/tomee/dockerfile/tomee-test.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,50 @@
#/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
#
# https://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
elif [ -d /java/bin ]; then
echo "Using mounted Java"
export JAVA_BIN=/java/bin
export JAVA_HOME=/java
export PATH=$JAVA_BIN:$PATH
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"
export JAVA_HOME="${java_root%/bin}"
fi

java -version
#begin tomee test

cd /tomee

#set -e
echo "Build TomEE without running test"
mvn -Pquick -Dsurefire.useFile=false -DdisableXmlReport=true -DuniqueVersion=false -ff -Dassemble -DskipTests -DfailIfNoTests=false clean install
echo "Build TomEE completed"

echo "Run Microprofile TCK"
cd tck/microprofile-tck
mvn test -Denforcer.fail=false
set +e
echo "Tomee Microprofile TCK completed"
find ./ -type d -name 'surefire-reports' -exec cp -r "{}" /testResults \;
34 changes: 34 additions & 0 deletions thirdparty_containers/tomee/playlist.xml