diff --git a/external/payara-mp-tck/README.md b/external/payara-mp-tck/README.md new file mode 100644 index 0000000000..f7ab902469 --- /dev/null +++ b/external/payara-mp-tck/README.md @@ -0,0 +1,36 @@ + +# External Payara-mp-tck Tests + +Payara-mp-tck(payara MicroProfile-tck) tests are part of the third-party application tests that helps verify that the Adoptium binaries are good by running a variety of Java applications inside of Docker containers. AdoptOpenJDK/openjdk-tests/Issue #172 lists the applications that we have initially targeted to best exercise the Adoptium binaries. For each application, we choose to run a selection of their functional tests.payara-mp-tck tests are functional tests pulled from the [payara/MicroProfile-TCK-Runners](https://github.com/payara/MicroProfile-TCK-Runners.git) repository. + +## Running External Payara-mp-tck tests locally +To run any AQA tests locally, you follow the same pattern: + +0. Ensure your test machine is set up with [test prereqs](https://github.com/AdoptOpenJDK/openjdk-tests/blob/master/doc/Prerequisites.md). For external tests, you do need Docker installed. + +1. Download/unpack the SDK that you want to test to your test machine. +2. `export TEST_JDK_HOME=` +3. `git clone https://github.com/AdoptOpenJDK/openjdk-tests.git` +4. `cd openjdk-tests` +5. `./get.sh` +6. `cd TKG` +7. Export required environment variables, BUILD_LIST and EXTRA_DOCKER_ARGS (example: `export BUILD_LIST=external/payara-mp-tck` and `export EXTRA_DOCKER_ARGS="-v $TEST_JDK_HOME:/opt/java/openjdk"` +8. `make compile` (This fetches test material and compiles it, based on build.xml files in the test directories). +9. `make _payara-mp-tck_test` (When you defined BUILD_LIST to point to a directory in [openjdk-tests/external](https://github.com/AdoptOpenJDK/openjdk-tests/tree/master/external), then this is a testCaseName from the playlist.xml file within the directory you chose). + +When [running these from the command-line](https://github.com/AdoptOpenJDK/openjdk-tests/blob/master/doc/userGuide.md#local-testing-via-make-targets-on-the-commandline), these tests are grouped under a make target called 'external', so 'make external' would run the entire set of tests found in the openjdk-tests/external directory. This is unadvisable! Limit what you compile and run, BUILD_LIST=external/``, and TARGET=`` + +These tests run regularly and results can be found in [TRSS Third Party Application view](https://trss.adoptopenjdk.net/ThirdPartyAppView). + diff --git a/external/payara-mp-tck/dockerfile/Dockerfile b/external/payara-mp-tck/dockerfile/Dockerfile deleted file mode 100644 index 593e06d3ec..0000000000 --- a/external/payara-mp-tck/dockerfile/Dockerfile +++ /dev/null @@ -1,58 +0,0 @@ -# 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 external/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 -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= --build-arg IMAGE_VERSION= -t adoptopenjdk-payara-mp-tck .` - -ARG SDK=openjdk8 -ARG IMAGE_NAME=adoptopenjdk/$SDK -ARG IMAGE_VERSION=nightly - -FROM $IMAGE_NAME:$IMAGE_VERSION - -ARG PAYARA_TAG=2.0 - -# Install test dependent executable files -RUN apt-get update; \ - apt-get install -y --no-install-recommends \ - git \ - maven \ - ; \ - rm -rf /var/lib/apt/lists/* - -ENV JAVA_TOOL_OPTIONS="-Dfile.encoding=UTF8" - -COPY ./dockerfile/payara-mp-tck.sh /payara-mp-tck.sh - -ENV PAYARA_HOME $WORKDIR -RUN mkdir testResults - -# Clone the Pyara MicroProfile-TCK-Runners -ENV PAYARA_TAG=$PAYARA_TAG -RUN git clone https://github.com/payara/MicroProfile-TCK-Runners.git -WORKDIR /MicroProfile-TCK-Runners/ -RUN git checkout ${PAYARA_TAG} -WORKDIR / - -ENTRYPOINT ["/bin/bash", "/payara-mp-tck.sh"] - -# Used to pass in a default value for TEST_OPTIONS -#CMD [""] \ No newline at end of file diff --git a/external/payara-mp-tck/test.properties b/external/payara-mp-tck/test.properties new file mode 100644 index 0000000000..dbb5be7b5f --- /dev/null +++ b/external/payara-mp-tck/test.properties @@ -0,0 +1,15 @@ + + github_url="https://github.com/payara/MicroProfile-TCK-Runners.git" + script="payara-mp-tck.sh" + home_path="\${WORKDIR}" + test_results="testResults" + tag_version="2.0" + debian_packages="git maven" + debianslim_packages="${debian_packages}" + ubuntu_packages="${debian_packages}" + alpine_packages="bash git maven" + centos_packages="git maven" + clefos_packages="${centos_packages}" + ubi_packages="git maven" + ubi_minimal_packages="${ubi_packages}" +