diff --git a/jenkins-jobs/job-dsl/release_debezium_stage_prod.groovy b/jenkins-jobs/job-dsl/release_debezium_stage_prod.groovy index e5410e907..7e9b9cbf1 100644 --- a/jenkins-jobs/job-dsl/release_debezium_stage_prod.groovy +++ b/jenkins-jobs/job-dsl/release_debezium_stage_prod.groovy @@ -12,14 +12,12 @@ pipelineJob('release-debezium-stage-prod') { parameters { stringParam('BUILD_VERSION', '', 'Maven artifact id of the product binaries') - stringParam('BUILD_VERSION_INCUBATOR', '', 'Maven artifact id of the product binaries in incubator') stringParam('BUILD_VERSION_DB2', '', 'Maven artifact id of the product binaries in Db2') stringParam('BUILD_VERSION_VITESS', '', 'Maven artifact id of the product binaries in Vitess') stringParam('PRODUCT_VERSION', '', 'Product version') stringParam('USERNAME', '', 'Username to log to staging host') nonStoredPasswordParam('PASSWORD', 'Password to log to staging host') stringParam('CONNECTORS', 'mysql postgres mongodb sqlserver', 'The list of released connectors') - stringParam('CONNECTORS_INCUBATOR', 'oracle', 'The list of released incubating connectors') stringParam('STANDALONE_CONNECTORS', 'db2 vitess', 'The list of released connectors in distinct repositories') booleanParam('STAGE_FILES', false, 'When checked the uploaded artifacts are staged') stringParam('SOURCE_MAVEN_REPO', 'debezium-prod-repo', 'Maven repository URL with product artifacts') diff --git a/jenkins-jobs/job-dsl/release_deploy_snapshots.groovy b/jenkins-jobs/job-dsl/release_deploy_snapshots.groovy index 00831377e..16b4f8fcf 100644 --- a/jenkins-jobs/job-dsl/release_deploy_snapshots.groovy +++ b/jenkins-jobs/job-dsl/release_deploy_snapshots.groovy @@ -20,8 +20,8 @@ pipelineJob('release-deploy-snapshots') { stringParam('DEBEZIUM_BRANCH', 'master', 'A branch from which Debezium is built') stringParam( 'DEBEZIUM_ADDITIONAL_REPOSITORIES', - 'incubator#github.com/debezium/debezium-incubator.git#master db2#github.com/debezium/debezium-connector-db2.git#main vitess#github.com/debezium/debezium-connector-vitess.git#master cassandra#github.com/debezium/debezium-connector-cassandra.git#main', - 'A space separated list of additional repositories from which Debezium incubating components are built (id#repo#branch)' + 'db2#github.com/debezium/debezium-connector-db2.git#main vitess#github.com/debezium/debezium-connector-vitess.git#master cassandra#github.com/debezium/debezium-connector-cassandra.git#main', + 'A space separated list of additional repositories from which Debezium connectors are built (id#repo#branch)' ) } diff --git a/jenkins-jobs/job-dsl/release_upstream.groovy b/jenkins-jobs/job-dsl/release_upstream.groovy index 9c62c83ea..a5d580969 100644 --- a/jenkins-jobs/job-dsl/release_upstream.groovy +++ b/jenkins-jobs/job-dsl/release_upstream.groovy @@ -17,7 +17,7 @@ pipelineJob('release-debezium-upstream') { stringParam('DEBEZIUM_BRANCH', 'master', 'A branch from which Debezium is built') stringParam( 'DEBEZIUM_ADDITIONAL_REPOSITORIES', - 'incubator#github.com/debezium/debezium-incubator.git#master db2#github.com/debezium/debezium-connector-db2.git#main vitess#github.com/debezium/debezium-connector-vitess.git#master cassandra#github.com/debezium/debezium-connector-cassandra.git#main', + 'db2#github.com/debezium/debezium-connector-db2.git#main vitess#github.com/debezium/debezium-connector-vitess.git#master cassandra#github.com/debezium/debezium-connector-cassandra.git#main', 'A space separated list of additional repositories from which Debezium incubating components are built (id#repo#branch)' ) stringParam('IMAGES_REPOSITORY', 'github.com/debezium/docker-images.git', 'Repository from which Debezium images are built') diff --git a/jenkins-jobs/pipelines/deploy-snapshots.groovy b/jenkins-jobs/pipelines/deploy-snapshots.groovy index 81fcc6ac8..f143a947e 100644 --- a/jenkins-jobs/pipelines/deploy-snapshots.groovy +++ b/jenkins-jobs/pipelines/deploy-snapshots.groovy @@ -52,14 +52,14 @@ node('Slave') { stage('Build and deploy Debezium') { dir(DEBEZIUM_DIR) { - sh "mvn clean deploy -U -s $HOME/.m2/settings-snapshots.xml -DdeployAtEnd=true -DskipITs -DskipTests -Passembly" + sh "mvn clean deploy -U -s $HOME/.m2/settings-snapshots.xml -DdeployAtEnd=true -DskipITs -DskipTests -Passembly,oracle" } } additionalDirs.each { id -> stage("Build and deploy Debezium ${id.capitalize()}") { dir(id) { - sh "mvn clean deploy -U -s $HOME/.m2/settings-snapshots.xml -DdeployAtEnd=true -DskipITs -DskipTests -P${id == 'incubator' ? 'assembly,oracle' : 'assembly'}" + sh "mvn clean deploy -U -s $HOME/.m2/settings-snapshots.xml -DdeployAtEnd=true -DskipITs -DskipTests -Passembly" } } } diff --git a/jenkins-jobs/pipelines/prod-release-pipeline.groovy b/jenkins-jobs/pipelines/prod-release-pipeline.groovy index f09905c82..df573c7c9 100644 --- a/jenkins-jobs/pipelines/prod-release-pipeline.groovy +++ b/jenkins-jobs/pipelines/prod-release-pipeline.groovy @@ -12,7 +12,6 @@ if ( } SOURCES_DIR='src-main' -SOURCES_DIR_INCUBATOR='src-incubator' TARGET_DIR="${ARTIFACT_DIR}/${PRODUCT_VERSION}" REMOTE_TARGET = [ 'name': 'stage', @@ -32,9 +31,6 @@ node('Slave') { curl -OLs "\${SOURCE_MAVEN_REPO}/debezium-connector-\$CONNECTOR/${BUILD_VERSION}/debezium-connector-\$CONNECTOR-${BUILD_VERSION}-plugin.zip" done curl -OLs "\${SOURCE_MAVEN_REPO}/debezium-scripting/${BUILD_VERSION}/debezium-scripting-${BUILD_VERSION}.zip" - for CONNECTOR in \${CONNECTORS_INCUBATOR}; do - curl -OLs "\${SOURCE_MAVEN_REPO}/debezium-connector-\$CONNECTOR/${BUILD_VERSION_INCUBATOR}/debezium-connector-\$CONNECTOR-${BUILD_VERSION_INCUBATOR}-plugin.zip" - done for CONNECTOR in \${STANDALONE_CONNECTORS}; do CONNECTOR_BUILD_VERSION_VARIABLE="BUILD_VERSION_\${CONNECTOR^^}" CONNECTOR_BUILD_VERSION=\${!CONNECTOR_BUILD_VERSION_VARIABLE} @@ -46,7 +42,7 @@ node('Slave') { stage('Download and repackage sources') { withCredentials([string(credentialsId: SOURCE_MAVEN_REPO, variable: 'SOURCE_MAVEN_REPO')]) { sh """ - mkdir "${SOURCES_DIR}" "${SOURCES_DIR_INCUBATOR}" + mkdir "${SOURCES_DIR}" for CONNECTOR in \${STANDALONE_CONNECTORS}; do CONNECTOR_BUILD_VERSION_VARIABLE="BUILD_VERSION_\${CONNECTOR^^}" CONNECTOR_BUILD_VERSION=\${!CONNECTOR_BUILD_VERSION_VARIABLE} @@ -54,13 +50,9 @@ node('Slave') { mkdir "\${CONNECTOR_SOURCE_DIR}" curl -Lv "\${SOURCE_MAVEN_REPO}/debezium-connector-\${CONNECTOR}/\${CONNECTOR_BUILD_VERSION}/debezium-connector-\${CONNECTOR}-\${CONNECTOR_BUILD_VERSION}-project-sources.tar.gz" | tar xz --strip-components=1 -C "\${CONNECTOR_SOURCE_DIR}" done - curl -Lv "\${SOURCE_MAVEN_REPO}/debezium-incubator-parent/${BUILD_VERSION_INCUBATOR}/debezium-incubator-parent-${BUILD_VERSION_INCUBATOR}-project-sources.tar.gz" | tar xz --strip-components=1 -C "${SOURCES_DIR_INCUBATOR}" - for CONNECTOR in \${CONNECTORS_INCUBATOR}; do - cp -r "${SOURCES_DIR_INCUBATOR}"/debezium-connector-\${CONNECTOR} "${SOURCES_DIR}" - done curl -Lv "\${SOURCE_MAVEN_REPO}/debezium-parent/${BUILD_VERSION}/debezium-parent-${BUILD_VERSION}-project-sources.tar.gz" | tar xz --strip-components=1 -C "${SOURCES_DIR}" (cd "${SOURCES_DIR}" && zip -r "../debezium-${BUILD_VERSION}-src.zip" *) - rm -rf "${SOURCES_DIR}" "${SOURCES_DIR_INCUBATOR}" + rm -rf "${SOURCES_DIR}" ls -al """ } diff --git a/jenkins-jobs/pipelines/release-pipeline.groovy b/jenkins-jobs/pipelines/release-pipeline.groovy index b20c19490..4df94456d 100644 --- a/jenkins-jobs/pipelines/release-pipeline.groovy +++ b/jenkins-jobs/pipelines/release-pipeline.groovy @@ -348,7 +348,7 @@ node('Slave') { stage('Prepare release') { dir(DEBEZIUM_DIR) { sh "git checkout -b $CANDIDATE_BRANCH" - sh "mvn clean install -DskipTests -DskipITs" + sh "mvn clean install -DskipTests -DskipITs -Poracle" } STAGING_REPO_ID = mvnRelease(DEBEZIUM_DIR, DEBEZIUM_REPOSITORY, CANDIDATE_BRANCH) ADDITIONAL_REPOSITORIES.each { id, repo -> @@ -358,9 +358,9 @@ node('Slave') { it.replaceFirst('.+\n ', "$RELEASE_VERSION\n ") } sh "git commit -a -m '[release] Stable parent $RELEASE_VERSION for release'" - sh "mvn clean install -DskipTests -DskipITs${id == 'incubator' ? ' -Poracle' : ''}" + sh "mvn clean install -DskipTests -DskipITs" } - ADDITIONAL_REPOSITORIES[id].mavenRepoId = mvnRelease(id, repo.git, CANDIDATE_BRANCH, "-Dversion.debezium=$RELEASE_VERSION${id == 'incubator' ? ' -Poracle' : ''}") + ADDITIONAL_REPOSITORIES[id].mavenRepoId = mvnRelease(id, repo.git, CANDIDATE_BRANCH, "-Dversion.debezium=$RELEASE_VERSION") dir(id) { modifyFile("pom.xml") { it.replaceFirst('.+\n ', "$DEVELOPMENT_VERSION\n ") diff --git a/jenkins-jobs/scripts/release-pipeline.groovy b/jenkins-jobs/scripts/release-pipeline.groovy index f65d148c6..bc9e45992 100644 --- a/jenkins-jobs/scripts/release-pipeline.groovy +++ b/jenkins-jobs/scripts/release-pipeline.groovy @@ -334,7 +334,7 @@ node('Slave') { stage ('Prepare release') { dir(DEBEZIUM_DIR) { - sh "mvn clean install -DskipTests -DskipITs" + sh "mvn clean install -DskipTests -DskipITs -Poracle" } STAGING_REPO_ID = mvnRelease(DEBEZIUM_DIR, DEBEZIUM_REPOSITORY, DEBEZIUM_BRANCH) ADDITIONAL_REPOSITORIES.each { id, repo -> @@ -343,9 +343,9 @@ node('Slave') { it.replaceFirst('.+\n ', "$RELEASE_VERSION\n ") } sh "git commit -a -m '[release] Stable parent $RELEASE_VERSION for release'" - sh "mvn clean install -DskipTests -DskipITs${id == 'incubator' ? ' -Poracle' : ''}" + sh "mvn clean install -DskipTests -DskipITs" } - ADDITIONAL_REPOSITORIES[id].mavenRepoId = mvnRelease(id, repo.git, repo.branch, "-Dversion.debezium=$RELEASE_VERSION${id == 'incubator' ? ' -Poracle' : ''}") + ADDITIONAL_REPOSITORIES[id].mavenRepoId = mvnRelease(id, repo.git, repo.branch, "-Dversion.debezium=$RELEASE_VERSION") dir(id) { modifyFile("pom.xml") { it.replaceFirst('.+\n ', "$DEVELOPMENT_VERSION\n ")