Skip to content

Commit 5bbd5d8

Browse files
bnusunnybnusunny
authored
chore(test): update integration tests (#8414)
1 parent bb39e15 commit 5bbd5d8

41 files changed

Lines changed: 2033 additions & 73 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎appveyor-ubuntu.yml‎

Lines changed: 15 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -44,11 +44,11 @@ install:
4444
# AppVeyor's apt-get cache might be outdated, and the package could potentially be 404.
4545
- sh: "sudo apt-get update --allow-releaseinfo-change"
4646

47-
# install coretto 21
47+
# install coretto 25
4848
- sh: wget -O - https://apt.corretto.aws/corretto.key | sudo gpg --dearmor -o /usr/share/keyrings/corretto-keyring.gpg
4949
- sh: echo "deb [signed-by=/usr/share/keyrings/corretto-keyring.gpg] https://apt.corretto.aws stable main" | sudo tee /etc/apt/sources.list.d/corretto.list
50-
- sh: sudo apt-get update; sudo apt-get install -y java-21-amazon-corretto-jdk
51-
- sh: JAVA_HOME=/usr/lib/jvm/java-21-amazon-corretto
50+
- sh: sudo apt-get update; sudo apt-get install -y java-25-amazon-corretto-jdk
51+
- sh: JAVA_HOME=/usr/lib/jvm/java-25-amazon-corretto
5252
- sh: PATH=$JAVA_HOME/bin:$PATH
5353
- sh: java --version
5454
- sh: javac --version
@@ -237,11 +237,11 @@ install:
237237
- sh: "npm install npm@10.2.3 -g"
238238
- sh: "npm -v"
239239

240-
# Install latest gradle
240+
# Install latest gradle comptabile with Java 25
241241
- sh: "sudo apt-get -y remove gradle"
242-
- sh: "wget https://services.gradle.org/distributions/gradle-9.0.0-bin.zip -P /tmp"
242+
- sh: "wget https://services.gradle.org/distributions/gradle-9.2.0-bin.zip -P /tmp"
243243
- sh: "sudo unzip -d /opt/gradle /tmp/gradle-*.zip"
244-
- sh: "PATH=/opt/gradle/gradle-9.0.0/bin:$PATH"
244+
- sh: "PATH=/opt/gradle/gradle-9.2.0/bin:$PATH"
245245
- sh: "gradle --version"
246246

247247
# Install dotnet8 SDK
@@ -253,6 +253,15 @@ install:
253253
- sh: "./aws_cli/bin/python -m pip install awscli"
254254
- sh: "PATH=$(echo $PWD'/aws_cli/bin'):$PATH"
255255

256+
# install python 3.14
257+
- sh: |
258+
DEST="$HOME/venv3.14"
259+
URL="https://github.com/astral-sh/python-build-standalone/releases/download/20251031/cpython-3.14.0+20251031-x86_64-unknown-linux-gnu-install_only.tar.gz"
260+
curl -L "$URL" | tar -xz
261+
mv python $DEST
262+
$HOME/venv3.14/bin/python --version
263+
$HOME/venv3.14/bin/pip --version
264+
256265
- sh: "PATH=$PATH:$HOME/venv3.7/bin:$HOME/venv3.8/bin:$HOME/venv3.9/bin:$HOME/venv3.10/bin:$HOME/venv3.11/bin:$HOME/venv3.12/bin:$HOME/venv3.13/bin:$HOME/venv3.14/bin"
257266

258267
# update ca-certificates which causes failures with newest golang library

‎tests/integration/buildcmd/build_integ_base.py‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -634,6 +634,7 @@ class BuildIntegJavaBase(BuildIntegBase):
634634
FUNCTION_LOGICAL_ID = "Function"
635635
USING_GRADLE_PATH = os.path.join("Java", "gradle")
636636
USING_GRADLEW_PATH = os.path.join("Java", "gradlew")
637+
USING_GRADLEW_IN_CONTAINER_PATH = os.path.join("Java", "gradlew-in-container")
637638
USING_GRADLE_KOTLIN_PATH = os.path.join("Java", "gradle-kotlin")
638639
USING_MAVEN_PATH = os.path.join("Java", "maven")
639640

‎tests/integration/buildcmd/test_build_cmd.py‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -998,7 +998,7 @@ class TestBuildWithDedupBuilds(DedupBuildIntegBase):
998998
# container
999999
(
10001000
"use_container",
1001-
"Java/gradlew/8",
1001+
"Java/gradlew-in-container/8",
10021002
"aws.example.Hello::myHandler",
10031003
"aws.example.SecondFunction::myHandler",
10041004
"java8.al2",
@@ -1130,7 +1130,7 @@ class TestBuildWithCacheBuilds(CachedBuildIntegBase):
11301130
# container
11311131
(
11321132
"use_container",
1133-
"Java/gradlew/8",
1133+
"Java/gradlew-in-container/8",
11341134
"aws.example.Hello::myHandler",
11351135
"aws.example.SecondFunction::myHandler",
11361136
"java8.al2",
@@ -1322,7 +1322,7 @@ class TestParallelBuilds(DedupBuildIntegBase):
13221322
# container
13231323
(
13241324
"use_container",
1325-
"Java/gradlew/8",
1325+
"Java/gradlew-in-container/8",
13261326
"aws.example.Hello::myHandler",
13271327
"aws.example.SecondFunction::myHandler",
13281328
"java8.al2",

‎tests/integration/buildcmd/test_build_cmd_arm64.py‎

Lines changed: 32 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,8 @@ def test_with_default_requirements_invoke_in_container(self, runtime, codeuri, u
5858
[
5959
("python3.12", "Python", "use_container"),
6060
("python3.13", "Python", "use_container"),
61-
("python3.14", "Python", "use_container"),
61+
# skip this test until python 3.14 build image is released
62+
# ("python3.14", "Python", "use_container"),
6263
],
6364
name_func=show_container_in_test_name,
6465
)
@@ -292,7 +293,7 @@ def test_building_java_in_container_with_arm64_architecture(
292293
(
293294
"java21",
294295
"21",
295-
BuildIntegJavaBase.USING_GRADLEW_PATH,
296+
BuildIntegJavaBase.USING_GRADLEW_IN_CONTAINER_PATH,
296297
BuildIntegJavaBase.EXPECTED_FILES_PROJECT_MANIFEST_GRADLE,
297298
BuildIntegJavaBase.EXPECTED_GRADLE_DEPENDENCIES,
298299
),
@@ -310,34 +311,35 @@ def test_building_java_in_container_with_arm64_architecture(
310311
BuildIntegJavaBase.EXPECTED_FILES_PROJECT_MANIFEST_MAVEN,
311312
BuildIntegJavaBase.EXPECTED_MAVEN_DEPENDENCIES,
312313
),
313-
(
314-
"java25",
315-
"25",
316-
BuildIntegJavaBase.USING_GRADLE_PATH,
317-
BuildIntegJavaBase.EXPECTED_FILES_PROJECT_MANIFEST_GRADLE,
318-
BuildIntegJavaBase.EXPECTED_GRADLE_DEPENDENCIES,
319-
),
320-
(
321-
"java25",
322-
"25",
323-
BuildIntegJavaBase.USING_GRADLEW_PATH,
324-
BuildIntegJavaBase.EXPECTED_FILES_PROJECT_MANIFEST_GRADLE,
325-
BuildIntegJavaBase.EXPECTED_GRADLE_DEPENDENCIES,
326-
),
327-
(
328-
"java25",
329-
"25",
330-
BuildIntegJavaBase.USING_GRADLE_KOTLIN_PATH,
331-
BuildIntegJavaBase.EXPECTED_FILES_PROJECT_MANIFEST_GRADLE,
332-
BuildIntegJavaBase.EXPECTED_GRADLE_DEPENDENCIES,
333-
),
334-
(
335-
"java25",
336-
"25",
337-
BuildIntegJavaBase.USING_MAVEN_PATH,
338-
BuildIntegJavaBase.EXPECTED_FILES_PROJECT_MANIFEST_MAVEN,
339-
BuildIntegJavaBase.EXPECTED_MAVEN_DEPENDENCIES,
340-
),
314+
# skip these tests until java25 build image is released
315+
# (
316+
# "java25",
317+
# "25",
318+
# BuildIntegJavaBase.USING_GRADLE_PATH,
319+
# BuildIntegJavaBase.EXPECTED_FILES_PROJECT_MANIFEST_GRADLE,
320+
# BuildIntegJavaBase.EXPECTED_GRADLE_DEPENDENCIES,
321+
# ),
322+
# (
323+
# "java25",
324+
# "25",
325+
# BuildIntegJavaBase.USING_GRADLEW_PATH,
326+
# BuildIntegJavaBase.EXPECTED_FILES_PROJECT_MANIFEST_GRADLE,
327+
# BuildIntegJavaBase.EXPECTED_GRADLE_DEPENDENCIES,
328+
# ),
329+
# (
330+
# "java25",
331+
# "25",
332+
# BuildIntegJavaBase.USING_GRADLE_KOTLIN_PATH,
333+
# BuildIntegJavaBase.EXPECTED_FILES_PROJECT_MANIFEST_GRADLE,
334+
# BuildIntegJavaBase.EXPECTED_GRADLE_DEPENDENCIES,
335+
# ),
336+
# (
337+
# "java25",
338+
# "25",
339+
# BuildIntegJavaBase.USING_MAVEN_PATH,
340+
# BuildIntegJavaBase.EXPECTED_FILES_PROJECT_MANIFEST_MAVEN,
341+
# BuildIntegJavaBase.EXPECTED_MAVEN_DEPENDENCIES,
342+
# ),
341343
]
342344
)
343345
@skipIf(SKIP_DOCKER_TESTS or SKIP_DOCKER_BUILD, SKIP_DOCKER_MESSAGE)

‎tests/integration/buildcmd/test_build_cmd_java.py‎

Lines changed: 33 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ class TestBuildCommand_Java(BuildIntegJavaBase):
3737
(
3838
"java8.al2",
3939
"8",
40-
BuildIntegJavaBase.USING_GRADLEW_PATH,
40+
BuildIntegJavaBase.USING_GRADLEW_IN_CONTAINER_PATH,
4141
BuildIntegJavaBase.EXPECTED_FILES_PROJECT_MANIFEST_GRADLE,
4242
BuildIntegJavaBase.EXPECTED_GRADLE_DEPENDENCIES,
4343
),
@@ -65,7 +65,7 @@ class TestBuildCommand_Java(BuildIntegJavaBase):
6565
(
6666
"java11",
6767
"11",
68-
BuildIntegJavaBase.USING_GRADLEW_PATH,
68+
BuildIntegJavaBase.USING_GRADLEW_IN_CONTAINER_PATH,
6969
BuildIntegJavaBase.EXPECTED_FILES_PROJECT_MANIFEST_GRADLE,
7070
BuildIntegJavaBase.EXPECTED_GRADLE_DEPENDENCIES,
7171
),
@@ -93,7 +93,7 @@ class TestBuildCommand_Java(BuildIntegJavaBase):
9393
(
9494
"java17",
9595
"17",
96-
BuildIntegJavaBase.USING_GRADLEW_PATH,
96+
BuildIntegJavaBase.USING_GRADLEW_IN_CONTAINER_PATH,
9797
BuildIntegJavaBase.EXPECTED_FILES_PROJECT_MANIFEST_GRADLE,
9898
BuildIntegJavaBase.EXPECTED_GRADLE_DEPENDENCIES,
9999
),
@@ -138,7 +138,7 @@ def test_building_java_in_container(
138138
(
139139
"java21",
140140
"21",
141-
BuildIntegJavaBase.USING_GRADLEW_PATH,
141+
BuildIntegJavaBase.USING_GRADLEW_IN_CONTAINER_PATH,
142142
BuildIntegJavaBase.EXPECTED_FILES_PROJECT_MANIFEST_GRADLE,
143143
BuildIntegJavaBase.EXPECTED_GRADLE_DEPENDENCIES,
144144
),
@@ -156,34 +156,35 @@ def test_building_java_in_container(
156156
BuildIntegJavaBase.EXPECTED_FILES_PROJECT_MANIFEST_MAVEN,
157157
BuildIntegJavaBase.EXPECTED_MAVEN_DEPENDENCIES,
158158
),
159-
(
160-
"java25",
161-
"25",
162-
BuildIntegJavaBase.USING_GRADLE_PATH,
163-
BuildIntegJavaBase.EXPECTED_FILES_PROJECT_MANIFEST_GRADLE,
164-
BuildIntegJavaBase.EXPECTED_GRADLE_DEPENDENCIES,
165-
),
166-
(
167-
"java25",
168-
"25",
169-
BuildIntegJavaBase.USING_GRADLEW_PATH,
170-
BuildIntegJavaBase.EXPECTED_FILES_PROJECT_MANIFEST_GRADLE,
171-
BuildIntegJavaBase.EXPECTED_GRADLE_DEPENDENCIES,
172-
),
173-
(
174-
"java25",
175-
"25",
176-
BuildIntegJavaBase.USING_GRADLE_KOTLIN_PATH,
177-
BuildIntegJavaBase.EXPECTED_FILES_PROJECT_MANIFEST_GRADLE,
178-
BuildIntegJavaBase.EXPECTED_GRADLE_DEPENDENCIES,
179-
),
180-
(
181-
"java25",
182-
"25",
183-
BuildIntegJavaBase.USING_MAVEN_PATH,
184-
BuildIntegJavaBase.EXPECTED_FILES_PROJECT_MANIFEST_MAVEN,
185-
BuildIntegJavaBase.EXPECTED_MAVEN_DEPENDENCIES,
186-
),
159+
# skip these tests until build images for Java 25 are released
160+
# (
161+
# "java25",
162+
# "25",
163+
# BuildIntegJavaBase.USING_GRADLE_PATH,
164+
# BuildIntegJavaBase.EXPECTED_FILES_PROJECT_MANIFEST_GRADLE,
165+
# BuildIntegJavaBase.EXPECTED_GRADLE_DEPENDENCIES,
166+
# ),
167+
# (
168+
# "java25",
169+
# "25",
170+
# BuildIntegJavaBase.USING_GRADLEW_IN_CONTAINER_PATH,
171+
# BuildIntegJavaBase.EXPECTED_FILES_PROJECT_MANIFEST_GRADLE,
172+
# BuildIntegJavaBase.EXPECTED_GRADLE_DEPENDENCIES,
173+
# ),
174+
# (
175+
# "java25",
176+
# "25",
177+
# BuildIntegJavaBase.USING_GRADLE_KOTLIN_PATH,
178+
# BuildIntegJavaBase.EXPECTED_FILES_PROJECT_MANIFEST_GRADLE,
179+
# BuildIntegJavaBase.EXPECTED_GRADLE_DEPENDENCIES,
180+
# ),
181+
# (
182+
# "java25",
183+
# "25",
184+
# BuildIntegJavaBase.USING_MAVEN_PATH,
185+
# BuildIntegJavaBase.EXPECTED_FILES_PROJECT_MANIFEST_MAVEN,
186+
# BuildIntegJavaBase.EXPECTED_MAVEN_DEPENDENCIES,
187+
# ),
187188
]
188189
)
189190
@skipIf(SKIP_DOCKER_TESTS or SKIP_DOCKER_BUILD, SKIP_DOCKER_MESSAGE)

‎tests/integration/buildcmd/test_build_cmd_python.py‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -365,7 +365,8 @@ def test_with_default_requirements_in_container(self, runtime):
365365
[
366366
("python3.12",),
367367
("python3.13",),
368-
("python3.14",),
368+
# skip this test until the python 3.14 build image is released
369+
# ("python3.14",),
369370
]
370371
)
371372
@pytest.mark.al2023
@@ -495,7 +496,8 @@ def test_with_default_requirements(self, runtime, codeuri, use_container, archit
495496
("python3.13", "Python", "use_container", "x86_64"),
496497
("python3.14", "Python", False, "x86_64"),
497498
("python3.14", "PythonPEP600", False, "x86_64"),
498-
("python3.14", "Python", "use_container", "x86_64"),
499+
# skip this test until python 3.14 build image is released
500+
# ("python3.14", "Python", "use_container", "x86_64"),
499501
],
500502
name_func=show_container_in_test_name,
501503
)

‎tests/integration/testdata/buildcmd/Java/gradlew-in-container/11/build.gradle‎

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
plugins {
2+
id 'java'
3+
}
4+
5+
repositories {
6+
mavenCentral()
7+
}
8+
9+
dependencies {
10+
implementation 'software.amazon.awssdk:annotations:2.1.0'
11+
implementation 'com.amazonaws:aws-lambda-java-core:1.1.0'
12+
}
13+
14+
java.sourceCompatibility = JavaVersion.VERSION_11
15+
java.targetCompatibility = JavaVersion.VERSION_11

‎tests/integration/testdata/buildcmd/Java/gradlew-in-container/11/gradle/wrapper/gradle-wrapper.jar‎

62.2 KB
Binary file not shown.

‎tests/integration/testdata/buildcmd/Java/gradlew-in-container/11/gradle/wrapper/gradle-wrapper.properties‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
distributionBase=GRADLE_USER_HOME
2+
distributionPath=wrapper/dists
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-bin.zip
4+
networkTimeout=10000
5+
validateDistributionUrl=true
6+
zipStoreBase=GRADLE_USER_HOME
7+
zipStorePath=wrapper/dists

0 commit comments

Comments
 (0)