diff --git a/pipelines/pingcap/tiflow/latest/pod-ghpr_verify.yaml b/pipelines/pingcap/tiflow/latest/pod-ghpr_verify.yaml index d06e6d180..4a3d043bb 100644 --- a/pipelines/pingcap/tiflow/latest/pod-ghpr_verify.yaml +++ b/pipelines/pingcap/tiflow/latest/pod-ghpr_verify.yaml @@ -5,7 +5,7 @@ spec: fsGroup: 1000 containers: - name: golang - image: "hub.pingcap.net/jenkins/centos7_golang-1.23:latest" + image: "hub.pingcap.net/jenkins/rocky8_golang-1.23:latest" tty: true resources: requests: @@ -35,13 +35,6 @@ spec: limits: memory: 256Mi cpu: 100m - volumes: - - name: gopathcache - persistentVolumeClaim: - claimName: gopathcache - - name: gocache - persistentVolumeClaim: - claimName: gocache affinity: nodeAffinity: requiredDuringSchedulingIgnoredDuringExecution: diff --git a/pipelines/pingcap/tiflow/latest/pod-merged_unit_test.yaml b/pipelines/pingcap/tiflow/latest/pod-merged_unit_test.yaml index 52e5efdd5..d9d6d2223 100644 --- a/pipelines/pingcap/tiflow/latest/pod-merged_unit_test.yaml +++ b/pipelines/pingcap/tiflow/latest/pod-merged_unit_test.yaml @@ -5,7 +5,7 @@ spec: fsGroup: 1000 containers: - name: golang - image: "hub.pingcap.net/jenkins/centos7_golang-1.23:latest" + image: "hub.pingcap.net/jenkins/rocky8_golang-1.23:latest" tty: true resources: requests: diff --git a/pipelines/pingcap/tiflow/latest/pod-periodics_cdc_integration_kafka_test.yaml b/pipelines/pingcap/tiflow/latest/pod-periodics_cdc_integration_kafka_test.yaml index a67c97cd1..276cd4b3e 100644 --- a/pipelines/pingcap/tiflow/latest/pod-periodics_cdc_integration_kafka_test.yaml +++ b/pipelines/pingcap/tiflow/latest/pod-periodics_cdc_integration_kafka_test.yaml @@ -20,7 +20,7 @@ spec: name: volume-0 - args: - cat - image: hub.pingcap.net/jenkins/golang-tini:1.23 + image: hub.pingcap.net/jenkins/rocky8_golang-1.23:tini imagePullPolicy: Always name: golang resources: diff --git a/pipelines/pingcap/tiflow/latest/pod-pull_cdc_integration_kafka_test.yaml b/pipelines/pingcap/tiflow/latest/pod-pull_cdc_integration_kafka_test.yaml index a67c97cd1..276cd4b3e 100644 --- a/pipelines/pingcap/tiflow/latest/pod-pull_cdc_integration_kafka_test.yaml +++ b/pipelines/pingcap/tiflow/latest/pod-pull_cdc_integration_kafka_test.yaml @@ -20,7 +20,7 @@ spec: name: volume-0 - args: - cat - image: hub.pingcap.net/jenkins/golang-tini:1.23 + image: hub.pingcap.net/jenkins/rocky8_golang-1.23:tini imagePullPolicy: Always name: golang resources: diff --git a/pipelines/pingcap/tiflow/latest/pod-pull_cdc_integration_pulsar_test.yaml b/pipelines/pingcap/tiflow/latest/pod-pull_cdc_integration_pulsar_test.yaml index b7a9db2d4..4768a1a89 100644 --- a/pipelines/pingcap/tiflow/latest/pod-pull_cdc_integration_pulsar_test.yaml +++ b/pipelines/pingcap/tiflow/latest/pod-pull_cdc_integration_pulsar_test.yaml @@ -5,7 +5,7 @@ spec: fsGroup: 1000 containers: - name: golang - image: "hub.pingcap.net/jenkins/centos7_golang-1.23:pulsar-test" + image: "hub.pingcap.net/jenkins/rocky8_golang-1.23:latest" tty: true resources: requests: diff --git a/pipelines/pingcap/tiflow/latest/pod-pull_cdc_integration_storage_test.yaml b/pipelines/pingcap/tiflow/latest/pod-pull_cdc_integration_storage_test.yaml index 2f08d332f..5e882fb8c 100644 --- a/pipelines/pingcap/tiflow/latest/pod-pull_cdc_integration_storage_test.yaml +++ b/pipelines/pingcap/tiflow/latest/pod-pull_cdc_integration_storage_test.yaml @@ -5,7 +5,7 @@ spec: fsGroup: 1000 containers: - name: golang - image: "hub.pingcap.net/jenkins/centos7_golang-1.23:latest" + image: "hub.pingcap.net/jenkins/rocky8_golang-1.23:latest" tty: true resources: requests: diff --git a/pipelines/pingcap/tiflow/latest/pod-pull_cdc_integration_test.yaml b/pipelines/pingcap/tiflow/latest/pod-pull_cdc_integration_test.yaml index 2f08d332f..5e882fb8c 100644 --- a/pipelines/pingcap/tiflow/latest/pod-pull_cdc_integration_test.yaml +++ b/pipelines/pingcap/tiflow/latest/pod-pull_cdc_integration_test.yaml @@ -5,7 +5,7 @@ spec: fsGroup: 1000 containers: - name: golang - image: "hub.pingcap.net/jenkins/centos7_golang-1.23:latest" + image: "hub.pingcap.net/jenkins/rocky8_golang-1.23:latest" tty: true resources: requests: diff --git a/pipelines/pingcap/tiflow/latest/pod-pull_dm_compatibility_test.yaml b/pipelines/pingcap/tiflow/latest/pod-pull_dm_compatibility_test.yaml index c4b92959c..5aec2bf87 100644 --- a/pipelines/pingcap/tiflow/latest/pod-pull_dm_compatibility_test.yaml +++ b/pipelines/pingcap/tiflow/latest/pod-pull_dm_compatibility_test.yaml @@ -3,9 +3,21 @@ kind: Pod spec: securityContext: fsGroup: 1000 + initContainers: + - name: init-mysql-config + image: "hub.pingcap.net/jenkins/rocky8_golang-1.23:latest" + command: + - sh + - -c + - | + echo "[client]" > /mysql-config/.my.cnf + echo "ssl-mode=DISABLED" >> /mysql-config/.my.cnf + volumeMounts: + - mountPath: "/mysql-config" + name: "mysql-config-volume" containers: - name: golang - image: "hub.pingcap.net/jenkins/centos7_golang-1.23:latest" + image: "hub.pingcap.net/jenkins/rocky8_golang-1.23:latest" tty: true resources: requests: @@ -14,13 +26,17 @@ spec: limits: memory: 16Gi cpu: "6" + volumeMounts: + - mountPath: "/home/jenkins/.my.cnf" + name: "mysql-config-volume" + subPath: ".my.cnf" - name: mysql1 image: 'hub.pingcap.net/jenkins/mysql:5.7' tty: true resources: limits: memory: 4Gi - cpu: 2 + cpu: "2" env: - name: MYSQL_ROOT_PASSWORD value: '123456' @@ -38,7 +54,7 @@ spec: resources: limits: memory: 4Gi - cpu: 2 + cpu: "2" env: - name: MYSQL_ROOT_PASSWORD value: '123456' @@ -66,6 +82,9 @@ spec: limits: memory: 256Mi cpu: 100m + volumes: + - name: mysql-config-volume + emptyDir: {} affinity: nodeAffinity: requiredDuringSchedulingIgnoredDuringExecution: @@ -75,3 +94,4 @@ spec: operator: In values: - amd64 + diff --git a/pipelines/pingcap/tiflow/latest/pod-pull_dm_integration_test.yaml b/pipelines/pingcap/tiflow/latest/pod-pull_dm_integration_test.yaml index c3098f811..7243ad355 100644 --- a/pipelines/pingcap/tiflow/latest/pod-pull_dm_integration_test.yaml +++ b/pipelines/pingcap/tiflow/latest/pod-pull_dm_integration_test.yaml @@ -3,9 +3,21 @@ kind: Pod spec: securityContext: fsGroup: 1000 + initContainers: + - name: init-mysql-config + image: "hub.pingcap.net/jenkins/rocky8_golang-1.23:latest" + command: + - sh + - -c + - | + echo "[client]" > /mysql-config/.my.cnf + echo "ssl-mode=DISABLED" >> /mysql-config/.my.cnf + volumeMounts: + - mountPath: "/mysql-config" + name: "mysql-config-volume" containers: - name: golang - image: "hub.pingcap.net/jenkins/centos7_golang-1.23:latest" + image: "hub.pingcap.net/jenkins/rocky8_golang-1.23:latest" tty: true resources: requests: @@ -14,13 +26,17 @@ spec: limits: memory: 16Gi cpu: "6" + volumeMounts: + - mountPath: "/home/jenkins/.my.cnf" + name: "mysql-config-volume" + subPath: ".my.cnf" - name: mysql1 image: "hub.pingcap.net/jenkins/mysql:5.7" tty: true resources: limits: memory: 4Gi - cpu: 2 + cpu: "2" env: - name: MYSQL_ROOT_PASSWORD value: "123456" @@ -38,7 +54,7 @@ spec: resources: limits: memory: 4Gi - cpu: 2 + cpu: "2" env: - name: MYSQL_ROOT_PASSWORD value: "123456" @@ -66,6 +82,9 @@ spec: limits: memory: 256Mi cpu: 100m + volumes: + - name: mysql-config-volume + emptyDir: {} affinity: nodeAffinity: requiredDuringSchedulingIgnoredDuringExecution: diff --git a/pipelines/pingcap/tiflow/latest/pod-pull_engine_integration_test.yaml b/pipelines/pingcap/tiflow/latest/pod-pull_engine_integration_test.yaml index 70d2512c4..b5dbb098c 100644 --- a/pipelines/pingcap/tiflow/latest/pod-pull_engine_integration_test.yaml +++ b/pipelines/pingcap/tiflow/latest/pod-pull_engine_integration_test.yaml @@ -5,7 +5,7 @@ spec: fsGroup: 1000 containers: - name: golang - image: "hub.pingcap.net/jenkins/centos7_golang-1.23:latest" + image: "hub.pingcap.net/jenkins/rocky8_golang-1.23:latest" tty: true resources: limits: