Skip to content
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.

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

Create DistributedST testcase variant for Kueue-backed RayCluster without AppWrapper #131

Merged
merged 9 commits into from
Apr 18, 2024
Merged
Changes from 1 commit
Commits
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
Prev Previous commit
Next Next commit
fixup checkstyle
  • Loading branch information
jiridanek committed Apr 18, 2024

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature.
commit 4d915f01f23174b977cf48f9193670f04831c787
11 changes: 5 additions & 6 deletions src/test/java/io/odh/test/e2e/standard/DistributedST.java
Original file line number Diff line number Diff line change
@@ -48,7 +48,6 @@
import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.BeforeAll;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.condition.DisabledIf;
import org.junit.jupiter.api.condition.EnabledIf;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -342,12 +341,12 @@ static boolean isAppWrapperDeployed() {
CsvUtils.Version maxOdhVersion = CsvUtils.Version.fromString("2.10.0");
CsvUtils.Version maxRhoaiVersion = CsvUtils.Version.fromString("2.9.0");

return (Environment.PRODUCT.equalsIgnoreCase(Environment.PRODUCT_ODH)
return Environment.PRODUCT.equalsIgnoreCase(Environment.PRODUCT_ODH)
&& Environment.OPERATOR_INSTALL_TYPE.equalsIgnoreCase(InstallTypes.OLM.toString())
&& CsvUtils.Version.fromString(Objects.requireNonNull(CsvUtils.getOperatorVersionFromCsv())).compareTo(maxOdhVersion) < 0)
||
(Environment.PRODUCT.equalsIgnoreCase(Environment.PRODUCT_RHOAI)
&& CsvUtils.Version.fromString(Objects.requireNonNull(CsvUtils.getOperatorVersionFromCsv())).compareTo(maxOdhVersion) < 0
||
Environment.PRODUCT.equalsIgnoreCase(Environment.PRODUCT_RHOAI)
&& Environment.OPERATOR_INSTALL_TYPE.equalsIgnoreCase(InstallTypes.OLM.toString())
&& CsvUtils.Version.fromString(Objects.requireNonNull(CsvUtils.getOperatorVersionFromCsv())).compareTo(maxRhoaiVersion) < 0);
&& CsvUtils.Version.fromString(Objects.requireNonNull(CsvUtils.getOperatorVersionFromCsv())).compareTo(maxRhoaiVersion) < 0;
}
}
24 changes: 12 additions & 12 deletions src/test/java/io/odh/test/unit/CsvUtilsTests.java
Original file line number Diff line number Diff line change
@@ -20,25 +20,25 @@
public class CsvUtilsTests implements TestVisualSeparator {
@ParameterizedTest(name = "[{index}] Version.fromString({0}) == {1}")
@CsvSource({
"2, 2.0.0",
"2.9, 2.9.0",
"2.9.0, 2.9.0",
"2, 2.0.0",
"2.9, 2.9.0",
"2.9.0, 2.9.0",
})
public void testVersionFromString(String stringVersion, String expected) {
Assertions.assertEquals(expected, CsvUtils.Version.fromString(stringVersion).toString());
}

@ParameterizedTest(name = "[{index}] cmp({0}, {1}) == {2}")
@CsvSource({
"2.0.0, 1.0.0, 1",
"2.0.0, 2.0.0, 0",
"2.0.0, 3.0.0, -1",
"0.2.0, 0.1.0, 1",
"0.2.0, 0.2.0, 0",
"0.2.0, 0.3.0, -1",
"0.0.2, 0.0.1, 1",
"0.0.2, 0.0.2, 0",
"0.0.2, 0.0.3, -1",
"2.0.0, 1.0.0, 1",
"2.0.0, 2.0.0, 0",
"2.0.0, 3.0.0, -1",
"0.2.0, 0.1.0, 1",
"0.2.0, 0.2.0, 0",
"0.2.0, 0.3.0, -1",
"0.0.2, 0.0.1, 1",
"0.0.2, 0.0.2, 0",
"0.0.2, 0.0.3, -1",
})
public void testVersionCompareTo(String v1, String v2, int expected) {
Assertions.assertEquals(expected, Integer.signum(CsvUtils.Version.fromString(v1).compareTo(CsvUtils.Version.fromString(v2))));
Loading