From 1ec7196ee3cb768e5e6252c78b9a2a42199d5a4c Mon Sep 17 00:00:00 2001 From: Charles Provencher Date: Thu, 8 Feb 2024 19:22:13 -0500 Subject: [PATCH 1/4] Delete Jenkinsfile --- Jenkinsfile | 8 -------- 1 file changed, 8 deletions(-) delete mode 100755 Jenkinsfile diff --git a/Jenkinsfile b/Jenkinsfile deleted file mode 100755 index 84a36974a..000000000 --- a/Jenkinsfile +++ /dev/null @@ -1,8 +0,0 @@ -#!/usr/bin/env groovy -common { - slackChannel = '#connect-warn' - pintMerge = true - downStreamValidate = false - nodeLabel = 'docker-oraclejdk8' - sonarqubeScannerEnable = true -} From 7663007e694e0b24d366512a59d00faa764f669d Mon Sep 17 00:00:00 2001 From: cprovencher Date: Thu, 8 Feb 2024 19:22:17 -0500 Subject: [PATCH 2/4] chore: update repo semaphore config --- .semaphore/semaphore.yml | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/.semaphore/semaphore.yml b/.semaphore/semaphore.yml index e822df087..c67ceb36d 100644 --- a/.semaphore/semaphore.yml +++ b/.semaphore/semaphore.yml @@ -40,13 +40,14 @@ blocks: - pip install confluent-release-tools -q - . sem-pint - mvn -Dcloud -Pjenkins -U -Dmaven.wagon.http.retryHandler.count=10 --batch-mode --no-transfer-progress clean verify install dependency:analyze validate - - . cve-scan + - cve-scan - . cache-maven store epilogue: always: commands: - . publish-test-results - artifact push workflow target/test-results + - artifact push workflow target - name: Release dependencies: ["Test"] @@ -59,7 +60,7 @@ blocks: - mvn -Dcloud -Pjenkins -U -Dmaven.wagon.http.retryHandler.count=10 --batch-mode -DaltDeploymentRepository=confluent-codeartifact-internal::default::https://confluent-519856050701.d.codeartifact.us-west-2.amazonaws.com/maven/maven-snapshots/ -DrepositoryId=confluent-codeartifact-internal deploy -DskipTests - name: Release Notes - dependencies: [ ] + dependencies: [] run: when: "branch =~ '[0-9]+\\.[0-9]+\\.x'" task: @@ -69,7 +70,6 @@ blocks: - git clone --branch master --single-branch git@github.com:confluentinc/connect-releases.git - ./connect-releases/tasks/release-connect-plugins/generate-connect-changelogs.sh - after_pipeline: task: agent: @@ -86,4 +86,5 @@ after_pipeline: commands: - checkout - sem-version java 11 - - emit-sonarqube-data -a test-results \ No newline at end of file + - artifact pull workflow target + - emit-sonarqube-data --run_only_sonar_scan From ffda2436253c0c43ead1bad280892ea633cf7065 Mon Sep 17 00:00:00 2001 From: cprovencher Date: Thu, 8 Feb 2024 19:22:18 -0500 Subject: [PATCH 3/4] chore: update sonar-project.properties to reconfigure sonarqube scanning. --- sonar-project.properties | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/sonar-project.properties b/sonar-project.properties index be656e48b..a6b710de8 100644 --- a/sonar-project.properties +++ b/sonar-project.properties @@ -1,8 +1,8 @@ -sonar.projectKey=kafka-connect-elasticsearch -sonar.sources=src/main/java -sonar.java.binaries=target/classes/** -sonar.exclusions=**/test/**/*,**/tests/**/*,**/mock/**/*,**/mocks/**/*,**/*mock*,**/*test* -sonar.test.inclusions=**/*Test.java,**/*IT.java +### service-bot sonarqube plugin managed file +sonar.coverage.exclusions=**/test/**/*,**/tests/**/*,**/mock/**/*,**/mocks/**/*,**/*mock*,**/*test* sonar.coverage.jacoco.xmlReportPaths=**/jacoco.xml -sonar.java.tests.reportPaths=**/surefire/** -sonar.language=java \ No newline at end of file +sonar.exclusions=**/*.pb.*,**/mk-include/**/* +sonar.java.binaries=. +sonar.language=java +sonar.projectKey=kafka-connect-elasticsearch +sonar.sources=. From 8e7ac5b37ad4eb73b2fbb10cb18d87ca528dff20 Mon Sep 17 00:00:00 2001 From: Ganesh Datta Date: Fri, 15 Mar 2024 12:33:44 +0530 Subject: [PATCH 4/4] increased the execution time limit --- .semaphore/semaphore.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.semaphore/semaphore.yml b/.semaphore/semaphore.yml index c67ceb36d..18a3aa6b4 100644 --- a/.semaphore/semaphore.yml +++ b/.semaphore/semaphore.yml @@ -14,7 +14,7 @@ fail_fast: when: "true" execution_time_limit: - hours: 1 + hours: 2 queue: - when: "branch != 'master' and branch !~ '[0-9]+\\.[0-9]+\\.x'"