Skip to content

Commit 324b9fc

Browse files
authored
apply service bot changes (#537)
1 parent 058c51b commit 324b9fc

File tree

4 files changed

+90
-4
lines changed

4 files changed

+90
-4
lines changed

.semaphore/cp_dockerfile_build.yml

Lines changed: 30 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -78,6 +78,28 @@ global_job_config:
7878
- export LATEST_TAG=$BRANCH_TAG-latest
7979
- export DOCKER_UPSTREAM_TAG="$LATEST_TAG"
8080
- export DOCKER_REPOS="confluentinc/kafka-streams-examples"
81+
- export COMMUNITY_DOCKER_REPOS=""
82+
- |
83+
if [[ $SKIP_COMMUNITY == "True" ]]; then
84+
# Filter out community repos from DOCKER_REPOS
85+
DOCKER_REPOS=$(comm -23 <(echo "$DOCKER_REPOS" | tr ' ' '\n' | sort) <(echo "$COMMUNITY_DOCKER_REPOS" | tr ' ' '\n' | sort) | tr '\n' ' ' | xargs)
86+
export DOCKER_REPOS
87+
echo "DOCKER_REPOS after skipping community images - $DOCKER_REPOS"
88+
89+
# Set Maven arguments for skipping community modules
90+
export MAVEN_EXTRA_ARGS=""
91+
92+
# Check if current DOCKER_IMAGE is in community repos, skip job execution
93+
for skip_repo in $COMMUNITY_DOCKER_REPOS; do
94+
if [ "$skip_repo" = "$DOCKER_IMAGE" ]; then
95+
echo "Skipping build for $DOCKER_IMAGE as it is in COMMUNITY_DOCKER_REPOS list"
96+
export SEMAPHORE_JOB_RESULT=passed
97+
return 130
98+
fi
99+
done
100+
else
101+
export MAVEN_EXTRA_ARGS=""
102+
fi
81103
- export DOCKER_DEV_TAG="dev-$BRANCH_TAG-$BUILD_NUMBER"
82104
- export AMD_ARCH=.amd64
83105
- export ARM_ARCH=.arm64
@@ -107,7 +129,7 @@ blocks:
107129
- export PACKAGING_BUILD_ARGS="$PACKAGING_BUILD_ARGS -DCONFLUENT_PACKAGES_REPO=$PACKAGES_URL"
108130
- mvn -Dmaven.wagon.http.retryHandler.count=3 --batch-mode -P jenkins,docker clean package dependency:analyze validate -U -Ddocker.registry=$DOCKER_DEV_REGISTRY -Ddocker.upstream-registry=$DOCKER_UPSTREAM_REGISTRY
109131
-DBUILD_NUMBER=$BUILD_NUMBER -DGIT_COMMIT=$GIT_COMMIT -Ddocker.tag=$DOCKER_DEV_TAG$OS_TAG$AMD_ARCH -Ddocker.upstream-tag=$DOCKER_UPSTREAM_TAG$OS_TAG -Darch.type=$AMD_ARCH -Ddocker.os_type=ubi9
110-
$PACKAGING_BUILD_ARGS -Ddependency.check.skip=true
132+
$PACKAGING_BUILD_ARGS -Ddependency.check.skip=true $MAVEN_EXTRA_ARGS
111133
- . cache-maven store
112134
- >-
113135
for dev_image in $AMD_DOCKER_DEV_FULL_IMAGES;
@@ -128,6 +150,9 @@ blocks:
128150
task:
129151
jobs:
130152
- name: Deploy AMD confluentinc/kafka-streams-examples ubi9
153+
env_vars:
154+
- name: DOCKER_IMAGE
155+
value: confluentinc/kafka-streams-examples
131156
commands:
132157
- export OS_TAG="-ubi9"
133158
- export PROD_IMAGE_NAME=${DOCKER_PROD_REGISTRY}confluentinc/kafka-streams-examples
@@ -167,7 +192,7 @@ blocks:
167192
- ci-tools ci-update-version
168193
- mvn -Dmaven.wagon.http.retryHandler.count=3 --batch-mode -P jenkins,docker clean package dependency:analyze validate -U -Ddocker.registry=$DOCKER_DEV_REGISTRY -Ddocker.upstream-registry=$DOCKER_UPSTREAM_REGISTRY
169194
-DBUILD_NUMBER=$BUILD_NUMBER -DGIT_COMMIT=$GIT_COMMIT -Ddocker.tag=$DOCKER_DEV_TAG$OS_TAG$ARM_ARCH -Ddocker.upstream-tag=$DOCKER_UPSTREAM_TAG$OS_TAG -Darch.type=$ARM_ARCH -Ddocker.os_type=ubi9
170-
$PACKAGING_BUILD_ARGS -Ddependency.check.skip=true
195+
$PACKAGING_BUILD_ARGS -Ddependency.check.skip=true $MAVEN_EXTRA_ARGS
171196
- . cache-maven store
172197
- for image in $ARM_DOCKER_DEV_FULL_IMAGES; do echo "Pushing $image" && docker push $image; done
173198
epilogue:
@@ -186,6 +211,9 @@ blocks:
186211
type: s1-prod-ubuntu24-04-arm64-1
187212
jobs:
188213
- name: Deploy ARM confluentinc/kafka-streams-examples ubi9
214+
env_vars:
215+
- name: DOCKER_IMAGE
216+
value: confluentinc/kafka-streams-examples
189217
commands:
190218
- export OS_TAG="-ubi9"
191219
- export PROD_IMAGE_NAME=${DOCKER_PROD_REGISTRY}confluentinc/kafka-streams-examples

.semaphore/cp_dockerfile_promote.yml

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -46,13 +46,27 @@ global_job_config:
4646
- docker login --username $DOCKERHUB_USER --password $DOCKERHUB_APIKEY
4747
- export AMD_ARCH=.amd64
4848
- export ARM_ARCH=.arm64
49+
- export COMMUNITY_DOCKER_REPOS=""
50+
- |
51+
if [[ $SKIP_COMMUNITY == "True" ]]; then
52+
for skip_repo in $COMMUNITY_DOCKER_REPOS; do
53+
if [ "$skip_repo" = "$DOCKER_IMAGE" ]; then
54+
echo "Skipping promotion for $DOCKER_IMAGE as it is in COMMUNITY_DOCKER_REPOS list"
55+
export SEMAPHORE_JOB_RESULT=passed
56+
return 130
57+
fi
58+
done
59+
fi
4960
5061
blocks:
5162
- name: Promote AMD
5263
dependencies: []
5364
task:
5465
jobs:
5566
- name: Promote confluentinc/kafka-streams-examples ubi9 AMD
67+
env_vars:
68+
- name: DOCKER_IMAGE
69+
value: confluentinc/kafka-streams-examples
5670
commands:
5771
- export OS_TYPE="ubi9"
5872
- export DOCKER_REPO="confluentinc/kafka-streams-examples"
@@ -85,6 +99,9 @@ blocks:
8599
task:
86100
jobs:
87101
- name: Promote confluentinc/kafka-streams-examples ubi9 ARM
102+
env_vars:
103+
- name: DOCKER_IMAGE
104+
value: confluentinc/kafka-streams-examples
88105
commands:
89106
- export OS_TYPE="ubi9"
90107
- export DOCKER_REPO="confluentinc/kafka-streams-examples"
@@ -117,6 +134,9 @@ blocks:
117134
task:
118135
jobs:
119136
- name: Create Manifest confluentinc/kafka-streams-examples ubi9
137+
env_vars:
138+
- name: DOCKER_IMAGE
139+
value: confluentinc/kafka-streams-examples
120140
commands:
121141
- export OS_TYPE="ubi9"
122142
- if [[ ! "$OS_TYPE" ]]; then export OS_TAG=""; elif [[ "$OS_TYPE" =~ $PROMOTE_OS_TYPE* ]]; then export OS_TAG="-$OS_TYPE"; fi

.semaphore/semaphore.yml

Lines changed: 24 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -71,6 +71,28 @@ global_job_config:
7171
- export LATEST_TAG=$BRANCH_TAG-latest
7272
- export DOCKER_UPSTREAM_TAG="$LATEST_TAG"
7373
- export DOCKER_REPOS="confluentinc/kafka-streams-examples"
74+
- export COMMUNITY_DOCKER_REPOS=""
75+
- |
76+
if [[ $SKIP_COMMUNITY == "True" ]]; then
77+
# Filter out community repos from DOCKER_REPOS
78+
DOCKER_REPOS=$(comm -23 <(echo "$DOCKER_REPOS" | tr ' ' '\n' | sort) <(echo "$COMMUNITY_DOCKER_REPOS" | tr ' ' '\n' | sort) | tr '\n' ' ' | xargs)
79+
export DOCKER_REPOS
80+
echo "DOCKER_REPOS after skipping community images - $DOCKER_REPOS"
81+
82+
# Set Maven arguments for skipping community modules
83+
export MAVEN_EXTRA_ARGS=""
84+
85+
# Check if current DOCKER_IMAGE is in community repos, skip job execution
86+
for skip_repo in $COMMUNITY_DOCKER_REPOS; do
87+
if [ "$skip_repo" = "$DOCKER_IMAGE" ]; then
88+
echo "Skipping build for $DOCKER_IMAGE as it is in COMMUNITY_DOCKER_REPOS list"
89+
export SEMAPHORE_JOB_RESULT=passed
90+
return 130
91+
fi
92+
done
93+
else
94+
export MAVEN_EXTRA_ARGS=""
95+
fi
7496
- export DOCKER_DEV_TAG="dev-$BRANCH_TAG-$BUILD_NUMBER"
7597
- export AMD_ARCH=.amd64
7698
- export ARM_ARCH=.arm64
@@ -99,7 +121,7 @@ blocks:
99121
- export PACKAGING_BUILD_ARGS="$PACKAGING_BUILD_ARGS -DCONFLUENT_PACKAGES_REPO=$PACKAGES_URL"
100122
- mvn -Dmaven.wagon.http.retryHandler.count=3 --batch-mode -P jenkins,docker clean package dependency:analyze validate -U -Ddocker.registry=$DOCKER_DEV_REGISTRY -Ddocker.upstream-registry=$DOCKER_UPSTREAM_REGISTRY
101123
-DBUILD_NUMBER=$BUILD_NUMBER -DGIT_COMMIT=$GIT_COMMIT -Ddocker.tag=$DOCKER_DEV_TAG$OS_TAG$AMD_ARCH -Ddocker.upstream-tag=$DOCKER_UPSTREAM_TAG$OS_TAG -Darch.type=$AMD_ARCH -Ddocker.os_type=ubi9
102-
$PACKAGING_BUILD_ARGS -Ddependency.check.skip=true
124+
$PACKAGING_BUILD_ARGS -Ddependency.check.skip=true $MAVEN_EXTRA_ARGS
103125
- . cache-maven store
104126
- >-
105127
for dev_image in $AMD_DOCKER_DEV_FULL_IMAGES;
@@ -131,7 +153,7 @@ blocks:
131153
- ci-tools ci-update-version
132154
- mvn -Dmaven.wagon.http.retryHandler.count=3 --batch-mode -P jenkins,docker clean package dependency:analyze validate -U -Ddocker.registry=$DOCKER_DEV_REGISTRY -Ddocker.upstream-registry=$DOCKER_UPSTREAM_REGISTRY
133155
-DBUILD_NUMBER=$BUILD_NUMBER -DGIT_COMMIT=$GIT_COMMIT -Ddocker.tag=$DOCKER_DEV_TAG$OS_TAG$ARM_ARCH -Ddocker.upstream-tag=$DOCKER_UPSTREAM_TAG$OS_TAG -Darch.type=$ARM_ARCH -Ddocker.os_type=ubi9
134-
$PACKAGING_BUILD_ARGS -Ddependency.check.skip=true
156+
$PACKAGING_BUILD_ARGS -Ddependency.check.skip=true $MAVEN_EXTRA_ARGS
135157
- . cache-maven store
136158
- for image in $ARM_DOCKER_DEV_FULL_IMAGES; do echo "Pushing $image" && docker push $image; done
137159
epilogue:

service.yml

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,8 @@ semaphore:
1313
enable: true
1414
pipeline_type: cp-dockerfile
1515
docker_repos: ['confluentinc/kafka-streams-examples']
16+
community_docker_repos: []
17+
community_maven_modules: []
1618
maven_phase: 'package' # streams examples integration-test needs host-based networking, won't work in CI as-is
1719
maven_skip_deploy: true
1820
build_arm: true
@@ -44,6 +46,13 @@ semaphore:
4446
- name: CONFLUENT_DEB_VERSION
4547
required: false
4648
default_value: '1'
49+
- name: SKIP_COMMUNITY
50+
required: false
51+
default_value: 'False'
52+
description: 'Skip building community docker images'
53+
options:
54+
- 'True'
55+
- 'False'
4756
- name: cp-dockerfile-promote
4857
branch: master
4958
pipeline_file: .semaphore/cp_dockerfile_promote.yml
@@ -62,3 +71,10 @@ semaphore:
6271
options:
6372
- 'deb'
6473
- 'ubi'
74+
- name: SKIP_COMMUNITY
75+
required: false
76+
default_value: 'False'
77+
description: 'Skip publishing community docker images'
78+
options:
79+
- 'True'
80+
- 'False'

0 commit comments

Comments
 (0)