Skip to content

resolve conflicts merging 11.0.x #764

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 7 commits into
base: 11.1.x
Choose a base branch
from
Open

resolve conflicts merging 11.0.x #764

Show file tree
Hide file tree
Changes from 6 commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
1ec7196
Delete Jenkinsfile
cprovencher Feb 9, 2024
7663007
chore: update repo semaphore config
cprovencher Feb 9, 2024
ffda243
chore: update sonar-project.properties to reconfigure sonarqube scann…
cprovencher Feb 9, 2024
5ff2916
Merge pull request #749 from confluentinc/jenkins_migration
sp-gupta Mar 3, 2024
d4e6494
Merge branch '10.0.x' into 11.0.x
ConfluentSemaphore Mar 3, 2024
671aaa3
Merge branch '11.0.x' into gvaughan/resolve-conflicts-merging-11.0.x
garyvvaughan Mar 14, 2024
8e7ac5b
increased the execution time limit
Mar 15, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 5 additions & 4 deletions .semaphore/semaphore.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"]
Expand All @@ -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:
Expand All @@ -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:
Expand All @@ -86,4 +86,5 @@ after_pipeline:
commands:
- checkout
- sem-version java 11
- emit-sonarqube-data -a test-results
- artifact pull workflow target
- emit-sonarqube-data --run_only_sonar_scan
7 changes: 0 additions & 7 deletions Jenkinsfile
View file
Open in desktop

This file was deleted.