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

[kie-issues-249] Data Index Events changes for allowing historical data #1814

Closed
wants to merge 8 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
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
2 changes: 1 addition & 1 deletion .ci/environments/common/update_quarkus.sh
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ set -euo pipefail

mvn_cmd="mvn ${BUILD_MVN_OPTS:-} ${BUILD_MVN_OPTS_QUARKUS_UPDATE:-}"

source <(curl -s https://github.com/raw/kiegroup/kogito-pipelines/main/dsl/seed/scripts/install_quarkus.sh)
source <(curl -s https://github.com/raw/apache/incubator-kie-kogito-pipelines/main/dsl/seed/scripts/install_quarkus.sh)

echo "Update project with Quarkus version ${QUARKUS_VERSION}"

Expand Down
18 changes: 9 additions & 9 deletions .ci/environments/quarkus-3/patches/0001_before_sh.patch
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
diff --git a/kogito-quarkus-examples/decisiontable-quarkus-example/pom.xml b/kogito-quarkus-examples/decisiontable-quarkus-example/pom.xml
index c584434b6..0d15bd47c 100644
index 92e822874..08583b0b5 100644
--- a/kogito-quarkus-examples/decisiontable-quarkus-example/pom.xml
+++ b/kogito-quarkus-examples/decisiontable-quarkus-example/pom.xml
@@ -10,15 +10,15 @@
Expand All @@ -16,10 +16,10 @@ index c584434b6..0d15bd47c 100644
<kogito.bom.artifact-id>kogito-bom</kogito.bom.artifact-id>
- <kogito.bom.version>2.0.0-SNAPSHOT</kogito.bom.version>
- <version.org.kie.kogito>2.0.0-SNAPSHOT</version.org.kie.kogito>
- <version.org.drools>8.44.0-SNAPSHOT</version.org.drools>
- <version.org.drools>8.45.0-SNAPSHOT</version.org.drools>
+ <kogito.bom.version>3.0.0-SNAPSHOT</kogito.bom.version>
+ <version.org.kie.kogito>3.0.0-SNAPSHOT</version.org.kie.kogito>
+ <version.org.drools>9.44.0-SNAPSHOT</version.org.drools>
+ <version.org.drools>9.45.0-SNAPSHOT</version.org.drools>
</properties>
<dependencyManagement>
<dependencies>
Expand Down Expand Up @@ -596,7 +596,7 @@ index 2f98e7371..7e08d7b26 100644
import org.kie.kogito.flexible.example.model.State;
import org.kie.kogito.flexible.example.model.SupportCase;
diff --git a/kogito-quarkus-examples/kogito-travel-agency/basic/pom.xml b/kogito-quarkus-examples/kogito-travel-agency/basic/pom.xml
index ef3c38177..0bd6d027c 100644
index ed8b1ecb5..cf2f43d32 100644
--- a/kogito-quarkus-examples/kogito-travel-agency/basic/pom.xml
+++ b/kogito-quarkus-examples/kogito-travel-agency/basic/pom.xml
@@ -12,15 +12,15 @@
Expand All @@ -613,10 +613,10 @@ index ef3c38177..0bd6d027c 100644
<kogito.bom.artifact-id>kogito-bom</kogito.bom.artifact-id>
- <kogito.bom.version>2.0.0-SNAPSHOT</kogito.bom.version>
- <version.org.kie.kogito>2.0.0-SNAPSHOT</version.org.kie.kogito>
- <version.org.drools>8.44.0-SNAPSHOT</version.org.drools>
- <version.org.drools>8.45.0-SNAPSHOT</version.org.drools>
+ <kogito.bom.version>3.0.0-SNAPSHOT</kogito.bom.version>
+ <version.org.kie.kogito>3.0.0-SNAPSHOT</version.org.kie.kogito>
+ <version.org.drools>9.44.0-SNAPSHOT</version.org.drools>
+ <version.org.drools>9.45.0-SNAPSHOT</version.org.drools>
</properties>
<dependencyManagement>
<dependencies>
Expand Down Expand Up @@ -722,7 +722,7 @@ index c95c81251..6040d3fe5 100644
<dependencyManagement>
<dependencies>
diff --git a/kogito-quarkus-examples/kogito-travel-agency/extended/travels/pom.xml b/kogito-quarkus-examples/kogito-travel-agency/extended/travels/pom.xml
index 7495c8277..2c080c04b 100644
index 374e4df4b..b5e351b15 100644
--- a/kogito-quarkus-examples/kogito-travel-agency/extended/travels/pom.xml
+++ b/kogito-quarkus-examples/kogito-travel-agency/extended/travels/pom.xml
@@ -10,15 +10,15 @@
Expand All @@ -739,10 +739,10 @@ index 7495c8277..2c080c04b 100644
<kogito.bom.artifact-id>kogito-bom</kogito.bom.artifact-id>
- <kogito.bom.version>2.0.0-SNAPSHOT</kogito.bom.version>
- <version.org.kie.kogito>2.0.0-SNAPSHOT</version.org.kie.kogito>
- <version.org.drools>8.44.0-SNAPSHOT</version.org.drools>
- <version.org.drools>8.45.0-SNAPSHOT</version.org.drools>
+ <kogito.bom.version>3.0.0-SNAPSHOT</kogito.bom.version>
+ <version.org.kie.kogito>3.0.0-SNAPSHOT</version.org.kie.kogito>
+ <version.org.drools>9.44.0-SNAPSHOT</version.org.drools>
+ <version.org.drools>9.45.0-SNAPSHOT</version.org.drools>
</properties>
<dependencyManagement>
<dependencies>
Expand Down
2 changes: 1 addition & 1 deletion .ci/environments/quarkus-3/quarkus3.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ recipeList:
key: quarkus.platform.version
}
- org.openrewrite.maven.ChangePropertyValue: {
newValue: 9.44.0-SNAPSHOT,
newValue: 9.45.0-SNAPSHOT,
key: version.org.drools
}
- org.openrewrite.maven.ChangePropertyValue: {
Expand Down
2 changes: 1 addition & 1 deletion .ci/environments/update.sh
Original file line number Diff line number Diff line change
Expand Up @@ -44,4 +44,4 @@ if [ -f "${env_path}/after.sh" ]; then
fi

# Download `setup_integration_branch` script and execute
curl -s https://github.com/raw/kiegroup/kogito-pipelines/main/dsl/seed/scripts/setup_integration_branch.sh | bash
curl -s https://github.com/raw/apache/incubator-kie-kogito-pipelines/main/dsl/seed/scripts/setup_integration_branch.sh | bash
41 changes: 41 additions & 0 deletions .ci/jenkins/Jenkinsfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,41 @@
@Library('jenkins-pipeline-shared-libraries')_

pr_check_script = null

pipeline {
agent {
label 'ubuntu'
}
options {
timestamps()
timeout(time: 480, unit: 'MINUTES')
disableConcurrentBuilds(abortPrevious: true)
}
environment {
BUILDCHAIN_PROJECT = 'apache/incubator-kie-kogito-examples'

KOGITO_EXAMPLES_BUILD_MVN_OPTS = '-Dvalidate-formatting'
}
stages {
stage('Initialize') {
steps {
script {
// load `pr_check.groovy` file from kogito-pipelines:main
dir('kogito-pipelines') {
checkout(githubscm.resolveRepository('incubator-kie-kogito-pipelines', 'apache', 'main', false, 'ASF_Cloudbees_Jenkins_ci-builds'))
pr_check_script = load 'dsl/scripts/pr_check.groovy'
}
}
}
}
stage('PR check') {
steps {
script {
dir('kogito-pipelines') {
pr_check_script.launch()
}
}
}
}
}
}
29 changes: 9 additions & 20 deletions .ci/jenkins/Jenkinsfile.deploy
Original file line number Diff line number Diff line change
Expand Up @@ -10,33 +10,22 @@ examplesHelper = null

pipeline {
agent {
label 'kie-rhel8 && docker && kie-mem16g && !built-in'
}

tools {
maven env.BUILD_MAVEN_TOOL
jdk env.BUILD_JDK_TOOL
docker {
image env.AGENT_DOCKER_BUILDER_IMAGE
args env.AGENT_DOCKER_BUILDER_ARGS
}
}

options {
timestamps()
timeout(time: 180, unit: 'MINUTES')
}

// parameters {
// For parameters, check into ./dsl/jobs.groovy file
// }

environment {
// Static env is defined into ./dsl/jobs.groovy file

KOGITO_CI_EMAIL_TO = credentials("${JENKINS_EMAIL_CREDS_ID}")

// Keep here for visitibility
MAVEN_OPTS = '-Xms1024m -Xmx4g'

PR_BRANCH_HASH = "${util.generateHash(10)}"
MAVEN_DEPLOY_LOCAL_DIR = "${WORKSPACE}/maven_deploy_dir"
MAVEN_DEPLOY_LOCAL_DIR = "/tmp/maven_deploy_dir"
}

stages {
Expand Down Expand Up @@ -132,7 +121,7 @@ pipeline {
if (params.SKIP_TESTS) {
mvnCmd.skipTests() // Conflict somehow with Python testing. If `skipTests={anyvalue}` is set, then exec plugin is not executed ...
}
util.runWithPythonVirtualEnv(mvnCmd.getFullRunCommand('clean install'), 'swf')
mvnCmd.run('clean install')
}
}
}
Expand Down Expand Up @@ -259,7 +248,7 @@ void commitAndCreatePR() {
prBody += '\nPlease review and merge.'
}
// Not using githubscm.commitChanges() because globbing won't work.
// See: https://github.com/kiegroup/kogito-runtimes/pull/570#discussion_r449268738
// See: https://github.com/apache/incubator-kie-kogito-runtimes/pull/570#discussion_r449268738
addNotIgnoredPoms()
sh "git commit -m '${commitMsg}'"
githubscm.pushObject('origin', getPRBranch(), getGitAuthorCredsID())
Expand All @@ -275,7 +264,7 @@ boolean shouldStageArtifacts() {
}

boolean shouldDeployToRepository() {
return env.MAVEN_DEPLOY_REPOSITORY && env.MAVEN_REPO_CREDS_ID && getGitAuthor() == 'kiegroup'
return env.MAVEN_DEPLOY_REPOSITORY && env.MAVEN_REPO_CREDS_ID && getGitAuthor() == 'apache'
}

boolean isRelease() {
Expand Down Expand Up @@ -347,7 +336,7 @@ void runMavenDeploy(boolean localDeployment = false) {

mvnCmd.skipTests(true).run('clean deploy')

util.runWithPythonVirtualEnv(mvnCmd.skipTests(true).getFullRunCommand('clean deploy'), 'swf')
mvnCmd.skipTests(true).run('clean deploy')
}

void runMavenStage() {
Expand Down
23 changes: 4 additions & 19 deletions .ci/jenkins/Jenkinsfile.post-release
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,10 @@ import org.jenkinsci.plugins.workflow.libs.Library

pipeline {
agent {
label 'kie-rhel8 && !built-in'
}

tools {
maven env.BUILD_MAVEN_TOOL
jdk env.BUILD_JDK_TOOL
docker {
image env.AGENT_DOCKER_BUILDER_IMAGE
args env.AGENT_DOCKER_BUILDER_ARGS
}
}

options {
Expand All @@ -19,7 +17,6 @@ pipeline {

environment {
CI_EMAIL_TO = credentials("${JENKINS_EMAIL_CREDS_ID}")
GITHUB_CLI_VERSION = '0.11.1'
}

stages {
Expand All @@ -34,10 +31,7 @@ pipeline {

// Verify version is set and if on right release branch
assert getProjectVersion()

assert getBuildBranch() == util.getReleaseBranchFromVersion(getProjectVersion())

installGithubCLI()
}
}
}
Expand Down Expand Up @@ -112,15 +106,6 @@ void checkoutTag(String repo, String tagName, String localBranchName = tagName)
sh "git checkout tags/${tagName} -b ${localBranchName}"
}

void installGithubCLI() {
sh """
wget https://github.com/cli/cli/releases/download/v${env.GITHUB_CLI_VERSION}/gh_${env.GITHUB_CLI_VERSION}_linux_amd64.tar.gz
tar xzf gh_${env.GITHUB_CLI_VERSION}_linux_amd64.tar.gz
mv gh_${env.GITHUB_CLI_VERSION}_linux_amd64/bin/gh .
rm -r gh_${env.GITHUB_CLI_VERSION}_linux_amd64*
"""
}

void setDefaultBranch(String defaultBranch) {
withCredentials([string(credentialsId: env.GITHUB_TOKEN_CREDS_ID, variable: 'GITHUB_TOKEN')]) {
// gh command from https://github.com/cli/cli/issues/929#issuecomment-629253585
Expand Down
5 changes: 4 additions & 1 deletion .ci/jenkins/Jenkinsfile.promote
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,10 @@ examplesHelper = null

pipeline {
agent {
label 'rhel8 && !built-in'
docker {
image env.AGENT_DOCKER_BUILDER_IMAGE
args env.AGENT_DOCKER_BUILDER_ARGS
}
}

options {
Expand Down
15 changes: 7 additions & 8 deletions .ci/jenkins/Jenkinsfile.quarkus-3.rewrite.pr
Original file line number Diff line number Diff line change
Expand Up @@ -8,11 +8,10 @@ changeTarget = env.ghprbTargetBranch ?: CHANGE_TARGET

pipeline {
agent {
label 'kie-rhel8 && docker && kie-mem16g && !built-in'
}
tools {
maven env.BUILD_MAVEN_TOOL
jdk env.BUILD_JDK_TOOL
docker {
image env.AGENT_DOCKER_BUILDER_IMAGE
args env.AGENT_DOCKER_BUILDER_ARGS
}
}
options {
timestamps()
Expand All @@ -38,9 +37,9 @@ pipeline {
stage('Build upstream projects') {
steps {
script {
[ 'drools', 'kogito-runtimes', 'kogito-apps' ].each { project ->
[ 'incubator-kie-drools', 'incubator-kie-kogito-runtimes', 'incubator-kie-kogito-apps' ].each { project ->
dir(project) {
githubscm.checkoutIfExists(project, changeAuthor, changeBranch, 'kiegroup', changeTarget, true)
githubscm.checkoutIfExists(project, changeAuthor, changeBranch, 'apache', changeTarget, true)
sh '.ci/environments/update.sh quarkus-3'
getMavenCommand().withProperty('quickly').run('clean install')
}
Expand All @@ -56,7 +55,7 @@ pipeline {
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}"

util.runWithPythonVirtualEnv('.ci/environments/quarkus-3/before.sh rewrite', 'swf')
sh '.ci/environments/quarkus-3/before.sh rewrite'
}
}
}
Expand Down
14 changes: 6 additions & 8 deletions .ci/jenkins/Jenkinsfile.quarkus-3.rewrite.standalone
Original file line number Diff line number Diff line change
Expand Up @@ -7,12 +7,10 @@ previousHash = ''

pipeline {
agent {
label 'kie-rhel8 && docker && kie-mem16g && !built-in'
}

tools {
maven env.BUILD_MAVEN_TOOL
jdk env.BUILD_JDK_TOOL
docker {
image env.AGENT_DOCKER_BUILDER_IMAGE
args env.AGENT_DOCKER_BUILDER_ARGS
}
}

options {
Expand Down Expand Up @@ -57,7 +55,7 @@ pipeline {
stage('Build upstream projects') {
steps {
script {
[ 'drools', 'kogito-runtimes', 'kogito-apps' ].each { project ->
[ 'incubator-kie-drools', 'incubator-kie-kogito-runtimes', 'incubator-kie-kogito-apps' ].each { project ->
dir(project) {
githubscm.checkoutIfExists(project, getGitAuthor(), getBuildBranch(), getBaseAuthor(), getBaseBranch(), true)
sh '.ci/environments/update.sh quarkus-3'
Expand All @@ -75,7 +73,7 @@ pipeline {
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}"

util.runWithPythonVirtualEnv('.ci/environments/quarkus-3/before.sh rewrite', 'swf')
sh '.ci/environments/quarkus-3/before.sh rewrite'
}
}
}
Expand Down
Loading