Skip to content

Commit d6e82cf

Browse files
authored
Optimize container tests workflow to get Ant binaries (#4870)
- Solve ant download limit from apache website problem - For ubuntu image ant install, use apt install ant-optional directly - for ubi criu test, the pre-built image will contain criu and ant(-contrib) Signed-off-by: LongyuZhang <[email protected]>
1 parent e79502d commit d6e82cf

File tree

5 files changed

+4
-13
lines changed

5 files changed

+4
-13
lines changed

external/criu-ubi-portable-checkpoint/test.properties

-2
Original file line numberDiff line numberDiff line change
@@ -3,5 +3,3 @@ test_results="testResults"
33
gradle_version="5.1"
44
environment_variable="MODE=java"
55
ubi_packages="git wget perl"
6-
ant_version="1.10.14"
7-
ant_contrib_version="1.0b3"

external/derby/test.properties

+1-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
github_url="https://github.com/apache/derby.git"
22
localPropertyFile="local.properties"
33
tag_version="trunk"
4-
ant_version="1.10.6"
5-
ubuntu_packages="git wget tar"
4+
ubuntu_packages="ant-optional git wget tar"

external/lucene-solr/test.properties

+1-3
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
11
github_url="https://github.com/apache/lucene-solr.git"
22
tag_version="releases/lucene-solr/8.11.1"
3-
ant_version="1.10.6"
4-
ivy_version="2.5.0"
5-
ubuntu_packages="git wget tar"
3+
ubuntu_packages="ant-optional ivy git wget tar"
+1-3
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,4 @@
11
github_url="https://github.com/OpenLiberty/open-liberty.git"
22
test_results="testResults"
33
tag_version="gm-23.0.0.5"
4-
ant_version="1.10.6"
5-
ubuntu_packages="git wget tar"
6-
maven_version="3.8.5"
4+
ubuntu_packages="ant-optional maven git wget tar"

external/tomcat/test.properties

+1-3
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
11
github_url="https://github.com/apache/tomcat.git"
22
tag_version="10.0.7"
3-
ant_version="1.10.6"
4-
openssl_version="1.1.1d"
5-
ubuntu_packages="git wget tar make gcc linux-libc-dev libc6-dev perl build-essential automake autoconf libssl-dev subversion libtool-bin"
3+
ubuntu_packages="ant-optional openssl git wget tar make gcc linux-libc-dev libc6-dev perl build-essential automake autoconf libssl-dev subversion libtool-bin"

0 commit comments

Comments
 (0)