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 b92acbe7df4 [10.0.x] NO-ISSUE: Release jobs fixes (#2732)
b92acbe7df4 is described below
commit b92acbe7df47f335345cd8d21eea79e033137e04
Author: Rodrigo Antunes <[email protected]>
AuthorDate: Fri Nov 8 10:12:43 2024 -0300
[10.0.x] NO-ISSUE: Release jobs fixes (#2732)
Co-authored-by: Rodrigo Antunes <[email protected]>
---
.ci/jenkins/release-jobs/Jenkinsfile.chrome-extensions | 4 ++--
.ci/jenkins/release-jobs/Jenkinsfile.cors-proxy | 16 ----------------
.ci/jenkins/release-jobs/Jenkinsfile.extended-services | 4 ++--
.ci/jenkins/release-jobs/Jenkinsfile.kn-plugin-workflow | 4 ++--
.../release-jobs/Jenkinsfile.kogito-serverless-operator | 2 +-
.ci/jenkins/release-jobs/Jenkinsfile.npm-packages | 2 +-
.ci/jenkins/release-jobs/Jenkinsfile.online-editor | 4 ++--
.../release-jobs/Jenkinsfile.standalone-editors-cdn | 4 ++--
.ci/jenkins/shared-scripts/releaseUtils.groovy | 7 ++++---
9 files changed, 16 insertions(+), 31 deletions(-)
diff --git a/.ci/jenkins/release-jobs/Jenkinsfile.chrome-extensions
b/.ci/jenkins/release-jobs/Jenkinsfile.chrome-extensions
index b9ce0cbd2a0..9a43d84af60 100644
--- a/.ci/jenkins/release-jobs/Jenkinsfile.chrome-extensions
+++ b/.ci/jenkins/release-jobs/Jenkinsfile.chrome-extensions
@@ -172,8 +172,8 @@ pipeline {
cp -r
kie-tools/packages/chrome-extension-serverless-workflow-editor/dist/{fonts,diagram,*-envelope.*,*.bundle.js,*.worker.js}
"${RELEASE_CANDIDATE_ARTIFACTS_DIR}/sonataflow-chrome-extension-editors"
cp
"kie-tools/packages/chrome-extension-pack-kogito-kie-editors/dist/chrome_extension_kogito_kie_editors_${params.RELEASE_VERSION}.zip"
"${RELEASE_CANDIDATE_ARTIFACTS_DIR}/${CHROME_EXTENCHROME_EXTENSION_RELEASE_FILE}"
cp
"kie-tools/packages/chrome-extension-serverless-workflow-editor/dist/chrome_extension_serverless_workflow_editor_${params.RELEASE_VERSION}.zip"
"${RELEASE_CANDIDATE_ARTIFACTS_DIR}/${SWF_CHROME_EXTENSION_RELEASE_FILE}"
- cp "${LEGAL_FILES_DIR}/*"
${RELEASE_CANDIDATE_ARTIFACTS_DIR}/business-automation-chrome-extension-editors
- cp "${LEGAL_FILES_DIR}/*"
${RELEASE_CANDIDATE_ARTIFACTS_DIR}/sonataflow-chrome-extension-editors
+ cp -r "${LEGAL_FILES_DIR}/."
${RELEASE_CANDIDATE_ARTIFACTS_DIR}/business-automation-chrome-extension-editors
+ cp -r "${LEGAL_FILES_DIR}/."
${RELEASE_CANDIDATE_ARTIFACTS_DIR}/sonataflow-chrome-extension-editors
cd
"${RELEASE_CANDIDATE_ARTIFACTS_DIR}/business-automation-chrome-extension-editors"
&& zip -r
"${RELEASE_CANDIDATE_ARTIFACTS_DIR}/${CHROME_EXTENSION_EDITORS_RELEASE_FILE}" .
cd
"${RELEASE_CANDIDATE_ARTIFACTS_DIR}/sonataflow-chrome-extension-editors" && zip
-r
"${RELEASE_CANDIDATE_ARTIFACTS_DIR}/${SWF_CHROME_EXTENSION_EDITORS_RELEASE_FILE}"
.
rm -rf
"${RELEASE_CANDIDATE_ARTIFACTS_DIR}/business-automation-chrome-extension-editors"
diff --git a/.ci/jenkins/release-jobs/Jenkinsfile.cors-proxy
b/.ci/jenkins/release-jobs/Jenkinsfile.cors-proxy
index c69fc35b119..0b6cf15c4c5 100644
--- a/.ci/jenkins/release-jobs/Jenkinsfile.cors-proxy
+++ b/.ci/jenkins/release-jobs/Jenkinsfile.cors-proxy
@@ -225,22 +225,6 @@ pipeline {
}
}
- stage('Push release candidate artifacts to the staging SVN') {
- when {
- expression { !params.DRY_RUN && params.JOB_TYPE ==
'release-candidate' }
- }
- steps {
- script {
- releaseUtils.publishArtifacts(
- "${RELEASE_CANDIDATE_ARTIFACTS_DIR}",
- "${pipelineVars.asfReleaseStagingRepository}",
- "${params.RELEASE_CANDIDATE_VERSION}",
- "${pipelineVars.asfReleaseSVNStagingCredentialsId}"
- )
- }
- }
- }
-
stage('Download release candidate artifacts from the staging SVN') {
when {
expression { !params.DRY_RUN && params.JOB_TYPE ==
'release-promote' }
diff --git a/.ci/jenkins/release-jobs/Jenkinsfile.extended-services
b/.ci/jenkins/release-jobs/Jenkinsfile.extended-services
index 4a58ed00475..1c16f723b0a 100644
--- a/.ci/jenkins/release-jobs/Jenkinsfile.extended-services
+++ b/.ci/jenkins/release-jobs/Jenkinsfile.extended-services
@@ -157,7 +157,7 @@ pipeline {
script {
sh """#!/bin/bash -el
mkdir ${RELEASE_CANDIDATE_ARTIFACTS_DIR}
- cp "${LEGAL_FILES_DIR}/*"
kie-tools/packages/extended-services/dist/linux
+ cp -r "${LEGAL_FILES_DIR}/."
kie-tools/packages/extended-services/dist/linux
cd kie-tools/packages/extended-services/dist/linux
zip
"${RELEASE_CANDIDATE_ARTIFACTS_DIR}/${EXTENDED_SERVICES_LINUX_X86_RELEASE_FILE}"
./kie_sandbox_extended_services ./NOTICE ./LICENSE ./DISCLAIMER-WIP
""".trim()
@@ -170,7 +170,7 @@ pipeline {
expression { !params.DRY_RUN && params.JOB_TYPE ==
'release-candidate' }
}
steps {
- dir("${RELEASE_ARTIFACTS_DIR}") {
+ dir("${RELEASE_CANDIDATE_ARTIFACTS_DIR}") {
script {
releaseUtils.setupSigningKey("${pipelineVars.asfReleaseGPGKeyCredentialsId}")
releaseUtils.signArtifact("${EXTENDED_SERVICES_LINUX_X86_RELEASE_FILE}")
diff --git a/.ci/jenkins/release-jobs/Jenkinsfile.kn-plugin-workflow
b/.ci/jenkins/release-jobs/Jenkinsfile.kn-plugin-workflow
index 0b78d7fe8a9..95a1bded4db 100644
--- a/.ci/jenkins/release-jobs/Jenkinsfile.kn-plugin-workflow
+++ b/.ci/jenkins/release-jobs/Jenkinsfile.kn-plugin-workflow
@@ -175,7 +175,7 @@ pipeline {
script {
sh """#!/bin/bash -el
mkdir ${RELEASE_CANDIDATE_ARTIFACTS_DIR}
- cp "${LEGAL_FILES_DIR}/*"
kie-tools/packages/kn-plugin-workflow/dist
+ cp -r "${LEGAL_FILES_DIR}/."
kie-tools/packages/kn-plugin-workflow/dist
cd kie-tools/packages/kn-plugin-workflow/dist
zip
"${RELEASE_CANDIDATE_ARTIFACTS_DIR}/${KN_PLUGIN_LINUX_X86_RELEASE_FILE}"
./kn-workflow-linux-amd64 ./NOTICE ./LICENSE ./DISCLAIMER-WIP
zip
"${RELEASE_CANDIDATE_ARTIFACTS_DIR}/${KN_PLUGIN_MACOS_ARM_RELEASE_FILE}"
./kn-workflow-darwin-arm64 ./NOTICE ./LICENSE ./DISCLAIMER-WIP
@@ -191,7 +191,7 @@ pipeline {
expression { !params.DRY_RUN && params.JOB_TYPE ==
'release-candidate' }
}
steps {
- dir("${RELEASE_ARTIFACTS_DIR}") {
+ dir("${RELEASE_CANDIDATE_ARTIFACTS_DIR}") {
script {
releaseUtils.setupSigningKey("${pipelineVars.asfReleaseGPGKeyCredentialsId}")
releaseUtils.signArtifact("${KN_PLUGIN_LINUX_X86_RELEASE_FILE}")
diff --git a/.ci/jenkins/release-jobs/Jenkinsfile.kogito-serverless-operator
b/.ci/jenkins/release-jobs/Jenkinsfile.kogito-serverless-operator
index 84a509b1f61..0b112df373f 100644
--- a/.ci/jenkins/release-jobs/Jenkinsfile.kogito-serverless-operator
+++ b/.ci/jenkins/release-jobs/Jenkinsfile.kogito-serverless-operator
@@ -202,7 +202,7 @@ pipeline {
sh """#!/bin/bash -el
mkdir ${RELEASE_CANDIDATE_ARTIFACTS_DIR}
docker save
"${SONATAFLOW_OPERATOR__registry}/${SONATAFLOW_OPERATOR__account}/${SONATAFLOW_OPERATOR__name}:${params.RELEASE_VERSION}"
| gzip > "${RELEASE_CANDIDATE_ARTIFACTS_DIR}/${IMAGE_RELEASE_FILE}"
- cp "${LEGAL_FILES_DIR}/*"
kie-tools/packages/sonataflow-operator
+ cp -r "${LEGAL_FILES_DIR}/."
kie-tools/packages/sonataflow-operator
cd kie-tools/packages/sonataflow-operator && zip
"${RELEASE_CANDIDATE_ARTIFACTS_DIR}/${OPERATOR_RELEASE_FILE}" ./operator.yaml
./NOTICE ./LICENSE ./DISCLAIMER-WIP
""".trim()
releaseUtils.addLegalfilesToTarGzFile("${RELEASE_CANDIDATE_ARTIFACTS_DIR}",
"${IMAGE_RELEASE_FILE}", "${LEGAL_FILES_DIR}")
diff --git a/.ci/jenkins/release-jobs/Jenkinsfile.npm-packages
b/.ci/jenkins/release-jobs/Jenkinsfile.npm-packages
index d2d223cb7af..8608abdde7f 100644
--- a/.ci/jenkins/release-jobs/Jenkinsfile.npm-packages
+++ b/.ci/jenkins/release-jobs/Jenkinsfile.npm-packages
@@ -166,7 +166,7 @@ pipeline {
PNPM_FILTER_STRING_FOR_PUBLISHING=\$(pnpm -r exec
'bash' '-c' 'PKG_NAME=\$(jq -r ".name" package.json) PKG_IS_PVT=\$(jq -r
".private" package.json); if [[ "\$PKG_IS_PVT" != "true" ]]; then echo "-F
\$PKG_NAME"; fi')
echo \$PNPM_FILTER_STRING_FOR_PUBLISHING
pnpm \$PNPM_FILTER_STRING_FOR_PUBLISHING exec 'bash'
'-c' 'pnpm pack --pack-destination ${TMP_RELEASE_CANDIDATE_ARTIFACTS_DIR}'
- cp "${LEGAL_FILES_DIR}/*"
"${TMP_RELEASE_CANDIDATE_ARTIFACTS_DIR}"
+ cp -r "${LEGAL_FILES_DIR}/."
"${TMP_RELEASE_CANDIDATE_ARTIFACTS_DIR}"
cd "${TMP_RELEASE_CANDIDATE_ARTIFACTS_DIR}" && zip -r
"${RELEASE_CANDIDATE_ARTIFACTS_DIR}/${RELEASE_FILE}" .
""".trim()
}
diff --git a/.ci/jenkins/release-jobs/Jenkinsfile.online-editor
b/.ci/jenkins/release-jobs/Jenkinsfile.online-editor
index 0ddd2146d7f..9b710a6533d 100644
--- a/.ci/jenkins/release-jobs/Jenkinsfile.online-editor
+++ b/.ci/jenkins/release-jobs/Jenkinsfile.online-editor
@@ -173,8 +173,8 @@ pipeline {
script {
sh """#!/bin/bash -el
mkdir ${RELEASE_CANDIDATE_ARTIFACTS_DIR}
- cp "${LEGAL_FILES_DIR}/*"
"${WORKSPACE}/kie-tools/packages/online-editor/dist"
- cp "${LEGAL_FILES_DIR}/*"
"${WORKSPACE}/kie-tools/packages/stunner-editors/dist"
+ cp -r "${LEGAL_FILES_DIR}/."
"${WORKSPACE}/kie-tools/packages/online-editor/dist"
+ cp -r "${LEGAL_FILES_DIR}/."
"${WORKSPACE}/kie-tools/packages/stunner-editors/dist"
cd "${WORKSPACE}/kie-tools/packages/online-editor/dist" &&
zip -r "${RELEASE_CANDIDATE_ARTIFACTS_DIR}/${ONLINE_EDITOR_RELEASE_FILE}" .
cd "${WORKSPACE}/kie-tools/packages/stunner-editors/dist"
&& zip -r "${RELEASE_CANDIDATE_ARTIFACTS_DIR}/${STUNNER_EDITORS_RELEASE_FILE}" .
""".trim()
diff --git a/.ci/jenkins/release-jobs/Jenkinsfile.standalone-editors-cdn
b/.ci/jenkins/release-jobs/Jenkinsfile.standalone-editors-cdn
index 56866fbe9b2..b609a806faf 100644
--- a/.ci/jenkins/release-jobs/Jenkinsfile.standalone-editors-cdn
+++ b/.ci/jenkins/release-jobs/Jenkinsfile.standalone-editors-cdn
@@ -154,8 +154,8 @@ pipeline {
script {
sh """#!/bin/bash -el
mkdir ${RELEASE_CANDIDATE_ARTIFACTS_DIR}
- cp "${LEGAL_FILES_DIR}/*"
"${WORKSPACE}/kie-tools/packages/kie-editors-standalone/dist"
- cp "${LEGAL_FILES_DIR}/*"
"${WORKSPACE}/kie-tools/packages/serverless-workflow-standalone-editor/dist"
+ cp -r "${LEGAL_FILES_DIR}/."
"${WORKSPACE}/kie-tools/packages/kie-editors-standalone/dist"
+ cp -r "${LEGAL_FILES_DIR}/."
"${WORKSPACE}/kie-tools/packages/serverless-workflow-standalone-editor/dist"
cd
"${WORKSPACE}/kie-tools/packages/kie-editors-standalone/dist" && zip -r
"${RELEASE_CANDIDATE_ARTIFACTS_DIR}/${BUSINESS_AUTOMATION_STANDALONE_RELEASE_FILE}"
.
cd
"${WORKSPACE}/kie-tools/packages/serverless-workflow-standalone-editor/dist" &&
zip -r
"${RELEASE_CANDIDATE_ARTIFACTS_DIR}/${SONATAFLOW_STANDALONE_RELEASE_FILE}" .
""".trim()
diff --git a/.ci/jenkins/shared-scripts/releaseUtils.groovy
b/.ci/jenkins/shared-scripts/releaseUtils.groovy
index 70d6449d6e8..fd02253e1a0 100644
--- a/.ci/jenkins/shared-scripts/releaseUtils.groovy
+++ b/.ci/jenkins/shared-scripts/releaseUtils.groovy
@@ -117,9 +117,10 @@ def addLegalfilesToTarGzFile(String artifactsDir, String
tarGzFile, String legal
tarFile = tarGzFile.replace('.gz', '')
sh """#!/bin/bash -el
cd ${legalFilesDir}
- zcat ${artifactsDir}/${tarGzFile} | dd of=${tarFile} bs=512 skip=1
- tar -rvf ${tarFile} ./LICENSE ./NOTICE ./DISCLAIMER-WIP
- gzip -q -c ${tarFile} > ${artifactsDir}/${tarGzFile}
+ gzip -q -d ${artifactsDir}/${tarGzFile}
+ tar -rvf ${artifactsDir}/${tarFile} ./LICENSE ./NOTICE ./DISCLAIMER-WIP
+ gzip -q -c ${artifactsDir}/${tarFile} > ${artifactsDir}/${tarGzFile}
+ rm -rf ${artifactsDir}/${tarFile}
""".trim()
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
