Skip to content

Commit

Permalink
refactor(apps/prod/tekton/configs): rename build pipelines and tasks (#…
Browse files Browse the repository at this point in the history
…1382)

## Changes

1. drop old pipeline `pingcap-build-package-darwin`.
2. rename `pingcap-build-package-darwin-v2` to
`pingcap-build-package-darwin`.
3. drop old task `pingcap-build-binaries-drawin`.
4. rename `pingcap-build-binaries-drawin-v2` to
`pingcap-build-binaries-drawin`.
5. rename pipeline `pingcap-build-package` to
`pingcap-build-package-linux`.
6. rename task `pingcap-build-binaries` to
`pingcap-build-binaries-linux`.

---------

Signed-off-by: wuhuizuo <wuhuizuo@126.com>
  • Loading branch information
wuhuizuo authored Dec 18, 2024
1 parent 6aa2a26 commit 082ddbf
Show file tree
Hide file tree
Showing 11 changed files with 49 additions and 459 deletions.
3 changes: 1 addition & 2 deletions apps/prod/tekton/configs/pipelines/kustomization.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@ namespace: ee-cd
resources:
- kaniko-build.yaml
- ko-build-prow.yaml
- pingcap-build-package-darwin-v2.yaml
- pingcap-build-package-darwin.yaml
- pingcap-build-package.yaml
- pingcap-build-package-linux.yaml
- pingcap-release-ga.yaml

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -45,10 +45,16 @@ spec:
Default the task will complete one from config in artifacts.git repo.
type: string
default: ""
- name: boskos-server-url
description: The URL of the running boskos server
default: http://boskos.apps.svc
results:
- name: pushed-binaries
description: pushed binaries.
value: "$(tasks.build-binaries.results.pushed)"
- name: pushed-images
description: pushed images.
value: "$(tasks.build-images.results.printed)"
workspaces:
- name: source
description: The workspace where the git repo will be cloned.
Expand Down Expand Up @@ -122,26 +128,11 @@ spec:
value: "$(tasks.get-release-ver.results.version)"
- name: force-builder-image
value: "$(params.force-builder-image)"
- name: acquire-mac-machine
runAfter:
- checkout
taskRef:
name: boskos-acquire
params:
- name: server-url
value: http://boskos.apps.svc
- name: timeout
value: 15m
- name: type
value: "mac-machine-$(params.arch)"
- name: owner-name
value: "$(context.pipelineRun.name)"
- name: build-binaries
runAfter:
- checkout-ext
taskRef:
name: pingcap-build-binaries-darwin
# TODO: currently matrix feature is not support in v0.32.x, we need upgrade the K8S cluster and then upgrade Tekton.
params:
- name: os
value: "$(params.os)"
Expand All @@ -165,25 +156,22 @@ spec:
value: "$(params.push)"
- name: registry
value: "$(params.registry)"
- name: mac-builder-resource
value: "$(tasks.acquire-mac-machine.results.leased-resource)"
- name: boskos-server-url
value: $(params.boskos-server-url)
workspaces:
- name: source
workspace: source
- name: dockerconfig
workspace: dockerconfig
- name: ssh-directory
workspace: mac-ssh-credentials
finally:
- name: release-mac-machine
- name: build-images
when:
- input: "$(params.push)"
operator: in
values: ["true"]
taskRef:
name: boskos-release
timeout: 5m0s
retries: 1
name: echo
params:
- name: server-url
value: http://boskos.apps.svc
- name: leased-resource
value: "$(tasks.acquire-mac-machine.results.leased-resource)"
- name: owner-name
value: "$(context.pipelineRun.name)"
- name: message
value: "'{}'"
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
apiVersion: tekton.dev/v1beta1
kind: Pipeline
metadata:
name: pingcap-build-package
name: pingcap-build-package-linux
spec:
params:
- name: git-url
Expand Down Expand Up @@ -133,7 +133,7 @@ spec:
runAfter:
- checkout-ext
taskRef:
name: pingcap-build-binaries
name: pingcap-build-binaries-linux
params:
- name: os
value: "$(params.os)"
Expand Down
3 changes: 1 addition & 2 deletions apps/prod/tekton/configs/tasks/kustomization.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -25,9 +25,8 @@ resources:
- multi-arch-image-collect.yaml
- multi-arch-image-push.yaml
- pingcap-auto-add-image-major-tag.yaml
- pingcap-build-binaries-darwin-v2.yaml
- pingcap-build-binaries-darwin.yaml
- pingcap-build-binaries.yaml
- pingcap-build-binaries-linux.yaml
- pingcap-build-images.yaml
- pingcap-compose-offline-pkgs.yaml
- pingcap-deliver-image.yaml
Expand Down
Loading

0 comments on commit 082ddbf

Please sign in to comment.