Skip to content

chore(tests): update integration tests #8414

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.

Sign up for GitHub

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

Merged
bnusunny merged 1 commit into from
Nov 6, 2025
Merged

chore(tests): update integration tests #8414

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
21 changes: 15 additions & 6 deletions appveyor-ubuntu.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,11 +44,11 @@ install:
# AppVeyor's apt-get cache might be outdated, and the package could potentially be 404.
- sh: "sudo apt-get update --allow-releaseinfo-change"

# install coretto 21
# install coretto 25

@valerena valerena Nov 5, 2025

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

So are we not installing Java21? (is it installed already or do we not need it?)

@bnusunny bnusunny Nov 5, 2025

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We need Java 25 to run the Java related tests. GitHub Actions already use it.

- sh: wget -O - https://apt.corretto.aws/corretto.key | sudo gpg --dearmor -o /usr/share/keyrings/corretto-keyring.gpg
- 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
- sh: sudo apt-get update; sudo apt-get install -y java-21-amazon-corretto-jdk
- sh: JAVA_HOME=/usr/lib/jvm/java-21-amazon-corretto
- sh: sudo apt-get update; sudo apt-get install -y java-25-amazon-corretto-jdk
- sh: JAVA_HOME=/usr/lib/jvm/java-25-amazon-corretto
- sh: PATH=$JAVA_HOME/bin:$PATH
- sh: java --version
- sh: javac --version
Expand Down Expand Up @@ -237,11 +237,11 @@ install:
- sh: "npm install npm@10.2.3 -g"
- sh: "npm -v"

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

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

# install python 3.14
- sh: |
DEST="$HOME/venv3.14"
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"
curl -L "$URL" | tar -xz
mv python $DEST
$HOME/venv3.14/bin/python --version
$HOME/venv3.14/bin/pip --version

- 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"

# update ca-certificates which causes failures with newest golang library
Expand Down
1 change: 1 addition & 0 deletions tests/integration/buildcmd/build_integ_base.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -634,6 +634,7 @@ class BuildIntegJavaBase(BuildIntegBase):
FUNCTION_LOGICAL_ID = "Function"
USING_GRADLE_PATH = os.path.join("Java", "gradle")
USING_GRADLEW_PATH = os.path.join("Java", "gradlew")
USING_GRADLEW_IN_CONTAINER_PATH = os.path.join("Java", "gradlew-in-container")
USING_GRADLE_KOTLIN_PATH = os.path.join("Java", "gradle-kotlin")
USING_MAVEN_PATH = os.path.join("Java", "maven")

