Skip to content

Enable OpenShift tests #856

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
anuruddhal merged 2 commits into from
Sep 15, 2025
Merged

Enable OpenShift tests #856

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
cdb4da8
[Automated] Update the native jar versions
anuruddhal Sep 15, 2025
e66c48e
Enable openshift tests
anuruddhal Sep 15, 2025
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
2 changes: 1 addition & 1 deletion ballerina/Ballerina.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
[package]
org = "ballerina"
name = "cloud"
version = "3.3.3"
version = "4.0.0"
repository = "https://github.com/ballerina-platform/module-ballerina-c2c"
license = ["Apache-2.0"]
keywords = ["cloud", "kubernetes", "docker", "k8s", "c2c"]
Expand Down
2 changes: 1 addition & 1 deletion ballerina/CompilerPlugin.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,4 @@ id = "code2cloud"
class = "io.ballerina.c2c.C2CCompilerPlugin"

[[dependency]]
path = "../compiler-plugin/build/libs/cloud-compiler-plugin-3.3.3.jar"
path = "../compiler-plugin/build/libs/cloud-compiler-plugin-4.0.0-SNAPSHOT.jar"
4 changes: 2 additions & 2 deletions ballerina/Dependencies.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,12 +5,12 @@

[ballerina]
dependencies-toml-version = "2"
distribution-version = "2201.13.0-m2"
distribution-version = "2201.13.0-m3"

[[package]]
org = "ballerina"
name = "cloud"
version = "3.3.3"
version = "4.0.0"
modules = [
{org = "ballerina", packageName = "cloud", moduleName = "cloud"}
]
Expand Down
6 changes: 3 additions & 3 deletions compiler-plugin-tests/src/test/java/io/ballerina/c2c/test/samples/OpenshiftSampleTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ public class OpenshiftSampleTest extends SampleTest {
SOURCE_DIR_PATH.resolve("target").resolve(DOCKER).resolve("hello");
private static final Path OPENSHIFT_TARGET_PATH =
SOURCE_DIR_PATH.resolve("target").resolve(OPENSHIFT).resolve("hello");
private static final String DOCKER_IMAGE = "anuruddhal/hello-api:1.0.0";
private static final String DOCKER_IMAGE = "ballerina/hello-api:1.0.0";
private static final Path INGRESS_PATH =
Paths.get("src", "test", "resources", "openshift-yaml-with-ballerina-project");
private Deployment deployment;
Expand Down Expand Up @@ -129,8 +129,8 @@ public void validateDockerImage() {
Assert.assertEquals(ports.size(), 1);
Assert.assertEquals(ports.get(0), "9090/tcp");
// Validate ballerina.conf in run command
Assert.assertEquals(getEntryPoint(DOCKER_IMAGE).toString(), "[java, -Xdiag, -cp, " +
"hello-hello-0.0.1.jar:jars/*, hello.hello.0.$_init]");
Assert.assertEquals(getEntryPoint(DOCKER_IMAGE).toString(), "[java, -XX:+ExitOnOutOfMemoryError, " +
"-Xdiag, -cp, hello-hello-0.0.1.jar:jars/*, hello.hello.0.$_init]");
}

@Test(groups = {"integration"})
Expand Down
2 changes: 1 addition & 1 deletion compiler-plugin-tests/src/test/resources/testng.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@
<class name="io.ballerina.c2c.test.docker.DockerInvalidCopyTest"/>
<class name="io.ballerina.c2c.test.docker.BalTestCMDOptionsTests"/>
<class name="io.ballerina.c2c.test.samples.JobTest"/>
<!-- <class name="io.ballerina.c2c.test.samples.OpenshiftSampleTest"/>-->
<class name="io.ballerina.c2c.test.samples.OpenshiftSampleTest"/>
<class name="io.ballerina.c2c.test.samples.Sample1Test"/>
<class name="io.ballerina.c2c.test.samples.Sample2Test"/>
<class name="io.ballerina.c2c.test.samples.Sample3Test"/>
Expand Down
Binary file modified gradle/wrapper/gradle-wrapper.jar
View file
Open in desktop
Binary file not shown.
2 changes: 1 addition & 1 deletion gradle/wrapper/gradle-wrapper.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-8.2.1-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-8.10-bin.zip
networkTimeout=10000
validateDistributionUrl=true
zipStoreBase=GRADLE_USER_HOME
Expand Down
22 changes: 13 additions & 9 deletions gradlew
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

22 changes: 12 additions & 10 deletions gradlew.bat
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.