You are viewing a plain text version of this content. The canonical link for it is here.
Posted to jira@kafka.apache.org by GitBox <gi...@apache.org> on 2022/12/13 23:07:14 UTC
[GitHub] [kafka] gbadoni opened a new pull request, #12986: [do not merge] Sync AK/trunk to CCS/master Dec 2022
gbadoni opened a new pull request, #12986:
URL: https://github.com/apache/kafka/pull/12986
NOTE: This PR should be merged using CLI to preserve commit history
# remote check
❯ git remote -v
ak git@github.com:apache/kafka.git (fetch)
ak git@github.com:apache/kafka.git (push)
origin git@github.com:confluentinc/kafka.git (fetch)
origin git@github.com:confluentinc/kafka.git (push)
# create branch for merge
git pull origin master
git checkout -b sync-ak-to-ccs-Dec-2022
#merge conflicts
git merge ak/trunk
# fix conflicts
git status
On branch sync-ak-to-ccs-Dec-2022
All conflicts fixed but you are still merging.
Unmerged paths:
(use "git add <file>..." to mark resolution)
both modified: Jenkinsfile
both modified: core/src/test/scala/unit/kafka/admin/TopicCommandTest.scala
both modified: gradle.properties
both modified: tests/kafkatest/__init__.py
both modified: tests/kafkatest/version.py
gradle.properties/__init__.py and version.py: Fix the version conflict, pick the version 7.4.0-0-ccs
<<<<<<< HEAD
version=7.4.0-0-ccs
=======
version=3.5.0-SNAPSHOT
>>>>>>> ak/trunk
JenkinsFile : Kept the CCS block of the code. Looks like the AK version wants to send an email to dev@kafka.apache.org, which we do not want. Please review.
<<<<<<< HEAD
if (config.publish && config.isDevJob && !config.isReleaseJob && !config.isPrJob) {
stage("Start Downstream Builds") {
def downstreamBranch = kafkaMuckrakeVersionMap[env.BRANCH_NAME]
config.downStreamRepos.each { repo ->
build(job: "confluentinc/${repo}/${downstreamBranch}",
wait: false,
propagate: false
)
}
=======
}
post {
always {
script {
if (!isChangeRequest(env)) {
node('ubuntu') {
step([$class: 'Mailer',
notifyEveryUnstableBuild: true,
recipients: "dev@kafka.apache.org",
sendToIndividuals: false])
}
>>>>>>> ak/trunk
core/src/test/scala/unit/kafka/admin/TopicCommandTest.scala: This is a scala version upgrade change done as a part of the following PR https://github.com/apache/kafka/pull/12675/files#diff-73a6c1d4cb03750d4a7dca9fe5e5c012b8b1949b73a15da3aaea8714a54cfc5f. Keeping the AK code block and tested that build passed.
<<<<<<< HEAD
verify(adminClient, times(1)).deleteTopics(
argThat((_.contains(topicName)): ArgumentMatcher[Collection[String]]),
argThat((_.shouldRetryOnQuotaViolation() == false): ArgumentMatcher[DeleteTopicsOptions])
=======
verify(adminClient).deleteTopics(
argThat((topics: java.util.Collection[String]) => topics.asScala.toBuffer.equals(Seq(topicName))),
argThat((options: DeleteTopicsOptions) => !options.shouldRetryOnQuotaViolation)
>>>>>>> ak/trunk
)
#the steps used to push the change
❯ git push origin sync-ak-to-ccs-Dec-2022
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: jira-unsubscribe@kafka.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [kafka] gbadoni closed pull request #12986: [do not merge] Sync AK/trunk to CCS/master Dec 2022
Posted by GitBox <gi...@apache.org>.
gbadoni closed pull request #12986: [do not merge] Sync AK/trunk to CCS/master Dec 2022
URL: https://github.com/apache/kafka/pull/12986
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: jira-unsubscribe@kafka.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org