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.

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

[KOGITO-9061] Quarkus 3: Corrections #5200

Merged
merged 2 commits into from
May 16, 2023
Merged

[KOGITO-9061] Quarkus 3: Corrections #5200

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
4efef55
Quarkus 3: small updates
radtriste May 10, 2023
aaa5543
Update jobs.groovy
radtriste May 16, 2023
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: 2 additions & 0 deletions .ci/environments/quarkus-3/before.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,9 @@ patch_file="${script_dir_path}"/patches/0001_before_sh.patch

if [ "${ci}" = "true" ]; then
# In CI we need the main branch snapshot artifacts deployed locally
set -x
${mvn_cmd} clean install -Dquickly
set +x
fi

rewrite=${1:-'none'}
Expand Down
6 changes: 3 additions & 3 deletions .ci/environments/quarkus-3/quarkus3.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@ description: Update Quarkus version and refactor imports and resources if needed
type: specs.openrewrite.org/v1beta/recipe
recipeList:
- org.openrewrite.maven.ChangePropertyValue: {
key: version.io.quarkus,
newValue: 3.0.0.Final
newValue: 3.0.0.Final,
key: version.io.quarkus
}
- org.kie.drools.Quarkus3Migration
- org.kie.ManagedDependencies
Expand Down Expand Up @@ -117,7 +117,6 @@ recipeList:
}
- org.kie.openrewrite.recipe.jpmml.JPMMLRecipe
---
description: Update all managed dependencies based on dependency updates from Quarkus.
type: specs.openrewrite.org/v1beta/recipe
recipeList:
- org.openrewrite.maven.ChangeManagedDependencyGroupIdAndArtifactId: {
Expand Down Expand Up @@ -505,6 +504,7 @@ recipeList:
}
displayName: Update Managed Dependencies
name: org.kie.ManagedDependencies
description: Update all managed dependencies based on dependency updates from Quarkus.
---
type: specs.openrewrite.org/v1beta/recipe
name: io.quarkus.updates.core.quarkus30.UpgradeQuarkiverse
Expand Down
7 changes: 6 additions & 1 deletion .ci/jenkins/Jenkinsfile.quarkus-3.rewrite.pr
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,12 @@ pipeline {
steps {
script {
dir(getRepoName()) {
sh '.ci/environments/quarkus-3/before.sh rewrite'
configFileProvider([configFile(fileId: env.MAVEN_SETTINGS_CONFIG_FILE_ID, variable: 'MAVEN_SETTINGS_FILE')]) {
env.BUILD_MVN_OPTS = "${env.BUILD_MVN_OPTS ?: ''} -s ${MAVEN_SETTINGS_FILE} -Dmaven.wagon.http.ssl.insecure=true -Dmaven.test.failure.ignore=true"
echo "BUILD_MVN_OPTS = ${BUILD_MVN_OPTS}"

sh '.ci/environments/quarkus-3/before.sh rewrite'
}
}
}
}
Expand Down
7 changes: 6 additions & 1 deletion .ci/jenkins/Jenkinsfile.quarkus-3.rewrite.standalone
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,12 @@ pipeline {
steps {
script {
dir(getRepoName()) {
sh '.ci/environments/quarkus-3/before.sh rewrite'
configFileProvider([configFile(fileId: env.MAVEN_SETTINGS_CONFIG_FILE_ID, variable: 'MAVEN_SETTINGS_FILE')]) {
env.BUILD_MVN_OPTS = "${env.BUILD_MVN_OPTS ?: ''} -s ${MAVEN_SETTINGS_FILE} -Dmaven.wagon.http.ssl.insecure=true -Dmaven.test.failure.ignore=true"
echo "BUILD_MVN_OPTS = ${BUILD_MVN_OPTS}"

sh '.ci/environments/quarkus-3/before.sh rewrite'
}
}
}
}
Expand Down
3 changes: 3 additions & 0 deletions .ci/jenkins/dsl/jobs.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -320,16 +320,19 @@ void setupPrQuarkus3RewriteJob() {
])
jobParams.env.putAll([
AUTHOR_CREDS_ID: "${GIT_AUTHOR_CREDENTIALS_ID}",
MAVEN_SETTINGS_CONFIG_FILE_ID: "${MAVEN_SETTINGS_FILE_ID}",
])
KogitoJobTemplate.createPRJob(this, jobParams)
}

void setupStandaloneQuarkus3RewriteJob() {
def jobParams = JobParamsUtils.getBasicJobParams(this, 'drools.quarkus-3.rewrite', JobType.TOOLS, "${jenkins_path}/Jenkinsfile.quarkus-3.rewrite.standalone", 'Drools Quarkus 3 rewrite patch regeneration')
JobParamsUtils.setupJobParamsDefaultMavenConfiguration(this, jobParams)
jobParams.env.putAll(EnvUtils.getEnvironmentEnvVars(this, 'quarkus-3'))
jobParams.env.putAll([
AUTHOR_CREDS_ID: "${GIT_AUTHOR_CREDENTIALS_ID}",
JENKINS_EMAIL_CREDS_ID: "${JENKINS_EMAIL_CREDS_ID}",
MAVEN_SETTINGS_CONFIG_FILE_ID: "${MAVEN_SETTINGS_FILE_ID}",
])
KogitoJobTemplate.createPipelineJob(this, jobParams)?.with {
parameters {
Expand Down