isapego commented on code in PR #7516:
URL: https://github.com/apache/ignite-3/pull/7516#discussion_r2796308061
##########
.teamcity/build/distributions/ClientPackages.kt:
##########
@@ -0,0 +1,57 @@
+package build.distributions
+
+import jetbrains.buildServer.configs.kotlin.BuildType
+import jetbrains.buildServer.configs.kotlin.buildSteps.GradleBuildStep
+import org.apache.ignite.teamcity.CustomBuildSteps.Companion.customGradle
+import jetbrains.buildServer.configs.kotlin.buildSteps.script
+import org.apache.ignite.teamcity.CustomBuildSteps.Companion.customScript
+
+object ClientPackages : BuildType({
Review Comment:
Let's make sure to not confuse people - we have a lot of different clients,
but this suite is only about C++ ones.
```suggestion
object CppClientPackages : BuildType({
```
##########
modules/platforms/cpp/_version.txt:
##########
@@ -1 +1 @@
-3.2.0
\ No newline at end of file
+3.2.0.9999
Review Comment:
I see that file is changed, but the function `updateCMakeVersion` in
build.gradle, which generates it didn't. Should we update it accordingly?
##########
.teamcity/test/platform_tests/PlatformCppOdbcTestsDebLinux.kt:
##########
@@ -0,0 +1,114 @@
+package test.platform_tests
+
+import build.distributions.ClientPackages
+import jetbrains.buildServer.configs.kotlin.BuildType
+import jetbrains.buildServer.configs.kotlin.ParameterDisplay
+import jetbrains.buildServer.configs.kotlin.buildFeatures.XmlReport
+import jetbrains.buildServer.configs.kotlin.buildFeatures.xmlReport
+import jetbrains.buildServer.configs.kotlin.buildSteps.script
+import
jetbrains.buildServer.configs.kotlin.failureConditions.BuildFailureOnText
+import jetbrains.buildServer.configs.kotlin.failureConditions.failOnText
+import org.apache.ignite.teamcity.CustomBuildSteps.Companion.customScript
+import org.apache.ignite.teamcity.Teamcity
+
+object PlatformCppOdbcTestsDebLinux : BuildType({
+ id(Teamcity.getId(this::class))
+ name = "Platform C++ ODBC Tests. DEB package (Ubuntu 22.04 Linux
container)"
+
+ artifactRules = """
+ %PATH__CMAKE_BUILD_DIRECTORY%/core => core_dumps
+ """.trimIndent()
+
+ params {
+ param("env.IGNITE_CPP_TESTS_USE_SINGLE_NODE", "")
+ param("PATH__CMAKE_BUILD_DIRECTORY",
"%PATH__WORKING_DIR%/cmake-build-debug")
+ param("PATH__ODBC_TEST_RESULTS",
"%PATH__WORKING_DIR%/odbc_tests_results.xml")
+ text("PATH__WORKING_DIR",
"%teamcity.build.checkoutDir%/%VCSROOT__IGNITE3%/modules/platforms/cpp",
display = ParameterDisplay.HIDDEN, allowEmpty = true)
+ text("PATH__IGNITE_DIR",
"%teamcity.build.checkoutDir%/%VCSROOT__IGNITE3%", display =
ParameterDisplay.HIDDEN, allowEmpty = true)
+ param("env.CPP_STAGING", "/tmp/cpp_staging")
+ param("CONTAINER_JAVA_HOME", "/usr/lib/jvm/java-17-openjdk-amd64/")
+ }
+
+ dependencies {
+ dependency(ClientPackages) {
+ snapshot {}
+ artifacts {
+ cleanDestination = true
+ artifactRules = """
+ odbc-deb => ignite3-odbc-deb
+ """.trimIndent()
+ }
+ }
+ }
+
+ steps {
+ customScript(type = "bash") {
+ name = "Setup Docker Proxy"
+ }
+
+ script {
+ name = "Install ODBC and build C++ tests in Ubuntu 22.04 container"
+ dockerImage = "docker.gridgain.com/ci/tc-ubuntu22_04-odbc:v1.0"
+ dockerRunParameters = "-e JAVA_HOME=%CONTAINER_JAVA_HOME% --ulimit
nofile=32768:32768"
+ scriptContent = """
+ clang --version
+ clang++ --version
+ ulimit -a
+
+ dpkg -i ignite3-odbc-deb/*.deb
+
+ cd %PATH__IGNITE_DIR%
+ ./gradlew :ignite-runner:integrationTestClasses
+ mkdir %PATH__CMAKE_BUILD_DIRECTORY% || exit 2
+ cd %PATH__CMAKE_BUILD_DIRECTORY% || exit 3
+
+ cmake .. -DCMAKE_CXX_COMPILER=clang++ -DCMAKE_C_COMPILER=clang
-DENABLE_TESTS=ON -DENABLE_ODBC=ON -DCMAKE_BUILD_TYPE=Debug
-DCMAKE_INSTALL_PREFIX=%env.CPP_STAGING% || (echo 'CMake configuration failed'
&& exit 5)
Review Comment:
Let's disable client compilation - it will reduce building time.
```suggestion
cmake .. -DCMAKE_CXX_COMPILER=clang++
-DCMAKE_C_COMPILER=clang -DENABLE_TESTS=ON -DENABLE_ODBC=ON -DENABLE_CLIENT=OFF
-DCMAKE_BUILD_TYPE=Debug -DCMAKE_INSTALL_PREFIX=%env.CPP_STAGING% || (echo
'CMake configuration failed' && exit 5)
```
##########
.teamcity/build/distributions/ClientPackages.kt:
##########
@@ -0,0 +1,57 @@
+package build.distributions
+
+import jetbrains.buildServer.configs.kotlin.BuildType
+import jetbrains.buildServer.configs.kotlin.buildSteps.GradleBuildStep
+import org.apache.ignite.teamcity.CustomBuildSteps.Companion.customGradle
+import jetbrains.buildServer.configs.kotlin.buildSteps.script
+import org.apache.ignite.teamcity.CustomBuildSteps.Companion.customScript
+
+object ClientPackages : BuildType({
+ name = "[11] ODBC and Client packages"
Review Comment:
```suggestion
name = "[11] ODBC and C++ Client packages"
```
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: [email protected]
For queries about this service, please contact Infrastructure at:
[email protected]
