Skip to content
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.

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

updated the merge conflict by removing jenkinsfile and sonar-project.… #762

Open
wants to merge 1 commit into
base: 11.1.x
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
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

This file was deleted.