From edb6776a6231222c5b7aadd63d44f6523f110e75 Mon Sep 17 00:00:00 2001 From: Roberto Oliveira Date: Thu, 12 Sep 2024 15:41:39 -0400 Subject: [PATCH] add kn-workflow-cli-artifacts image as part of OSL prod UMB message --- job-dsls/jobs/prod/prod_osl_trigger_umb_message.groovy | 1 + .../job-scripts/prod_osl_trigger_umb_message.jenkinsfile | 6 ++++-- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/job-dsls/jobs/prod/prod_osl_trigger_umb_message.groovy b/job-dsls/jobs/prod/prod_osl_trigger_umb_message.groovy index 7551438c..11823695 100644 --- a/job-dsls/jobs/prod/prod_osl_trigger_umb_message.groovy +++ b/job-dsls/jobs/prod/prod_osl_trigger_umb_message.groovy @@ -26,6 +26,7 @@ pipelineJob("${folderPath}/osl-trigger-umb-message") { stringParam('MANAGEMENT_CONSOLE_BREW', '', 'The openshift-serverless-1-logic-management-console-rhel8-container Brew build ID. This parameter is optional and in case it is not defined, the latest built image is used.') stringParam('OPERATOR_BREW', '', 'The openshift-serverless-1-logic-rhel8-operator-container Brew build ID. This parameter is optional and in case it is not defined, the latest built image is used.') stringParam('OPERATOR_BUNDLE_BREW', '', 'The openshift-serverless-1-logic-rhel8-operator-bundle-container Brew build ID. This parameter is optional and in case it is not defined, the latest built image is used.') + stringParam('KN_WORKFLOW_CLI_ARTIFACTS_BREW', '', 'The openshift-serverless-1-logic-kn-workflow-cli-artifacts-rhel8-container Brew build ID. This parameter is optional and in case it is not defined, the latest built image is used.') } logRotator { diff --git a/job-dsls/src/main/resources/job-scripts/prod_osl_trigger_umb_message.jenkinsfile b/job-dsls/src/main/resources/job-scripts/prod_osl_trigger_umb_message.jenkinsfile index f497320f..5ff9f679 100644 --- a/job-dsls/src/main/resources/job-scripts/prod_osl_trigger_umb_message.jenkinsfile +++ b/job-dsls/src/main/resources/job-scripts/prod_osl_trigger_umb_message.jenkinsfile @@ -15,7 +15,8 @@ def images = [ // Images to find the tag in Brew 'swf-devmode': [brewBuildID: "${env.SWF_DEVMODE_BREW}", brewPackageName: 'openshift-serverless-1-logic-swf-devmode-rhel8-container', imageTag: ''], 'management-console': [brewBuildID: "${env.MANAGEMENT_CONSOLE_BREW}", brewPackageName: 'openshift-serverless-1-logic-management-console-rhel8-container', imageTag: ''], 'operator': [brewBuildID: "${env.OPERATOR_BREW}", brewPackageName: 'openshift-serverless-1-logic-rhel8-operator-container', imageTag: ''], - 'operator-bundle': [brewBuildID: "${env.OPERATOR_BUNDLE_BREW}", brewPackageName: 'openshift-serverless-1-logic-rhel8-operator-bundle-container', imageTag: ''] + 'operator-bundle': [brewBuildID: "${env.OPERATOR_BUNDLE_BREW}", brewPackageName: 'openshift-serverless-1-logic-rhel8-operator-bundle-container', imageTag: ''], + 'kn-workflow-cli-artifacts': [brewBuildID: "${env.KN_WORKFLOW_CLI_ARTIFACTS_BREW}", brewPackageName: 'openshift-serverless-1-logic-kn-workflow-cli-artifacts-rhel8-container', imageTag: ''] ] def projectsAndVersions = [:] @@ -45,6 +46,7 @@ pipeline { println "[INFO] MANAGEMENT_CONSOLE_BREW: ${MANAGEMENT_CONSOLE_BREW}" println "[INFO] OPERATOR_BREW: ${OPERATOR_BREW}" println "[INFO] OPERATOR_BUNDLE_BREW: ${OPERATOR_BUNDLE_BREW}" + println "[INFO] KN_WORKFLOW_CLI_ARTIFACTS_BREW: ${KN_WORKFLOW_CLI_ARTIFACTS_BREW}" } } stage('Fetch current milestone') { @@ -142,7 +144,7 @@ def getMessageBody(milestone, projectsAndVersions, images) { "maven_repository_file_url": "${env.STAGING_SERVER_URL}/rhoss/rhoss-logic-${milestone}/openshift-serverless-logic-${milestone}-maven-repository.zip", "sources_file_url": "${env.STAGING_SERVER_URL}/rhoss/rhoss-logic-${milestone}/openshift-serverless-logic-${milestone}-src.zip", "version": {"serverlesslogic-rhba":"${milestone}","serverlesslogic":"${projectsAndVersions["kiegroup/kogito-runtimes"]}","drools":"${DROOLS_VERSION}","platform.quarkus.bom":"${QUARKUS_PLATFORM_VERSION}", "quarkus.bom":"${QUARKUS_VERSION}"}, - "image": {"data-index-ephemeral":"${images["data-index-ephemeral"].imageTag}","data-index-postgresql":"${images["data-index-postgresql"].imageTag}","jobs-service-ephemeral":"${images["jobs-service-ephemeral"].imageTag}","jobs-service-postgresql":"${images["jobs-service-postgresql"].imageTag}","swf-builder":"${images["swf-builder"].imageTag}","swf-devmode":"${images["swf-devmode"].imageTag}","management-console":"${images["management-console"].imageTag}","operator":"${images["operator"].imageTag}","operator-bundle":"${images["operator-bundle"].imageTag}"} + "image": {"data-index-ephemeral":"${images["data-index-ephemeral"].imageTag}","data-index-postgresql":"${images["data-index-postgresql"].imageTag}","jobs-service-ephemeral":"${images["jobs-service-ephemeral"].imageTag}","jobs-service-postgresql":"${images["jobs-service-postgresql"].imageTag}","swf-builder":"${images["swf-builder"].imageTag}","swf-devmode":"${images["swf-devmode"].imageTag}","management-console":"${images["management-console"].imageTag}","operator":"${images["operator"].imageTag}","operator-bundle":"${images["operator-bundle"].imageTag}","kn-workflow-cli-artifacts":"${images["kn-workflow-cli-artifacts"].imageTag}"} }""" }