From 9253d3b35552d10002b1508ae23caab1178ca021 Mon Sep 17 00:00:00 2001 From: Toshiya Kobayashi Date: Thu, 15 Aug 2024 15:02:08 +0900 Subject: [PATCH] [incubator-kie-issues-1401] Fix build kogito-examples.build-and-test in kogito nightly.native folder (#1987) * [incubator-kie-issues-1401] Fix build kogito-examples.build-and-test in kogito nightly.native folder - Completely disabled dmn-tracing-quarkus and trusty-tracing-quarkus-devservices * - Improve version-update --- .ci/jenkins/Jenkinsfile.setup-branch | 19 ++++++++++++++++--- kogito-quarkus-examples/pom.xml | 2 -- 2 files changed, 16 insertions(+), 5 deletions(-) diff --git a/.ci/jenkins/Jenkinsfile.setup-branch b/.ci/jenkins/Jenkinsfile.setup-branch index ad3eba6a76..9d1eb422af 100644 --- a/.ci/jenkins/Jenkinsfile.setup-branch +++ b/.ci/jenkins/Jenkinsfile.setup-branch @@ -93,9 +93,21 @@ pipeline { steps { script { dir(getRepoName()) { - def oldKogitoVersion = readMavenPom(file: 'pom.xml').version + def pom = readMavenPom(file: 'pom.xml'); + def oldKogitoVersion = pom.version + if (oldKogitoVersion == null) { + echo "pom version is null. Using parent pom version" + oldKogitoVersion = pom.parent.version + } echo "Got old Kogito version ${oldKogitoVersion}" configFileProvider([configFile(fileId: env.MAVEN_SETTINGS_CONFIG_FILE_ID, variable: 'MAVEN_SETTINGS_FILE')]){ + // special case for serverless-workflow-examples-parent + maven.mvnVersionsSet( + getMavenCommand('serverless-workflow-examples/serverless-workflow-examples-parent').withSettingsXmlFile(MAVEN_SETTINGS_FILE), + getKogitoVersion(), + true, + false + ) maven.mvnVersionsUpdateParentAndChildModules( getMavenCommand().withSettingsXmlFile(MAVEN_SETTINGS_FILE), getKogitoVersion(), @@ -119,9 +131,10 @@ pipeline { } if (getKogitoVersion() != oldKogitoVersion) { - def status = sh(script: "grep -ir '${oldKogitoVersion}' --include='pom.xml'", returnStatus: true) + def status = sh(script: "grep -ir '>${oldKogitoVersion}<' --include='pom.xml'", returnStatus: true) if (status == 0) { - error "Old Kogito version ${oldKogitoVersion} is still present into the project... Please review it..." + // some orphaned projects may still have the old version. not an error + echo "Old Kogito version ${oldKogitoVersion} is still present into the project... Please review it..." } } } diff --git a/kogito-quarkus-examples/pom.xml b/kogito-quarkus-examples/pom.xml index b64e75a425..e2c3fbaa05 100644 --- a/kogito-quarkus-examples/pom.xml +++ b/kogito-quarkus-examples/pom.xml @@ -133,7 +133,6 @@ dmn-quarkus-example dmn-resource-jar-quarkus-example dmn-multiple-models-quarkus-example - dmn-tracing-quarkus flexible-process-quarkus kogito-travel-agency onboarding-example @@ -174,7 +173,6 @@ - trusty-tracing-quarkus-devservices