[10.0.x] NO-ISSUE: Release job fixes (#2736)

Co-authored-by: Rodrigo Antunes <rantunes@redhat.com>
apache · Nov 8, 2024 · 6d85adb · 6d85adb
1 parent b92acbe
commit 6d85adb
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 6 deletions.
diff --git a/.ci/jenkins/Jenkinsfile.release-candidate b/.ci/jenkins/Jenkinsfile.release-candidate
@@ -27,7 +27,7 @@ pipeline {
     }
 
     options {
-        timeout(time: 180, unit: 'MINUTES')
+        timeout(time: 900, unit: 'MINUTES')
     }
 
     parameters {

diff --git a/.ci/jenkins/release-jobs/Jenkinsfile.chrome-extensions b/.ci/jenkins/release-jobs/Jenkinsfile.chrome-extensions
@@ -170,7 +170,7 @@ pipeline {
                     mkdir -p ${RELEASE_CANDIDATE_ARTIFACTS_DIR}/{business-automation-chrome-extension-editors,sonataflow-chrome-extension-editors}
                     cp -r kie-tools/packages/chrome-extension-pack-kogito-kie-editors/dist/{fonts,*-envelope.*} "${RELEASE_CANDIDATE_ARTIFACTS_DIR}/business-automation-chrome-extension-editors"
                     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-pack-kogito-kie-editors/dist/chrome_extension_kogito_kie_editors_${params.RELEASE_VERSION}.zip" "${RELEASE_CANDIDATE_ARTIFACTS_DIR}/${CHROME_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 -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
@@ -191,7 +191,7 @@ pipeline {
                 dir("${RELEASE_CANDIDATE_ARTIFACTS_DIR}") {
                     script {
                         releaseUtils.setupSigningKey("${pipelineVars.asfReleaseGPGKeyCredentialsId}")
-                        releaseUtils.signArtifact("${CHROME_EXTENCHROME_EXTENSION_RELEASE_FILE}")
+                        releaseUtils.signArtifact("${CHROME_EXTENSION_RELEASE_FILE}")
                         releaseUtils.signArtifact("${SWF_CHROME_EXTENSION_RELEASE_FILE}")
                         releaseUtils.signArtifact("${CHROME_EXTENSION_EDITORS_RELEASE_FILE}")
                         releaseUtils.signArtifact("${SWF_CHROME_EXTENSION_EDITORS_RELEASE_FILE}")
@@ -226,7 +226,7 @@ pipeline {
                         "${pipelineVars.asfReleaseStagingRepository}",
                         "${RELEASE_ARTIFACTS_DIR}",
                         "${params.RELEASE_CANDIDATE_VERSION}",
-                        "${CHROME_EXTENCHROME_EXTENSION_RELEASE_FILE}",
+                        "${CHROME_EXTENSION_RELEASE_FILE}",
                         "${SWF_CHROME_EXTENSION_RELEASE_FILE}",
                         "${CHROME_EXTENSION_EDITORS_RELEASE_FILE}",
                         "${SWF_CHROME_EXTENSION_EDITORS_RELEASE_FILE}"

diff --git a/.ci/jenkins/release-jobs/Jenkinsfile.kie-sandbox-helm-chart b/.ci/jenkins/release-jobs/Jenkinsfile.kie-sandbox-helm-chart
@@ -184,7 +184,7 @@ pipeline {
                 script {
                     sh """#!/bin/bash -el
                     mkdir ${RELEASE_CANDIDATE_ARTIFACTS_DIR}
-                    cp "kie-tools/packages/kie-sandbox-helm-chart/dist/${KIE_SANDBOX_HELM_CHART__name}-${KIE_SANDBOX_HELM_CHART__tag}.tgz" "${RELEASE_ARTIFACTS_DIR}/${RELEASE_FILE}"
+                    cp "kie-tools/packages/kie-sandbox-helm-chart/dist/${KIE_SANDBOX_HELM_CHART__name}-${KIE_SANDBOX_HELM_CHART__tag}.tgz" "${RELEASE_CANDIDATE_ARTIFACTS_DIR}/${RELEASE_FILE}"
                     """.trim()
                     releaseUtils.addLegalfilesToTarGzFile("${RELEASE_CANDIDATE_ARTIFACTS_DIR}", "${RELEASE_FILE}", "${LEGAL_FILES_DIR}")
                 }

diff --git a/.ci/jenkins/release-jobs/Jenkinsfile.vscode-extensions-prod b/.ci/jenkins/release-jobs/Jenkinsfile.vscode-extensions-prod
@@ -177,7 +177,7 @@ pipeline {
                     cp "kie-tools/packages/pmml-vscode-extension/dist/pmml_vscode_extension_${params.RELEASE_VERSION}.vsix" "${RELEASE_CANDIDATE_ARTIFACTS_DIR}/${PMML_VSCODE_EXTENSION_RELEASE_FILE}"
                     cp "kie-tools/packages/vscode-extension-dashbuilder-editor/dist/vscode_extension_dashbuilder_editor_${params.RELEASE_VERSION}.vsix" "${RELEASE_CANDIDATE_ARTIFACTS_DIR}/${DASHBUILDER_VSCODE_EXTENSION_RELEASE_FILE}"
                     cp "kie-tools/packages/serverless-workflow-vscode-extension/dist/serverless_workflow_vscode_extension_${params.RELEASE_VERSION}.vsix" "${RELEASE_CANDIDATE_ARTIFACTS_DIR}/${SONATAFLOW_VSCODE_EXTENSION_RELEASE_FILE}"
-                    cp "kie-tools/packages/yard-vscode-extension/dist/yard_vscode_extension_${params.RELEASE_VERSION}.vsix" "${RELEASE_ARTIFACTS_DIR}/${YARD_VSCODE_EXTENSION_RELEASE_FILE}"
+                    cp "kie-tools/packages/yard-vscode-extension/dist/yard_vscode_extension_${params.RELEASE_VERSION}.vsix" "${RELEASE_CANDIDATE_ARTIFACTS_DIR}/${YARD_VSCODE_EXTENSION_RELEASE_FILE}"
                     cp "kie-tools/packages/vscode-extension-kogito-bundle/dist/vscode_extension_kogito_bundle_${params.RELEASE_VERSION}.vsix" "${RELEASE_CANDIDATE_ARTIFACTS_DIR}/${KOGITO_BUNDLE_VSCODE_EXTENSION_RELEASE_FILE}"
                     cp "kie-tools/packages/vscode-extension-kie-ba-bundle/dist/vscode_extension_kie_ba_bundle_${params.RELEASE_VERSION}.vsix" "${RELEASE_CANDIDATE_ARTIFACTS_DIR}/${BUSINESS_AUTOMATION_BUNDLE_VSCODE_EXTENSION_RELEASE_FILE}"
                     cp "kie-tools/packages/extended-services-vscode-extension/dist/extended_services_vscode_extension_${params.RELEASE_VERSION}.vsix" "${RELEASE_CANDIDATE_ARTIFACTS_DIR}/${EXTENDED_SERVICES_VSCODE_EXTENSION_RELEASE_FILE}"

diff --git a/.github/workflows/release_build_extended_services.yml b/.github/workflows/release_build_extended_services.yml
@@ -408,6 +408,14 @@ jobs:
     env:
       RELEASE_CANDIDATE_ARTIFACTS_DIR: ${{ github.workspace }}/extended-services-release-candidate-artifacts
     steps:
+      - name: "Checkout @ GitHub default"
+        uses: actions/checkout@v3
+
+      - name: "Checkout @ Simulated squashed-merge if PR"
+        uses: ./.github/actions/checkout-pr
+        with:
+          ref: ${{ inputs.base_ref }}
+
       - name: Import GPG key
         if: github.event_name != 'pull_request'
         uses: crazy-max/ghaction-import-gpg@111c56156bcc6918c056dbef52164cfa583dc549