Merge pull request #359 from confluentinc/pr_merge_from_11_2_x_to_master

Merge Conflict Resolution (from 11.2.x to master)
confluentinc · Apr 9, 2024 · 555fa0b · 555fa0b
2 parents 1ad1e8d + 70e8220
commit 555fa0b
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 12 deletions.
diff --git a/.semaphore/semaphore.yml b/.semaphore/semaphore.yml
@@ -37,7 +37,8 @@ blocks:
       jobs:
         - name: Test
           commands:
-            - . sem-pint
+            - pip install confluent-release-tools -q
+            - . sem-pint -c
             - mvn -Dcloud -Pjenkins -U -Dmaven.wagon.http.retryHandler.count=10 --batch-mode --no-transfer-progress clean verify install dependency:analyze validate
             - cve-scan
             - . cache-maven store

diff --git a/Jenkinsfile b/Jenkinsfile
diff --git a/service.yml b/service.yml
@@ -9,8 +9,8 @@ semaphore:
   enable: true
   pipeline_type: cp
   cve_scan: true
-  extra_deploy_args: "-Dcloud -Pjenkins"
-  extra_build_args: "-Dcloud -Pjenkins"
+  extra_deploy_args: -Dcloud -Pjenkins
+  extra_build_args: -Dcloud -Pjenkins
   run_pint_merge: true
 code_artifact:
   enable: true