Skip to content

Commit 261d59e

Browse files
authored
feat(packages): Add TiKV experiment profile and update builder images (#599)
Update TiKV builder to v2024.10.8-139-g74d1fec with devtoolset8/9 variants and add build configuration for the new experiment profile using devtoolset9
1 parent feae9c0 commit 261d59e

File tree

1 file changed

+17
-12
lines changed

1 file changed

+17
-12
lines changed

packages/packages.yaml.tmpl

Lines changed: 17 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -919,11 +919,7 @@ components:
919919
type: image
920920
artifactory:
921921
repo: "{{ .Release.registry }}/pingcap/tidb/images/tidb-server"
922-
{{- if eq .Release.profile "enterprise" }}
923-
dockerfile: https://github.com/PingCAP-QE/artifacts/raw/main/dockerfiles/products/tidb/tidb.enterprise.Dockerfile
924-
{{- else }}
925-
dockerfile: https://github.com/PingCAP-QE/artifacts/raw/main/dockerfiles/products/tidb/tidb.Dockerfile
926-
{{- end }}
922+
dockerfile: https://github.com/PingCAP-QE/artifacts/raw/main/dockerfiles/products/tidb/{{ ternary "tidb.enterprise.Dockerfile" "tidb.Dockerfile" (eq .Release.profile "enterprise") }}
927923
files: # prepare for context
928924
- name: tidb-server
929925
src:
@@ -1064,11 +1060,7 @@ components:
10641060
type: image
10651061
artifactory:
10661062
repo: "{{ .Release.registry }}/pingcap/tidb/images/tidb-server"
1067-
{{- if eq .Release.profile "enterprise" }}
1068-
dockerfile: https://github.com/PingCAP-QE/artifacts/raw/main/dockerfiles/products/tidb/tidb.enterprise.Dockerfile
1069-
{{- else }}
1070-
dockerfile: https://github.com/PingCAP-QE/artifacts/raw/main/dockerfiles/products/tidb/tidb.Dockerfile
1071-
{{- end }}
1063+
dockerfile: https://github.com/PingCAP-QE/artifacts/raw/main/dockerfiles/products/tidb/{{ ternary "tidb.enterprise.Dockerfile" "tidb.Dockerfile" (eq .Release.profile "enterprise") }}
10721064
files: # prepare for context
10731065
- name: tidb-server
10741066
src:
@@ -2555,8 +2547,10 @@ components:
25552547
- {{ .Release.version }}
25562548
# binary builder, also we need it when build for mac to get build tools versions and other informations.
25572549
builders:
2558-
- if: {{ semver.CheckConstraint ">= 8.4.0-0" .Release.version }}
2559-
image: ghcr.io/pingcap-qe/cd/builders/tikv:v2024.10.8-126-g2a14891-centos7
2550+
- if: {{ semver.CheckConstraint ">= 9.0.0-0" .Release.version }}
2551+
image: "ghcr.io/pingcap-qe/cd/builders/tikv:v2024.10.8-139-g74d1fec-centos7-devtoolset{{ ternary "9" "8" (eq "experiment" .Release.profile) }}"
2552+
- if: {{ semver.CheckConstraint ">= 8.4.0-0, < 9.0.0-0" .Release.version }}
2553+
image: ghcr.io/pingcap-qe/cd/builders/tikv:v2024.10.8-139-g74d1fec-centos7-devtoolset8
25602554
- if: {{ semver.CheckConstraint ">= 6.1.0-0, < 8.4.0-0" .Release.version }}
25612555
image: ghcr.io/pingcap-qe/cd/builders/tikv:v20240325-24-gd14aee6
25622556
- if: {{ and (semver.CheckConstraint "~6.5.6-0" .Release.version) (eq "fips" .Release.profile) }}
@@ -2601,6 +2595,17 @@ components:
26012595
fi
26022596
- script: |
26032597
ROCKSDB_SYS_STATIC=1 make fail_release
2598+
experiment:
2599+
- os: linux
2600+
script: |
2601+
if [ -f /opt/rh/devtoolset-9/enable ]; then
2602+
source /opt/rh/devtoolset-9/enable
2603+
fi
2604+
if [ "$(uname -m)" == "aarch64" ]; then
2605+
export JEMALLOC_SYS_WITH_LG_PAGE=16
2606+
fi
2607+
- script: |
2608+
ROCKSDB_SYS_STATIC=1 make dist_release
26042609
artifacts:
26052610
- name: "tikv-{{ .Release.version }}-{{ .Release.os }}-{{ .Release.arch }}.tar.gz"
26062611
if: {{ ne "enterprise" .Release.profile }}

0 commit comments

Comments
 (0)