From db26d638a13b09503519fb091a26921975924068 Mon Sep 17 00:00:00 2001 From: Martin Medek Date: Mon, 11 Jul 2022 16:40:37 +0200 Subject: [PATCH] DBZ-5392 added downstream/upstream suffix to the preparation jenkins jobs, removed redundant job attributes in downstream trigger job --- .../job-dsl/ocp_downstream_apicurio_prepare.groovy | 2 +- .../ocp_downstream_artifact_server_prepare.groovy | 2 +- .../job-dsl/ocp_downstream_strimzi_prepare.groovy | 2 +- .../job-dsl/ocp_downstream_trigger_all_prepare.groovy | 10 +++------- .../job-dsl/ocp_upstream_kafka_connect_prepare.groovy | 4 ++-- jenkins-jobs/job-dsl/rhel_downstream_prepare.groovy | 2 +- .../downstream_preparations_trigger_pipeline.groovy | 8 ++++---- 7 files changed, 13 insertions(+), 17 deletions(-) diff --git a/jenkins-jobs/job-dsl/ocp_downstream_apicurio_prepare.groovy b/jenkins-jobs/job-dsl/ocp_downstream_apicurio_prepare.groovy index a155f9c69..a98f88371 100644 --- a/jenkins-jobs/job-dsl/ocp_downstream_apicurio_prepare.groovy +++ b/jenkins-jobs/job-dsl/ocp_downstream_apicurio_prepare.groovy @@ -1,5 +1,5 @@ pipelineJob('ocp-downstream-apicurio-prepare-job') { - displayName('Apicurio deployment preparation') + displayName('Apicurio Preparation - Downstream') description('Republishes apicurio registry images to quay.io and replaces them in deployment descriptor') properties { diff --git a/jenkins-jobs/job-dsl/ocp_downstream_artifact_server_prepare.groovy b/jenkins-jobs/job-dsl/ocp_downstream_artifact_server_prepare.groovy index a695de72f..5d0aff8aa 100644 --- a/jenkins-jobs/job-dsl/ocp_downstream_artifact_server_prepare.groovy +++ b/jenkins-jobs/job-dsl/ocp_downstream_artifact_server_prepare.groovy @@ -1,5 +1,5 @@ pipelineJob('ocp-downstream-artifact-server-prepare-job') { - displayName('Artifact Server Preparation') + displayName('Artifact Server Preparation - Downstream') description('Prepares plugins file for artifact server') properties { diff --git a/jenkins-jobs/job-dsl/ocp_downstream_strimzi_prepare.groovy b/jenkins-jobs/job-dsl/ocp_downstream_strimzi_prepare.groovy index da04a96d3..bd772e40c 100644 --- a/jenkins-jobs/job-dsl/ocp_downstream_strimzi_prepare.groovy +++ b/jenkins-jobs/job-dsl/ocp_downstream_strimzi_prepare.groovy @@ -1,5 +1,5 @@ pipelineJob('ocp-downstream-strimzi-prepare-job') { - displayName('AMQ Stream Deployment Preparation') + displayName('Strimzi Preparation - Downstream') description('Prepares images and deployment descriptor for AMQ Streams') properties { diff --git a/jenkins-jobs/job-dsl/ocp_downstream_trigger_all_prepare.groovy b/jenkins-jobs/job-dsl/ocp_downstream_trigger_all_prepare.groovy index 5101ebefa..6f755fe6e 100644 --- a/jenkins-jobs/job-dsl/ocp_downstream_trigger_all_prepare.groovy +++ b/jenkins-jobs/job-dsl/ocp_downstream_trigger_all_prepare.groovy @@ -1,5 +1,5 @@ pipelineJob('ocp-downstream-trigger-all-prepare') { - displayName('Trigger Downstream Preparations') + displayName('Trigger Preparations - Downstream') description('Triggers downstream preparation jobs') parameters { @@ -26,7 +26,7 @@ pipelineJob('ocp-downstream-trigger-all-prepare') { textParam('STRZ_IMAGES', '', 'OCP Downstream strimzi - List of productised strimzi images') // DEBEZIUM CONNECT IMAGE CONFIG booleanParam('STRZ_DBZ_CONNECT_BUILD', true, 'OCP Downstream strimzi - Also build debezium images') - textParam('STRZ_DBZ_CONNECTOR_ARCHIVE_URLS', '', 'OCP Downstream strimzi - List of URLs to productised Debezium connectors') + textParam('DBZ_CONNECTOR_ARCHIVE_URLS', '', 'OCP Downstream strimzi, Artifact Server - List of URLs to productised Debezium connectors') textParam('STRZ_DBZ_EXTRA_LIBS', '', 'Downstream Strimzi, RHEL - List of extra libraries added to connectors') // APICURIO @@ -37,7 +37,7 @@ pipelineJob('ocp-downstream-trigger-all-prepare') { // RHEL - booleanParam('AUTO_TAG', true, 'RHEL - Use automatically generated tag') + booleanParam('AUTO_TAG', true, 'RHEL, Artifact Server - Use automatically generated tag') textParam('EXTRA_IMAGE_TAGS', 'latest', 'RHEL - List of extra texts tags for multiple images') stringParam('RHEL_IMAGE', 'registry.access.redhat.com/ubi8:latest', 'Base RHEL image') stringParam('KAFKA_URL', '', 'RHEL - AMQ streams kafka') @@ -46,10 +46,6 @@ pipelineJob('ocp-downstream-trigger-all-prepare') { // ARTIFACT SERVER textParam('AS_DBZ_EXTRA_LIBS', '', 'Artifact Server - List of extra libraries added to connectors') textParam('AS_EXTRA_IMAGE_TAGS', 'latest', 'Artifact Server - List of extra texts tags for multiple images') - booleanParam('AS_AUTO_TAG', true, 'Artifact Server - Use automatically generated tag') - textParam('AS_DBZ_CONNECTOR_ARCHIVE_URLS', '', 'Artifact Server - List of URLs to productised Debezium connectors') - - } definition { cps { diff --git a/jenkins-jobs/job-dsl/ocp_upstream_kafka_connect_prepare.groovy b/jenkins-jobs/job-dsl/ocp_upstream_kafka_connect_prepare.groovy index 0658861dd..b2ecf88d8 100644 --- a/jenkins-jobs/job-dsl/ocp_upstream_kafka_connect_prepare.groovy +++ b/jenkins-jobs/job-dsl/ocp_upstream_kafka_connect_prepare.groovy @@ -1,6 +1,6 @@ pipelineJob('ocp-upstream-kafka-connect-prepare-job') { - displayName('Kafka Connect Image Preparation - Upstream') - description('Prepares Strimzi') + displayName('Strimzi Preparation - Upstream') + description('Prepares Upstream Strimzi') properties { githubProjectUrl('https://github.com/debezium/debezium') diff --git a/jenkins-jobs/job-dsl/rhel_downstream_prepare.groovy b/jenkins-jobs/job-dsl/rhel_downstream_prepare.groovy index 52f000cea..a8d154aca 100644 --- a/jenkins-jobs/job-dsl/rhel_downstream_prepare.groovy +++ b/jenkins-jobs/job-dsl/rhel_downstream_prepare.groovy @@ -1,5 +1,5 @@ pipelineJob('rhel-downstream-prepare-job') { - displayName('AMQ Streams on RHEL Preparation') + displayName('AMQ Streams on RHEL Preparation - Downstream') description('Prepares image for AMQ Streams on RHEL') properties { diff --git a/jenkins-jobs/pipelines/downstream_preparations_trigger_pipeline.groovy b/jenkins-jobs/pipelines/downstream_preparations_trigger_pipeline.groovy index 0e0a55736..62d773817 100644 --- a/jenkins-jobs/pipelines/downstream_preparations_trigger_pipeline.groovy +++ b/jenkins-jobs/pipelines/downstream_preparations_trigger_pipeline.groovy @@ -18,8 +18,8 @@ pipeline { string(name: 'DBZ_GIT_BRANCH', value: params.DBZ_GIT_BRANCH), text(name: 'DBZ_EXTRA_LIBS', value: params.AS_DBZ_EXTRA_LIBS ), text(name: 'EXTRA_IMAGE_TAGS', value: params.AS_EXTRA_IMAGE_TAGS), - booleanParam(name: 'AUTO_TAG', value: params.AS_AUTO_TAG), - text(name: 'DBZ_CONNECTOR_ARCHIVE_URLS', value: params.AS_DBZ_CONNECTOR_ARCHIVE_URLS), + booleanParam(name: 'AUTO_TAG', value: params.AUTO_TAG), + text(name: 'DBZ_CONNECTOR_ARCHIVE_URLS', value: params.DBZ_CONNECTOR_ARCHIVE_URLS), ] copyArtifacts(projectName: 'ocp-downstream-artifact-server-prepare-job', selector: lastCompleted()) } @@ -40,7 +40,7 @@ pipeline { string(name: 'DBZ_GIT_REPOSITORY', value: params.DBZ_GIT_REPOSITORY), string(name: 'DBZ_GIT_BRANCH', value: params.DBZ_GIT_BRANCH), booleanParam(name: 'DBZ_CONNECT_BUILD', value: params.STRZ_DBZ_CONNECT_BUILD), - text(name: 'DBZ_CONNECTOR_ARCHIVE_URLS', value: params.STRZ_DBZ_CONNECTOR_ARCHIVE_URLS), + text(name: 'DBZ_CONNECTOR_ARCHIVE_URLS', value: params.DBZ_CONNECTOR_ARCHIVE_URLS), text(name: 'DBZ_EXTRA_LIBS', value: params.STRZ_DBZ_EXTRA_LIBS), ] copyArtifacts(projectName: 'ocp-downstream-strimzi-prepare-job', selector: lastCompleted()) @@ -83,7 +83,7 @@ pipeline { string(name: 'DBZ_GIT_BRANCH', value: params.DBZ_GIT_BRANCH), booleanParam(name: 'AUTO_TAG', value: params.AUTO_TAG), text(name: 'EXTRA_IMAGE_TAGS', value: params.EXTRA_IMAGE_TAGS), - text(name: 'DBZ_CONNECTOR_ARCHIVE_URLS', value: params.STRZ_DBZ_CONNECTOR_ARCHIVE_URLS), + text(name: 'DBZ_CONNECTOR_ARCHIVE_URLS', value: params.DBZ_CONNECTOR_ARCHIVE_URLS), text(name: 'DBZ_EXTRA_LIBS', value: params.STRZ_DBZ_EXTRA_LIBS), ] copyArtifacts(projectName: 'rhel-downstream-prepare-job', selector: lastCompleted())