Expand Down
6 changes: 3 additions & 3 deletions tests/integration/buildcmd/test_build_cmd.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -998,7 +998,7 @@ class TestBuildWithDedupBuilds(DedupBuildIntegBase):
# container
(
"use_container",
"Java/gradlew/8",
"Java/gradlew-in-container/8",
"aws.example.Hello::myHandler",
"aws.example.SecondFunction::myHandler",
"java8.al2",
Expand Down Expand Up @@ -1130,7 +1130,7 @@ class TestBuildWithCacheBuilds(CachedBuildIntegBase):
# container
(
"use_container",
"Java/gradlew/8",
"Java/gradlew-in-container/8",
"aws.example.Hello::myHandler",
"aws.example.SecondFunction::myHandler",
"java8.al2",
Expand Down Expand Up @@ -1322,7 +1322,7 @@ class TestParallelBuilds(DedupBuildIntegBase):
# container
(
"use_container",
"Java/gradlew/8",
"Java/gradlew-in-container/8",
"aws.example.Hello::myHandler",
"aws.example.SecondFunction::myHandler",
"java8.al2",
Expand Down
62 changes: 32 additions & 30 deletions tests/integration/buildcmd/test_build_cmd_arm64.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,8 @@ def test_with_default_requirements_invoke_in_container(self, runtime, codeuri, u
[
("python3.12", "Python", "use_container"),
("python3.13", "Python", "use_container"),
("python3.14", "Python", "use_container"),
# skip this test until python 3.14 build image is released
# ("python3.14", "Python", "use_container"),
],
name_func=show_container_in_test_name,
)
Expand Down Expand Up @@ -292,7 +293,7 @@ def test_building_java_in_container_with_arm64_architecture(
(
"java21",
"21",
BuildIntegJavaBase.USING_GRADLEW_PATH,
BuildIntegJavaBase.USING_GRADLEW_IN_CONTAINER_PATH,
BuildIntegJavaBase.EXPECTED_FILES_PROJECT_MANIFEST_GRADLE,
BuildIntegJavaBase.EXPECTED_GRADLE_DEPENDENCIES,
),
Expand All @@ -310,34 +311,35 @@ def test_building_java_in_container_with_arm64_architecture(
BuildIntegJavaBase.EXPECTED_FILES_PROJECT_MANIFEST_MAVEN,
BuildIntegJavaBase.EXPECTED_MAVEN_DEPENDENCIES,
),
(
"java25",
"25",
BuildIntegJavaBase.USING_GRADLE_PATH,
BuildIntegJavaBase.EXPECTED_FILES_PROJECT_MANIFEST_GRADLE,
BuildIntegJavaBase.EXPECTED_GRADLE_DEPENDENCIES,
),
(
"java25",
"25",
BuildIntegJavaBase.USING_GRADLEW_PATH,
BuildIntegJavaBase.EXPECTED_FILES_PROJECT_MANIFEST_GRADLE,
BuildIntegJavaBase.EXPECTED_GRADLE_DEPENDENCIES,
),
(
"java25",
"25",
BuildIntegJavaBase.USING_GRADLE_KOTLIN_PATH,
BuildIntegJavaBase.EXPECTED_FILES_PROJECT_MANIFEST_GRADLE,
BuildIntegJavaBase.EXPECTED_GRADLE_DEPENDENCIES,
),
(
"java25",
"25",
BuildIntegJavaBase.USING_MAVEN_PATH,
BuildIntegJavaBase.EXPECTED_FILES_PROJECT_MANIFEST_MAVEN,
BuildIntegJavaBase.EXPECTED_MAVEN_DEPENDENCIES,
),
# skip these tests until java25 build image is released
# (
# "java25",
# "25",
# BuildIntegJavaBase.USING_GRADLE_PATH,
# BuildIntegJavaBase.EXPECTED_FILES_PROJECT_MANIFEST_GRADLE,
# BuildIntegJavaBase.EXPECTED_GRADLE_DEPENDENCIES,
# ),
# (
# "java25",
# "25",
# BuildIntegJavaBase.USING_GRADLEW_PATH,
# BuildIntegJavaBase.EXPECTED_FILES_PROJECT_MANIFEST_GRADLE,
# BuildIntegJavaBase.EXPECTED_GRADLE_DEPENDENCIES,
# ),
# (
# "java25",
# "25",
# BuildIntegJavaBase.USING_GRADLE_KOTLIN_PATH,
# BuildIntegJavaBase.EXPECTED_FILES_PROJECT_MANIFEST_GRADLE,
# BuildIntegJavaBase.EXPECTED_GRADLE_DEPENDENCIES,
# ),
# (
# "java25",
# "25",
# BuildIntegJavaBase.USING_MAVEN_PATH,
# BuildIntegJavaBase.EXPECTED_FILES_PROJECT_MANIFEST_MAVEN,
# BuildIntegJavaBase.EXPECTED_MAVEN_DEPENDENCIES,
# ),
]
)
@skipIf(SKIP_DOCKER_TESTS or SKIP_DOCKER_BUILD, SKIP_DOCKER_MESSAGE)
Expand Down
65 changes: 33 additions & 32 deletions tests/integration/buildcmd/test_build_cmd_java.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ class TestBuildCommand_Java(BuildIntegJavaBase):
(
"java8.al2",
"8",
BuildIntegJavaBase.USING_GRADLEW_PATH,
BuildIntegJavaBase.USING_GRADLEW_IN_CONTAINER_PATH,
BuildIntegJavaBase.EXPECTED_FILES_PROJECT_MANIFEST_GRADLE,
BuildIntegJavaBase.EXPECTED_GRADLE_DEPENDENCIES,
),
Expand Down Expand Up @@ -65,7 +65,7 @@ class TestBuildCommand_Java(BuildIntegJavaBase):
(
"java11",
"11",
BuildIntegJavaBase.USING_GRADLEW_PATH,
BuildIntegJavaBase.USING_GRADLEW_IN_CONTAINER_PATH,
BuildIntegJavaBase.EXPECTED_FILES_PROJECT_MANIFEST_GRADLE,
BuildIntegJavaBase.EXPECTED_GRADLE_DEPENDENCIES,
),
Expand Down Expand Up @@ -93,7 +93,7 @@ class TestBuildCommand_Java(BuildIntegJavaBase):
(
"java17",
"17",
BuildIntegJavaBase.USING_GRADLEW_PATH,
BuildIntegJavaBase.USING_GRADLEW_IN_CONTAINER_PATH,
BuildIntegJavaBase.EXPECTED_FILES_PROJECT_MANIFEST_GRADLE,
BuildIntegJavaBase.EXPECTED_GRADLE_DEPENDENCIES,
),
Expand Down Expand Up @@ -138,7 +138,7 @@ def test_building_java_in_container(
(
"java21",
"21",
BuildIntegJavaBase.USING_GRADLEW_PATH,
BuildIntegJavaBase.USING_GRADLEW_IN_CONTAINER_PATH,
BuildIntegJavaBase.EXPECTED_FILES_PROJECT_MANIFEST_GRADLE,
BuildIntegJavaBase.EXPECTED_GRADLE_DEPENDENCIES,
),
Expand All @@ -156,34 +156,35 @@ def test_building_java_in_container(
BuildIntegJavaBase.EXPECTED_FILES_PROJECT_MANIFEST_MAVEN,
BuildIntegJavaBase.EXPECTED_MAVEN_DEPENDENCIES,
),
(
"java25",
"25",
BuildIntegJavaBase.USING_GRADLE_PATH,
BuildIntegJavaBase.EXPECTED_FILES_PROJECT_MANIFEST_GRADLE,
BuildIntegJavaBase.EXPECTED_GRADLE_DEPENDENCIES,
),
(
"java25",
"25",
BuildIntegJavaBase.USING_GRADLEW_PATH,
BuildIntegJavaBase.EXPECTED_FILES_PROJECT_MANIFEST_GRADLE,
BuildIntegJavaBase.EXPECTED_GRADLE_DEPENDENCIES,
),
(
"java25",
"25",
BuildIntegJavaBase.USING_GRADLE_KOTLIN_PATH,
BuildIntegJavaBase.EXPECTED_FILES_PROJECT_MANIFEST_GRADLE,
BuildIntegJavaBase.EXPECTED_GRADLE_DEPENDENCIES,
),
(
"java25",
"25",
BuildIntegJavaBase.USING_MAVEN_PATH,
BuildIntegJavaBase.EXPECTED_FILES_PROJECT_MANIFEST_MAVEN,
BuildIntegJavaBase.EXPECTED_MAVEN_DEPENDENCIES,
),
# skip these tests until build images for Java 25 are released
# (
# "java25",
# "25",
# BuildIntegJavaBase.USING_GRADLE_PATH,
# BuildIntegJavaBase.EXPECTED_FILES_PROJECT_MANIFEST_GRADLE,
# BuildIntegJavaBase.EXPECTED_GRADLE_DEPENDENCIES,
# ),
# (
# "java25",
# "25",
# BuildIntegJavaBase.USING_GRADLEW_IN_CONTAINER_PATH,
# BuildIntegJavaBase.EXPECTED_FILES_PROJECT_MANIFEST_GRADLE,
# BuildIntegJavaBase.EXPECTED_GRADLE_DEPENDENCIES,
# ),
# (
# "java25",
# "25",
# BuildIntegJavaBase.USING_GRADLE_KOTLIN_PATH,
# BuildIntegJavaBase.EXPECTED_FILES_PROJECT_MANIFEST_GRADLE,
# BuildIntegJavaBase.EXPECTED_GRADLE_DEPENDENCIES,
# ),
# (
# "java25",
# "25",
# BuildIntegJavaBase.USING_MAVEN_PATH,
# BuildIntegJavaBase.EXPECTED_FILES_PROJECT_MANIFEST_MAVEN,
# BuildIntegJavaBase.EXPECTED_MAVEN_DEPENDENCIES,
# ),
]
)
@skipIf(SKIP_DOCKER_TESTS or SKIP_DOCKER_BUILD, SKIP_DOCKER_MESSAGE)
Expand Down
6 changes: 4 additions & 2 deletions tests/integration/buildcmd/test_build_cmd_python.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -365,7 +365,8 @@ def test_with_default_requirements_in_container(self, runtime):
[
("python3.12",),
("python3.13",),
("python3.14",),
# skip this test until the python 3.14 build image is released
# ("python3.14",),
]
)
@pytest.mark.al2023
Expand Down Expand Up @@ -495,7 +496,8 @@ def test_with_default_requirements(self, runtime, codeuri, use_container, archit
("python3.13", "Python", "use_container", "x86_64"),
("python3.14", "Python", False, "x86_64"),
("python3.14", "PythonPEP600", False, "x86_64"),
("python3.14", "Python", "use_container", "x86_64"),
# skip this test until python 3.14 build image is released
# ("python3.14", "Python", "use_container", "x86_64"),
],
name_func=show_container_in_test_name,
)
Expand Down
15 changes: 15 additions & 0 deletions tests/integration/testdata/buildcmd/Java/gradlew-in-container/11/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
plugins {
id 'java'
}

repositories {
mavenCentral()
}

dependencies {
implementation 'software.amazon.awssdk:annotations:2.1.0'
implementation 'com.amazonaws:aws-lambda-java-core:1.1.0'
}

java.sourceCompatibility = JavaVersion.VERSION_11
java.targetCompatibility = JavaVersion.VERSION_11
Binary file added ...egration/testdata/buildcmd/Java/gradlew-in-container/11/gradle/wrapper/gradle-wrapper.jar
View file
Open in desktop
Binary file not shown.
7 changes: 7 additions & 0 deletions ...n/testdata/buildcmd/Java/gradlew-in-container/11/gradle/wrapper/gradle-wrapper.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-bin.zip
networkTimeout=10000
validateDistributionUrl=true
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
Loading
Loading