Skip to content

Commit 9253d3b

Browse files
authored
[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
1 parent 00da2e0 commit 9253d3b

File tree

2 files changed

+16
-5
lines changed

2 files changed

+16
-5
lines changed

.ci/jenkins/Jenkinsfile.setup-branch

Lines changed: 16 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -93,9 +93,21 @@ pipeline {
9393
steps {
9494
script {
9595
dir(getRepoName()) {
96-
def oldKogitoVersion = readMavenPom(file: 'pom.xml').version
96+
def pom = readMavenPom(file: 'pom.xml');
97+
def oldKogitoVersion = pom.version
98+
if (oldKogitoVersion == null) {
99+
echo "pom version is null. Using parent pom version"
100+
oldKogitoVersion = pom.parent.version
101+
}
97102
echo "Got old Kogito version ${oldKogitoVersion}"
98103
configFileProvider([configFile(fileId: env.MAVEN_SETTINGS_CONFIG_FILE_ID, variable: 'MAVEN_SETTINGS_FILE')]){
104+
// special case for serverless-workflow-examples-parent
105+
maven.mvnVersionsSet(
106+
getMavenCommand('serverless-workflow-examples/serverless-workflow-examples-parent').withSettingsXmlFile(MAVEN_SETTINGS_FILE),
107+
getKogitoVersion(),
108+
true,
109+
false
110+
)
99111
maven.mvnVersionsUpdateParentAndChildModules(
100112
getMavenCommand().withSettingsXmlFile(MAVEN_SETTINGS_FILE),
101113
getKogitoVersion(),
@@ -119,9 +131,10 @@ pipeline {
119131
}
120132

121133
if (getKogitoVersion() != oldKogitoVersion) {
122-
def status = sh(script: "grep -ir '${oldKogitoVersion}' --include='pom.xml'", returnStatus: true)
134+
def status = sh(script: "grep -ir '>${oldKogitoVersion}<' --include='pom.xml'", returnStatus: true)
123135
if (status == 0) {
124-
error "Old Kogito version ${oldKogitoVersion} is still present into the project... Please review it..."
136+
// some orphaned projects may still have the old version. not an error
137+
echo "Old Kogito version ${oldKogitoVersion} is still present into the project... Please review it..."
125138
}
126139
}
127140
}

kogito-quarkus-examples/pom.xml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -133,7 +133,6 @@
133133
<module>dmn-quarkus-example</module>
134134
<module>dmn-resource-jar-quarkus-example</module>
135135
<module>dmn-multiple-models-quarkus-example</module>
136-
<module>dmn-tracing-quarkus</module>
137136
<module>flexible-process-quarkus</module>
138137
<module>kogito-travel-agency</module>
139138
<module>onboarding-example</module>
@@ -174,7 +173,6 @@
174173
</property>
175174
</activation>
176175
<modules>
177-
<module>trusty-tracing-quarkus-devservices</module>
178176
</modules>
179177
</profile>
180178

0 commit comments

Comments
 (0)