Skip to content

Commit 2ae9164

Browse files
committed
chore(packages): add sync_trunk_next-gen rules for next-gen image delivery (#630)
Close PingCAP-QE/ci#3537 This pull request introduces a new configuration for "next-gen" image synchronization in the `packages/delivery.yaml` file. It adds a `sync_trunk_next-gen` definition and integrates it into the `image_copy_rules` section for several components, enabling the delivery of next-gen images to specific repositories. ### Configuration Updates for Next-Gen Image Synchronization: * **Definition Addition**: - Added `sync_trunk_next-gen` definition with a description and regex pattern for identifying next-gen branches. (`packages/delivery.yaml`, [packages/delivery.yamlR13-R16](diffhunk://#diff-95b19687ffd73deffa23edebbb4b0a94ba865cb9c854c36a77281c93703822e6R13-R16)) * **Integration in Image Copy Rules**: - Updated rules for `tidb-server` to include next-gen synchronization to `gcr.io/pingcap-public/dbaas/tidb`. (`packages/delivery.yaml`, [packages/delivery.yamlR133-R135](diffhunk://#diff-95b19687ffd73deffa23edebbb4b0a94ba865cb9c854c36a77281c93703822e6R133-R135)) - Updated rules for `br` to include next-gen synchronization to `gcr.io/pingcap-public/dbaas/br`. (`packages/delivery.yaml`, [packages/delivery.yamlR157-R159](diffhunk://#diff-95b19687ffd73deffa23edebbb4b0a94ba865cb9c854c36a77281c93703822e6R157-R159)) - Updated rules for `tidb-lightning` to include next-gen synchronization to `gcr.io/pingcap-public/dbaas/tidb-lightning`. (`packages/delivery.yaml`, [packages/delivery.yamlR181-R183](diffhunk://#diff-95b19687ffd73deffa23edebbb4b0a94ba865cb9c854c36a77281c93703822e6R181-R183)) - Updated rules for `dumpling` to include next-gen synchronization to `gcr.io/pingcap-public/dbaas/dumpling`. (`packages/delivery.yaml`, [packages/delivery.yamlR205-R207](diffhunk://#diff-95b19687ffd73deffa23edebbb4b0a94ba865cb9c854c36a77281c93703822e6R205-R207)) - Updated rules for `tiflash` to include next-gen synchronization to `gcr.io/pingcap-public/dbaas/tiflash`. (`packages/delivery.yaml`, [packages/delivery.yamlR293-R295](diffhunk://#diff-95b19687ffd73deffa23edebbb4b0a94ba865cb9c854c36a77281c93703822e6R293-R295)) - Updated rules for `pd` to include next-gen synchronization to `gcr.io/pingcap-public/dbaas/pd`. (`packages/delivery.yaml`, [packages/delivery.yamlR407-R409](diffhunk://#diff-95b19687ffd73deffa23edebbb4b0a94ba865cb9c854c36a77281c93703822e6R407-R409))
1 parent 12a7b6d commit 2ae9164

File tree

1 file changed

+25
-0
lines changed

1 file changed

+25
-0
lines changed

packages/delivery.yaml

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,10 @@ definitions:
1010
tags_regex: [^master(-experiment)?$]
1111
constant_tags: [nightly] # add new tags.
1212
sync_trunk_enterprise: &sync_trunk_enterprise {}
13+
sync_trunk_next-gen: &sync_trunk_next-gen
14+
description: delivery next-gen images for developing branches.
15+
tags_regex:
16+
- ^(master|dedicated|feature_next-gen.*)(-.*)?-next-gen$
1317
sync_pre_community: &sync_pre_community
1418
description: delivery community images for release branches.
1519
tags_regex:
@@ -126,6 +130,9 @@ image_copy_rules:
126130
- docker.io/pingcap/tidb-operator-prestop-hook
127131
- gcr.io/pingcap-public/dbaas/tidb-operator-prestop-hook
128132
hub.pingcap.net/pingcap/tidb/images/tidb-server:
133+
- <<: *sync_trunk_next-gen
134+
dest_repositories:
135+
- gcr.io/pingcap-public/dbaas/tidb
129136
- <<: *sync_trunk_community
130137
dest_repositories:
131138
- docker.io/pingcap/tidb
@@ -147,6 +154,9 @@ image_copy_rules:
147154
- gcr.io/pingcap-public/dbaas/tidb
148155
- docker.io/pingcap/tidb-enterprise
149156
hub.pingcap.net/pingcap/tidb/images/br:
157+
- <<: *sync_trunk_next-gen
158+
dest_repositories:
159+
- gcr.io/pingcap-public/dbaas/br
150160
- <<: *sync_trunk_community
151161
dest_repositories:
152162
- docker.io/pingcap/br
@@ -168,6 +178,9 @@ image_copy_rules:
168178
- gcr.io/pingcap-public/dbaas/br
169179
- docker.io/pingcap/br-enterprise
170180
hub.pingcap.net/pingcap/tidb/images/tidb-lightning:
181+
- <<: *sync_trunk_next-gen
182+
dest_repositories:
183+
- gcr.io/pingcap-public/dbaas/tidb-lightning
171184
- <<: *sync_trunk_community
172185
dest_repositories:
173186
- docker.io/pingcap/tidb-lightning
@@ -189,6 +202,9 @@ image_copy_rules:
189202
- gcr.io/pingcap-public/dbaas/tidb-lightning
190203
- docker.io/pingcap/tidb-lightning-enterprise
191204
hub.pingcap.net/pingcap/tidb/images/dumpling:
205+
- <<: *sync_trunk_next-gen
206+
dest_repositories:
207+
- gcr.io/pingcap-public/dbaas/dumpling
192208
- <<: *sync_trunk_community
193209
dest_repositories:
194210
- docker.io/pingcap/dumpling
@@ -274,6 +290,9 @@ image_copy_rules:
274290
dest_repositories:
275291
- docker.io/pingcap/sync-diff-inspector
276292
hub.pingcap.net/pingcap/tiflash/image:
293+
- <<: *sync_trunk_next-gen
294+
dest_repositories:
295+
- gcr.io/pingcap-public/dbaas/tiflash
277296
- <<: *sync_trunk_community
278297
dest_repositories:
279298
- docker.io/pingcap/tiflash
@@ -364,6 +383,9 @@ image_copy_rules:
364383
- gcr.io/pingcap-public/dbaas/tidb-binlog
365384
- docker.io/pingcap/tidb-binlog-enterprise
366385
hub.pingcap.net/tikv/tikv/image:
386+
- <<: *sync_trunk_next-gen
387+
dest_repositories:
388+
- gcr.io/pingcap-public/dbaas/tikv
367389
- <<: *sync_trunk_community
368390
dest_repositories:
369391
- docker.io/pingcap/tikv
@@ -385,6 +407,9 @@ image_copy_rules:
385407
- gcr.io/pingcap-public/dbaas/tikv
386408
- docker.io/pingcap/tikv-enterprise
387409
hub.pingcap.net/tikv/pd/image:
410+
- <<: *sync_trunk_next-gen
411+
dest_repositories:
412+
- gcr.io/pingcap-public/dbaas/pd
388413
- <<: *sync_trunk_community
389414
dest_repositories:
390415
- docker.io/pingcap/pd

0 commit comments

Comments
 (0)