This is an automated email from the ASF dual-hosted git repository.
porcelli pushed a commit to branch 10.0.x
in repository https://gitbox.apache.org/repos/asf/incubator-kie-tools.git
The following commit(s) were added to refs/heads/10.0.x by this push:
new 6a7bfed66c2 [10.0.x] Release job image upload fixes and updates (#2640)
6a7bfed66c2 is described below
commit 6a7bfed66c2057904f2d4063fc6c49df41d730ca
Author: Rodrigo Antunes <[email protected]>
AuthorDate: Thu Oct 3 20:00:26 2024 -0300
[10.0.x] Release job image upload fixes and updates (#2640)
Co-authored-by: Rodrigo Antunes <[email protected]>
---
.ci/jenkins/release-jobs/Jenkinsfile.extended-services | 7 ++++---
.ci/jenkins/release-jobs/Jenkinsfile.kie-sandbox | 4 ++--
.ci/jenkins/release-jobs/Jenkinsfile.kogito-swf-builder | 2 +-
.ci/jenkins/release-jobs/Jenkinsfile.kogito-swf-devmode | 2 +-
.ci/jenkins/release-jobs/Jenkinsfile.online-editor | 9 ++++++---
.../src/DmnMarshallerBackendCompatibilityTesterScript.java | 2 +-
6 files changed, 15 insertions(+), 11 deletions(-)
diff --git a/.ci/jenkins/release-jobs/Jenkinsfile.extended-services
b/.ci/jenkins/release-jobs/Jenkinsfile.extended-services
index 468f2b51d5e..3a6f13777b1 100644
--- a/.ci/jenkins/release-jobs/Jenkinsfile.extended-services
+++ b/.ci/jenkins/release-jobs/Jenkinsfile.extended-services
@@ -140,11 +140,12 @@ pipeline {
}
steps {
script {
- env.RELEASE_TAR_FILE =
"incubator-kie-${params.RELEASE_CANDIDATE_VERSION}-sandbox-extended-services-linux-x86.tar.gz"
+ env.RELEASE_ZIP_FILE =
"incubator-kie-${params.RELEASE_CANDIDATE_VERSION}-sandbox-extended-services-linux-x86.zip"
sh """#!/bin/bash -el
mkdir ${env.RELEASE_ARTIFACTS_DIR}
- cp
kie-tools/packages/extended-services/dist/linux/kie_sandbox_extended_services.tar.gz
"${env.RELEASE_ARTIFACTS_DIR}/${RELEASE_TAR_FILE}"
+ cd kie-tools/packages/extended-services/dist/linux
+ zip "${env.RELEASE_ARTIFACTS_DIR}/${env.RELEASE_ZIP_FILE}"
./kie_sandbox_extended_services
""".trim()
}
}
@@ -158,7 +159,7 @@ pipeline {
dir("${env.RELEASE_ARTIFACTS_DIR}") {
script {
releaseUtils.setupSigningKey("${pipelineVars.asfReleaseGPGKeyCredentialsId}")
- releaseUtils.signArtifact("${RELEASE_TAR_FILE}")
+ releaseUtils.signArtifact("${RELEASE_ZIP_FILE}")
}
}
}
diff --git a/.ci/jenkins/release-jobs/Jenkinsfile.kie-sandbox
b/.ci/jenkins/release-jobs/Jenkinsfile.kie-sandbox
index 073f79e2d58..411d090958b 100644
--- a/.ci/jenkins/release-jobs/Jenkinsfile.kie-sandbox
+++ b/.ci/jenkins/release-jobs/Jenkinsfile.kie-sandbox
@@ -159,7 +159,7 @@ pipeline {
stage('Push kie-sandbox-image to Docker Hub') {
when {
- expression { !params.DRY_RUN }
+ expression { !params.DRY_RUN &&
params.RELEASE_CANDIDATE_VERSION == '' }
}
steps {
script {
@@ -217,7 +217,7 @@ pipeline {
sh """#!/bin/bash -el
mkdir ${env.RELEASE_ARTIFACTS_DIR}
- docker save
"${env.KIE_SANDBOX__imageRegistry}/${env.KIE_SANDBOX__imageAccount}/${env.KIE_SANDBOX__imageName}:${params.RELEASE_VERSION}"
| gzip > "${env.RELEASE_ARTIFACTS_DIR}/${env.RELEASE_IMAGE_TAR_FILE}"
+ docker save
"${env.KIE_SANDBOX_WEBAPP_IMAGE__imageRegistry}/${env.KIE_SANDBOX_WEBAPP_IMAGE__imageAccount}/${env.KIE_SANDBOX_WEBAPP_IMAGE__imageName}:${params.RELEASE_VERSION}"
| gzip > "${env.RELEASE_ARTIFACTS_DIR}/${env.RELEASE_IMAGE_TAR_FILE}"
""".trim()
}
}
diff --git a/.ci/jenkins/release-jobs/Jenkinsfile.kogito-swf-builder
b/.ci/jenkins/release-jobs/Jenkinsfile.kogito-swf-builder
index 6b06dbb3fe8..91013860052 100644
--- a/.ci/jenkins/release-jobs/Jenkinsfile.kogito-swf-builder
+++ b/.ci/jenkins/release-jobs/Jenkinsfile.kogito-swf-builder
@@ -193,7 +193,7 @@ pipeline {
sh """#!/bin/bash -el
mkdir ${env.RELEASE_ARTIFACTS_DIR}
- docker save
"${env.KOGITO_SWF_BUILDER_IMAGE__registry}/${env.KOGITO_SWF_BUILDER_IMAGE__account}/${env.KOGITO_SWF_BUILDER_IMAGE__name}:${params.RELEASE_VERSION}"
| gzip > "${env.RELEASE_ARTIFACTS_DIR}/${env.RELEASE_IMAGE_TAR_FILE}"
+ docker save
"${env.SONATAFLOW_BUILDER_IMAGE__registry}/${env.SONATAFLOW_BUILDER_IMAGE__account}/${env.SONATAFLOW_BUILDER_IMAGE__name}:${params.RELEASE_VERSION}"
| gzip > "${env.RELEASE_ARTIFACTS_DIR}/${env.RELEASE_IMAGE_TAR_FILE}"
""".trim()
}
}
diff --git a/.ci/jenkins/release-jobs/Jenkinsfile.kogito-swf-devmode
b/.ci/jenkins/release-jobs/Jenkinsfile.kogito-swf-devmode
index de98a175c7a..12e1e291cb3 100644
--- a/.ci/jenkins/release-jobs/Jenkinsfile.kogito-swf-devmode
+++ b/.ci/jenkins/release-jobs/Jenkinsfile.kogito-swf-devmode
@@ -193,7 +193,7 @@ pipeline {
sh """#!/bin/bash -el
mkdir ${env.RELEASE_ARTIFACTS_DIR}
- docker save
"${env.KOGITO_SWF_DEVMODE_IMAGE__registry}/${env.KOGITO_SWF_DEVMODE_IMAGE__account}/${env.KOGITO_SWF_DEVMODE_IMAGE__name}:${params.RELEASE_VERSION}"
| gzip > "${env.RELEASE_ARTIFACTS_DIR}/${env.RELEASE_IMAGE_TAR_FILE}"
+ docker save
"${env.SONATAFLOW_DEVMODE_IMAGE__registry}/${env.SONATAFLOW_DEVMODE_IMAGE__account}/${env.SONATAFLOW_DEVMODE_IMAGE__name}:${params.RELEASE_VERSION}"
| gzip > "${env.RELEASE_ARTIFACTS_DIR}/${env.RELEASE_IMAGE_TAR_FILE}"
""".trim()
}
}
diff --git a/.ci/jenkins/release-jobs/Jenkinsfile.online-editor
b/.ci/jenkins/release-jobs/Jenkinsfile.online-editor
index 7b5fa1e67bd..dc17a9c79d0 100644
--- a/.ci/jenkins/release-jobs/Jenkinsfile.online-editor
+++ b/.ci/jenkins/release-jobs/Jenkinsfile.online-editor
@@ -200,10 +200,12 @@ pipeline {
}
steps {
script {
- env.RELEASE_ZIP_FILE =
"incubator-kie-${params.RELEASE_CANDIDATE_VERSION}-sandbox-webapp.zip"
+ env.ONLINE_EDITOR_RELEASE_ZIP_FILE =
"incubator-kie-${params.RELEASE_CANDIDATE_VERSION}-sandbox-webapp.zip"
+ env.STUNNER_EDITORS_RELEASE_ZIP_FILE =
"incubator-kie-${params.RELEASE_CANDIDATE_VERSION}-stunner-editors.zip"
sh """#!/bin/bash -el
mkdir ${env.RELEASE_ARTIFACTS_DIR}
- cd kie-tools/packages/online-editor/dist && zip -r
"${env.RELEASE_ARTIFACTS_DIR}/${env.RELEASE_ZIP_FILE}" .
+ cd kie-tools/packages/online-editor/dist && zip -r
"${env.RELEASE_ARTIFACTS_DIR}/${env.ONLINE_EDITOR_RELEASE_ZIP_FILE}" .
+ cd kie-tools/packages/stunner-editors/dist && zip -r
"${env.RELEASE_ARTIFACTS_DIR}/${env.STUNNER_EDITORS_RELEASE_ZIP_FILE}" .
""".trim()
}
}
@@ -217,7 +219,8 @@ pipeline {
dir("${env.RELEASE_ARTIFACTS_DIR}") {
script {
releaseUtils.setupSigningKey("${pipelineVars.asfReleaseGPGKeyCredentialsId}")
- releaseUtils.signArtifact("${env.RELEASE_ZIP_FILE}")
+
releaseUtils.signArtifact("${env.ONLINE_EDITOR_RELEASE_ZIP_FILE}")
+
releaseUtils.signArtifact("${env.STUNNER_EDITORS_RELEASE_ZIP_FILE}")
}
}
}
diff --git
a/packages/dmn-marshaller-backend-compatibility-tester/src/DmnMarshallerBackendCompatibilityTesterScript.java
b/packages/dmn-marshaller-backend-compatibility-tester/src/DmnMarshallerBackendCompatibilityTesterScript.java
index 92d7b3302ca..93b22b4aa1b 100644
---
a/packages/dmn-marshaller-backend-compatibility-tester/src/DmnMarshallerBackendCompatibilityTesterScript.java
+++
b/packages/dmn-marshaller-backend-compatibility-tester/src/DmnMarshallerBackendCompatibilityTesterScript.java
@@ -19,7 +19,7 @@
///usr/bin/env jbang "$0" "$@" ; exit $?
//JAVA 17
-//REPOS
mavencentral,apache=https://repository.apache.org/content/groups/public/,drools=https://repository.apache.org/content/repositories/orgapachekie-1005/
+//REPOS
mavencentral,apache=https://repository.apache.org/content/groups/public/,drools=https://repository.apache.org/content/repositories/orgapachekie-1046/
//DEPS ch.qos.logback:logback-classic:1.2.13
//DEPS info.picocli:picocli:4.7.5
//DEPS org.slf4j:slf4j-simple:2.0.12
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
