ci: fix builder image tags and simpfy the skaffold config (#462)

Signed-off-by: wuhuizuo <wuhuizuo@126.com> --------- Signed-off-by: wuhuizuo <wuhuizuo@126.com>
PingCAP-QE · Oct 8, 2024 · 2a60483 · 2a60483
1 parent 77df6d9
commit 2a60483
Show file tree

Hide file tree

Showing 14 changed files with 60 additions and 185 deletions.
diff --git a/.github/workflows/pull-cd-builder-images-centos7.yaml b/.github/workflows/pull-cd-builder-images-centos7.yaml
@@ -1,4 +1,4 @@
-name: Pull test for CD builder images
+name: Pull test for CD builder images - CentOS7
 on:
   pull_request:
     branches:
@@ -76,7 +76,8 @@ jobs:
 
     strategy:
       matrix:
-        module: [builder-tiflash, builder-tikv]
+        # module: [builder-tiflash, builder-tikv]
+        module: [builder-tikv]
         platform: [linux/amd64, linux/arm64]
     steps:
       - name: Checkout sources

diff --git a/.github/workflows/pull-cd-util-images.yaml b/.github/workflows/pull-cd-util-images.yaml
@@ -24,7 +24,6 @@ jobs:
     strategy:
       matrix:
         module: [utils]
-        builder-profile: [local-docker]
         platform: [linux/amd64, linux/arm64]
 
     steps:
@@ -60,5 +59,4 @@ jobs:
             --default-repo ghcr.io/pingcap-qe/cd/utils \
             --module ${{ matrix.module }} \
             --platform ${{ matrix.platform }} \
-            --profile ${{ matrix.builder-profile }} \
             --push=false
diff --git a/.github/workflows/pull-ci-runtime-images.yaml b/.github/workflows/pull-ci-runtime-images.yaml
@@ -6,6 +6,8 @@ on:
     paths:
       - "dockerfiles/ci/base/**/Dockerfile"
       - "dockerfiles/ci/base/**/*.Dockerfile"
+      - "dockerfiles/ci/jenkins/**/Dockerfile"
+      - "dockerfiles/ci/jenkins/**/*.Dockerfile"
       - "dockerfiles/ci/skaffold.yaml"
 
 concurrency:
@@ -25,7 +27,6 @@ jobs:
       matrix:
         module: [ci]
         platform: [linux/amd64, linux/arm64]
-        builder-profile: [local-docker]
         go-profile: [go-1.23, go-1.22, go-1.21]
 
     steps:
@@ -73,5 +74,5 @@ jobs:
             --default-repo ghcr.io/pingcap-qe/ci \
             --module ${{ matrix.module }} \
             --platform ${{ matrix.platform }} \
-            --profile ${{ matrix.go-profile }},${{ matrix.builder-profile }} \
+            --profile ${{ matrix.go-profile }} \
             --push=false
diff --git a/.github/workflows/pull-prod-runtime-images.yaml b/.github/workflows/pull-prod-runtime-images.yaml
@@ -24,7 +24,6 @@ jobs:
     strategy:
       matrix:
         module: [default, fips, release-6-5]
-        builder-profile: [local-docker]
         platform: [linux/amd64, linux/arm64]
 
     steps:
@@ -76,5 +75,4 @@ jobs:
             --default-repo ghcr.io/pingcap-qe/bases \
             --module ${{ matrix.module }} \
             --platform ${{ matrix.platform }} \
-            --profile ${{ matrix.builder-profile }} \
             --push=false
diff --git a/.github/workflows/release-cd-builder-images-centos7.yaml b/.github/workflows/release-cd-builder-images-centos7.yaml
@@ -1,4 +1,4 @@
-name: Publish CD builder images
+name: Publish CD builder images - CentOS7
 on:
   workflow_dispatch:
   push:

diff --git a/.github/workflows/release-cd-util-images.yaml b/.github/workflows/release-cd-util-images.yaml
@@ -21,7 +21,6 @@ jobs:
     strategy:
       matrix:
         module: [utils]
-        builder-profile: [local-docker]
 
     steps:
       - name: Checkout sources
@@ -57,5 +56,4 @@ jobs:
             --build-concurrency 1 \
             --cache-artifacts \
             --default-repo ghcr.io/pingcap-qe/cd/utils \
-            --module ${{ matrix.module }} \
-            --profile ${{ matrix.builder-profile }}
+            --module ${{ matrix.module }}
diff --git a/.github/workflows/release-ci-runtime-images.yaml b/.github/workflows/release-ci-runtime-images.yaml
@@ -21,7 +21,6 @@ jobs:
     strategy:
       matrix:
         module: [ci]
-        builder-profile: [local-docker]
         go-profile: [go-1.23, go-1.22, go-1.21]
 
     steps:
@@ -69,4 +68,4 @@ jobs:
             --cache-artifacts \
             --default-repo ghcr.io/pingcap-qe/ci \
             --module ${{ matrix.module }} \
-            --profile ${{ matrix.go-profile }},${{ matrix.builder-profile }}
+            --profile ${{ matrix.go-profile }}
diff --git a/.github/workflows/release-prod-runtime-images.yaml b/.github/workflows/release-prod-runtime-images.yaml
@@ -21,7 +21,6 @@ jobs:
     strategy:
       matrix:
         module: [default, fips, release-6-5]
-        builder-profile: [local-docker]
 
     steps:
       - name: Checkout sources
@@ -70,5 +69,4 @@ jobs:
             --build-concurrency 1 \
             --cache-artifacts \
             --default-repo ghcr.io/pingcap-qe/bases \
-            --module ${{ matrix.module }} \
-            --profile ${{ matrix.builder-profile }}
+            --module ${{ matrix.module }}
diff --git a/Justfile b/Justfile
@@ -36,4 +36,4 @@ _clone_without_submodules component git_url git_branch:
     ([ -e ../{{component}}/.dockerignore ] && rm ../{{component}}/.dockerignore) || true # make step depended on git metadata.
 
 _docker_build_prod_base_images registry_prefix:
-    cd dockerfiles/bases; skaffold build --profile local-docker --default-repo {{registry_prefix}}
+    cd dockerfiles/bases; skaffold build --default-repo {{registry_prefix}}
diff --git a/dockerfiles/bases/skaffold.yaml b/dockerfiles/bases/skaffold.yaml
@@ -1,4 +1,4 @@
-# Ref: https://skaffold.dev/docs/builders/builder-types/docker/#dockerfile-in-cluster-with-kaniko
+# Ref: https://skaffold.dev/docs/builders/builder-types/docker
 apiVersion: skaffold/v4beta6
 kind: Config
 metadata:
@@ -7,103 +7,59 @@ build:
   artifacts:
     - image: pingcap-base
       platforms: [linux/amd64, linux/arm64]
-      kaniko:
+      docker:
         dockerfile: pingcap-base/Dockerfile
-        cache: {}
     - image: pd-base
       platforms: [linux/amd64, linux/arm64]
       requires:
         - image: pingcap-base
           alias: PINGCAP_BASE
-      kaniko:
+      docker:
         dockerfile: pd-base/Dockerfile
-        cache: {}
     - image: ng-monitoring-base
       platforms: [linux/amd64, linux/arm64]
       requires:
         - image: pingcap-base
           alias: PINGCAP_BASE
-      kaniko:
+      docker:
         dockerfile: ng-monitoring-base/Dockerfile
-        cache: {}
     - image: tidb-base
       platforms: [linux/amd64, linux/arm64]
       requires:
         - image: pingcap-base
           alias: PINGCAP_BASE
-      kaniko:
+      docker:
         dockerfile: tidb-base/Dockerfile
-        cache: {}
     - image: tiflash-base
       platforms: [linux/amd64, linux/arm64]
       requires:
         - image: pingcap-base
           alias: PINGCAP_BASE
-      kaniko:
+      docker:
         dockerfile: tiflash-base/Dockerfile
-        cache: {}
     - image: tikv-base
       platforms: [linux/amd64, linux/arm64]
       requires:
         - image: pingcap-base
           alias: PINGCAP_BASE
-      kaniko:
+      docker:
         dockerfile: tikv-base/Dockerfile
-        cache: {}
     - image: tools-base
       platforms: [linux/amd64, linux/arm64]
       requires:
         - image: pingcap-base
           alias: PINGCAP_BASE
-      kaniko:
+      docker:
         dockerfile: tools-base/Dockerfile
-        cache: {}
   tagPolicy:
     customTemplate:
       template: "v1.9.2"
-  cluster:
+  local:
+    useDockerCLI: true
+    useBuildkit: true
     concurrency: 0
-    randomDockerConfigSecret: false
-    randomPullSecret: false
-    dockerConfig:
-      secretName: hub-pingcap-net
-    resources:
-      requests:
-        cpu: "1"
-        memory: 4Gi
-      limits:
-        cpu: "2"
-        memory: 8Gi
-profiles:
-  - name: local-docker
-    build:
-      local:
-        useDockerCLI: true
-        useBuildkit: true
-        concurrency: 0
-        tryImportMissing: true
-    patches:
-      - op: move
-        from: /build/artifacts/0/kaniko
-        path: /build/artifacts/0/docker
-      - op: move
-        from: /build/artifacts/1/kaniko
-        path: /build/artifacts/1/docker
-      - op: move
-        from: /build/artifacts/2/kaniko
-        path: /build/artifacts/2/docker
-      - op: move
-        from: /build/artifacts/3/kaniko
-        path: /build/artifacts/3/docker
-      - op: move
-        from: /build/artifacts/4/kaniko
-        path: /build/artifacts/4/docker
-      - op: move
-        from: /build/artifacts/5/kaniko
-        path: /build/artifacts/5/docker
-      - op: move
-        from: /build/artifacts/6/kaniko
-        path: /build/artifacts/6/docker
+    tryImportMissing: true
+
 ---
 apiVersion: skaffold/v4beta6
 kind: Config
@@ -113,37 +69,16 @@ build:
   artifacts:
     - image: tikv-base
       platforms: [linux/amd64, linux/arm64]
-      kaniko:
+      docker:
         dockerfile: tikv-base/fips.Dockerfile
-        cache: {}
   tagPolicy:
     customTemplate:
       template: "v1.9.1-fips"
-  cluster:
+  local:
+    useDockerCLI: true
+    useBuildkit: true
     concurrency: 0
-    randomDockerConfigSecret: false
-    randomPullSecret: false
-    dockerConfig:
-      secretName: hub-pingcap-net
-    resources:
-      requests:
-        cpu: "1"
-        memory: 4Gi
-      limits:
-        cpu: "2"
-        memory: 8Gi
-profiles:
-  - name: local-docker
-    build:
-      local:
-        useDockerCLI: true
-        useBuildkit: true
-        concurrency: 0
-        tryImportMissing: true
-    patches:
-      - op: move
-        from: /build/artifacts/0/kaniko
-        path: /build/artifacts/0/docker
+    tryImportMissing: true
 ---
 apiVersion: skaffold/v4beta6
 kind: Config
@@ -152,49 +87,49 @@ metadata:
 build:
   artifacts:
     - image: ng-monitoring-base
-      platforms: [linux/amd64,linux/arm64]
+      platforms: [linux/amd64, linux/arm64]
       custom:
         buildCommand: ./build-old.sh ng-monitoring-base release-6.5.Dockerfile
         dependencies:
           dockerfile:
             path: ng-monitoring-base/release-6.5.Dockerfile
     - image: pd-base
-      platforms: [linux/amd64,linux/arm64]
+      platforms: [linux/amd64, linux/arm64]
       custom:
         buildCommand: ./build-old.sh pd-base release-6.5.Dockerfile
         dependencies:
           dockerfile:
             path: pd-base/release-6.5.Dockerfile
     - image: tidb-base
-      platforms: [linux/amd64,linux/arm64]
+      platforms: [linux/amd64, linux/arm64]
       custom:
         buildCommand: ./build-old.sh tidb-base release-6.5.Dockerfile
         dependencies:
           dockerfile:
             path: tidb-base/release-6.5.Dockerfile
     - image: tiflash-base
-      platforms: [linux/amd64,linux/arm64]
+      platforms: [linux/amd64, linux/arm64]
       docker:
         dockerfile: tiflash-base/release-6.5.Dockerfile
         noCache: false
         pullParent: false
         squash: false
     - image: tiflow-base
-      platforms: [linux/amd64,linux/arm64]
+      platforms: [linux/amd64, linux/arm64]
       custom:
         buildCommand: ./build-old.sh tiflow-base release-6.5.Dockerfile
         dependencies:
           dockerfile:
             path: tiflow-base/release-6.5.Dockerfile
     - image: tikv-base
-      platforms: [linux/amd64,linux/arm64]
+      platforms: [linux/amd64, linux/arm64]
       custom:
         buildCommand: ./build-old.sh tikv-base release-6.5.Dockerfile
         dependencies:
           dockerfile:
             path: tikv-base/release-6.5.Dockerfile
     - image: tools-base
-      platforms: [linux/amd64,linux/arm64]
+      platforms: [linux/amd64, linux/arm64]
       custom:
         buildCommand: ./build-old.sh tools-base release-6.5.Dockerfile
         dependencies:

diff --git a/dockerfiles/cd/builders/skaffold-centos7.yaml b/dockerfiles/cd/builders/skaffold-centos7.yaml
@@ -181,7 +181,7 @@ profiles:
         path: /build/tagPolicy/customTemplate/template
         value: "{{ .SHA }}-centos7-devtoolset8"
       - op: add
-        path: /build/artifacts/0/kaniko/buildArgs
+        path: /build/artifacts/0/docker/buildArgs
         value:
           DEVTOOLSET_VER: 8
   - name: devtoolset9
@@ -190,7 +190,7 @@ profiles:
         path: /build/tagPolicy/customTemplate/template
         value: "{{ .SHA }}-centos7-devtoolset9"
       - op: add
-        path: /build/artifacts/0/kaniko/buildArgs
+        path: /build/artifacts/0/docker/buildArgs
         value:
           DEVTOOLSET_VER: 9
   - name: devtoolset10
@@ -199,7 +199,7 @@ profiles:
         path: /build/tagPolicy/customTemplate/template
         value: "{{ .SHA }}-centos7-devtoolset10"
       - op: add
-        path: /build/artifacts/0/kaniko/buildArgs
+        path: /build/artifacts/0/docker/buildArgs
         value:
           DEVTOOLSET_VER: 10
 ---

diff --git a/dockerfiles/cd/builders/skaffold.yaml b/dockerfiles/cd/builders/skaffold.yaml
@@ -142,7 +142,7 @@ build:
     tryImportMissing: true
   tagPolicy:
     customTemplate:
-      template: "{{ .SHA }}-centos7"
+      template: "{{ .SHA }}"
       components:
         - name: SHA
           gitCommit: