Move example_functional test to sanity level (adoptium#5194)

- Reenable `example_functional` test to run in docker for all linux except ppc64le_linux - Reduced packages list in `test.properties` based on other external tests - Disabled `example_functional` test on ppc64le_linux - Removed criu_version from `test.properties` related: adoptium#5132 Signed-off-by: Anna Babu Palathingal <[email protected]>
annaibm · Apr 3, 2024 · 3267733 · 3267733
1 parent 7bde8e7
commit 3267733
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 5 deletions.
diff --git a/external/functional-test/build.xml b/external/functional-test/build.xml
@@ -24,4 +24,4 @@
 	<target name="build">
 		<antcall target="dist" inheritall="true" />
 	</target>
-</project>
+</project>
diff --git a/external/functional-test/playlist.xml b/external/functional-test/playlist.xml
@@ -41,12 +41,18 @@
 	</test>
 	<test>
 		<testCaseName>example_functional</testCaseName>
+		<disables>
+			<disable>
+				<comment>https://github.com/adoptium/aqa-tests/issues/5132</comment>
+				<platform>ppc64le_linux</platform>
+			</disable>
+		</disables>
 		<command> $(TEST_ROOT)$(D)external$(D)external.sh --run --tag "${DOCKERIMAGE_TAG}" --version ${JDK_VERSION} --impl ${JDK_IMPL} --dir functional-test --testtarget _testExample --reportdst $(REPORTDIR) --docker_args "$(EXTRA_DOCKER_ARGS)"; \
 		$(TEST_STATUS); \
 		$(TEST_ROOT)$(D)external$(D)external.sh --clean --tag "${DOCKERIMAGE_TAG}" --version ${JDK_VERSION} --impl ${JDK_IMPL} --dir functional-test
 		</command>
 		<levels>
-			<level>special</level>
+			<level>sanity</level>
 		</levels>
 		<groups>
 			<group>external</group>

diff --git a/external/functional-test/test.properties b/external/functional-test/test.properties
@@ -1,6 +1,5 @@
 github_url="https://github.com/adoptium/aqa-tests.git"
 test_results="testResults"
 gradle_version="5.1"
-environment_variable="MODE=java CC=gcc CXX=g++"
-ubuntu_packages="ant ant-contrib autoconf build-essential ca-certificates cmake cpio curl file gcc g++ gdb git libasound2-dev libcups2-dev libdwarf-dev libelf-dev libexpat1-dev libffi-dev libfontconfig libfontconfig1-dev libfreetype6-dev libnuma-dev libssl-dev libx11-dev libxext-dev libxrandr-dev libxrender-dev libxt-dev libxtst-dev make nasm openssh-client openssh-server perl pkg-config ssh systemtap-sdt-dev unzip wget xvfb zip zlib1g-dev asciidoc iproute2 libaio-dev libbsd-dev libcap-dev libnet1-dev libnftables-dev libnl-3-dev libprotobuf-dev libprotobuf-c-dev nftables protobuf-c-compiler protobuf-compiler python3-protobuf python3-distutils python3-future xmlto"
-criu_version="latest"
+environment_variable="MODE=java CC=gcc-7 CXX=g++-7"
+ubuntu_packages="ant-contrib build-essential git asciidoc"