Skip to content

Commit abdad84

Browse files
chore: update repo semaphore config
1 parent a0d987b commit abdad84

File tree

1 file changed

+9
-34
lines changed

1 file changed

+9
-34
lines changed

.semaphore/semaphore.yml

Lines changed: 9 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ version: v1.0
77
name: build-test-release
88
agent:
99
machine:
10-
type: s1-prod-ubuntu24-04-amd64-2
10+
type: s1-prod-ubuntu24-04-amd64-1
1111

1212
fail_fast:
1313
cancel:
@@ -26,7 +26,6 @@ global_job_config:
2626
- checkout
2727
- . vault-setup
2828
- . vault-sem-get-secret connect_s3sink_it
29-
- . vault-sem-get-secret CONNECT_S3_SINK_ASSUME_ROLE_IT
3029
- sem-version java 8
3130
- . cache-maven restore
3231

@@ -41,14 +40,14 @@ blocks:
4140
- name: Test
4241
commands:
4342
- . sem-pint
44-
- mvn -Dcloud -Pjenkins -U -Dmaven.wagon.http.retryHandler.count=10 -Ddependency.check.skip=true -Daether.dependencyCollector.impl=bf -Dmaven.artifact.threads=100 --batch-mode --no-transfer-progress clean verify install dependency:analyze validate
43+
- mvn -Dcloud -Pjenkins -U -Dmaven.wagon.http.retryHandler.count=10 --batch-mode --no-transfer-progress clean verify install dependency:analyze validate
4544
- export TRIVY_DISABLE_VEX_NOTICE=true
4645
- trivy version
4746
- echo "Check go/connector-dev-vuln-remediation for fixing or suppressing vulnerabilities found by trivy"
48-
- trivy --skip-files "*.zip" rootfs --scanners vuln --db-repository public.ecr.aws/aquasecurity/trivy-db --java-db-repository public.ecr.aws/aquasecurity/trivy-java-db --ignore-unfixed --ignorefile
49-
.trivyignore --exit-code 1 --severity CRITICAL kafka-connect-s3/target/components/packages
50-
- trivy --skip-files "*.zip" rootfs --scanners vuln --db-repository public.ecr.aws/aquasecurity/trivy-db --java-db-repository public.ecr.aws/aquasecurity/trivy-java-db --ignore-unfixed --ignorefile
51-
.trivyignore --severity HIGH,LOW,MEDIUM kafka-connect-s3/target/components/packages
47+
- trivy --skip-files "*.zip" rootfs --scanners vuln --db-repository public.ecr.aws/aquasecurity/trivy-db --java-db-repository public.ecr.aws/aquasecurity/trivy-java-db --ignore-unfixed
48+
--ignorefile .trivyignore --exit-code 1 --severity CRITICAL target/components/packages
49+
- trivy --skip-files "*.zip" rootfs --scanners vuln --db-repository public.ecr.aws/aquasecurity/trivy-db --java-db-repository public.ecr.aws/aquasecurity/trivy-java-db --ignore-unfixed
50+
--ignorefile .trivyignore --severity HIGH,LOW,MEDIUM target/components/packages
5251
- . cache-maven store
5352
epilogue:
5453
always:
@@ -65,7 +64,8 @@ blocks:
6564
jobs:
6665
- name: Release
6766
commands:
68-
- mvn -Dcloud -Pjenkins -U -Dmaven.wagon.http.retryHandler.count=10 -Ddependency.check.skip=true -Daether.dependencyCollector.impl=bf -Dmaven.artifact.threads=100 --batch-mode -DaltDeploymentRepository=confluent-codeartifact-internal::default::https://confluent-519856050701.d.codeartifact.us-west-2.amazonaws.com/maven/maven-snapshots/
67+
- mvn -Dcloud -Pjenkins -U -Dmaven.wagon.http.retryHandler.count=10 --batch-mode
68+
-DaltDeploymentRepository=confluent-codeartifact-internal::default::https://confluent-519856050701.d.codeartifact.us-west-2.amazonaws.com/maven/maven-snapshots/
6969
-DrepositoryId=confluent-codeartifact-internal deploy -DskipTests
7070
- name: Release Notes
7171
dependencies: []
@@ -78,35 +78,11 @@ blocks:
7878
- git clone --branch master --single-branch [email protected]:confluentinc/connect-releases.git
7979
- ./connect-releases/tasks/release-connect-plugins/generate-connect-changelogs.sh
8080

81-
# This is auto-managed by connect-ci-cd-pipelines semaphore task, to disable please reach out on slack #connect-testability
82-
- name: Connector Kafka Docker Playground Test
83-
dependencies: []
84-
run:
85-
# Run this block only for pull requests
86-
when: "pull_request =~ '.*'"
87-
task:
88-
jobs:
89-
- name: Trigger Kafka Docker Playground Test
90-
commands:
91-
# Don't run this block if target branch for PR is not a nightly branch or master branch
92-
- |
93-
if [[ "$SEMAPHORE_GIT_BRANCH" =~ ^[0-9]+\.[0-9]+\.x$ ]] || [[ "$SEMAPHORE_GIT_BRANCH" == "master" ]] ; then \
94-
echo "PR is targeted to ${SEMAPHORE_GIT_BRANCH} branch which is feature or master branch. Triggering run-kdp-matrix-on-pr-builds task."; \
95-
sem-trigger -p connect-ci-cd-pipelines \
96-
-t run-kdp-matrix-on-pr-builds \
97-
-b master \
98-
-i "REPO_NAME:$(basename $SEMAPHORE_GIT_REPO_SLUG)" \
99-
-i "BRANCH_NAME:${SEMAPHORE_GIT_PR_BRANCH}" \
100-
-w
101-
else \
102-
echo "PR is targeted to ${SEMAPHORE_GIT_BRANCH} branch which is not feature or master branch. Skipping Kafka Docker Playground Test Task."; \
103-
fi;
104-
10581
after_pipeline:
10682
task:
10783
agent:
10884
machine:
109-
type: s1-prod-ubuntu24-04-arm64-0
85+
type: s1-prod-ubuntu24-04-arm64-00
11086
jobs:
11187
- name: Metrics
11288
commands:
@@ -117,6 +93,5 @@ after_pipeline:
11793
- name: SonarQube
11894
commands:
11995
- checkout
120-
- sem-version java 11
12196
- artifact pull workflow target
12297
- emit-sonarqube-data --run_only_sonar_scan

0 commit comments

Comments
 (0)