Skip to content

Commit f08d0b1

Browse files
openshift-merge-bot[bot]openshift-merge-bot[bot]
authored
Merge pull request #107 from rayfordj/konflux-oadp-hypershift-oadp-plugin-oadp-1-4-updates
Konflux: updates for pull/106
2 parents 4b467b9 + 1d93764 commit f08d0b1

File tree

2 files changed

+111
-26
lines changed

2 files changed

+111
-26
lines changed

‎.tekton/oadp-hypershift-oadp-plugin-oadp-1-4-pull-request.yaml‎

Lines changed: 54 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,8 @@ metadata:
88
build.appstudio.redhat.com/target_branch: '{{target_branch}}'
99
pipelinesascode.tekton.dev/cancel-in-progress: "true"
1010
pipelinesascode.tekton.dev/max-keep-runs: "3"
11-
pipelinesascode.tekton.dev/on-cel-expression: event == "pull_request" && target_branch
12-
== "oadp-1.4"
13-
creationTimestamp: null
11+
pipelinesascode.tekton.dev/on-cel-expression: event == "pull_request" && target_branch == "oadp-1.4"
12+
creationTimestamp:
1413
labels:
1514
appstudio.openshift.io/application: oadp-1-4
1615
appstudio.openshift.io/component: oadp-hypershift-oadp-plugin-oadp-1-4
@@ -29,9 +28,16 @@ spec:
2928
value: 5d
3029
- name: build-platforms
3130
value:
31+
- linux/arm64
32+
- linux/ppc64le
33+
- linux/s390x
3234
- linux/x86_64
3335
- name: dockerfile
3436
value: Dockerfile.oadp
37+
- name: hermetic
38+
value: 'true'
39+
- name: prefetch-input
40+
value: '[{"type": "gomod", "path": "."}, {"type": "rpm", "path": "hack/build/"}]'
3541
pipelineSpec:
3642
description: |
3743
This pipeline is ideal for building multi-arch container images from a Containerfile while maintaining trust after pipeline customization.
@@ -50,13 +56,11 @@ spec:
5056
name: output-image
5157
type: string
5258
- default: .
53-
description: Path to the source code of an application's component from where
54-
to build image.
59+
description: Path to the source code of an application's component from where to build image.
5560
name: path-context
5661
type: string
5762
- default: Dockerfile
58-
description: Path to the Dockerfile inside the context specified by parameter
59-
path-context
63+
description: Path to the Dockerfile inside the context specified by parameter path-context
6064
name: dockerfile
6165
type: string
6266
- default: "false"
@@ -76,8 +80,7 @@ spec:
7680
name: prefetch-input
7781
type: string
7882
- default: ""
79-
description: Image tag expiration time, time values could be something like
80-
1h, 2d, 3w for hours, days, and weeks, respectively.
83+
description: Image tag expiration time, time values could be something like 1h, 2d, 3w for hours, days, and weeks, respectively.
8184
name: image-expires-after
8285
type: string
8386
- default: "false"
@@ -97,14 +100,12 @@ spec:
97100
name: build-args-file
98101
type: string
99102
- default: "false"
100-
description: Whether to enable privileged mode, should be used only with remote
101-
VMs
103+
description: Whether to enable privileged mode, should be used only with remote VMs
102104
name: privileged-nested
103105
type: string
104106
- default:
105107
- linux/x86_64
106-
description: List of platforms to build the container images on. The available
107-
set of values is determined by the configuration of the multi-platform-controller.
108+
description: List of platforms to build the container images on. The available set of values is determined by the configuration of the multi-platform-controller.
108109
name: build-platforms
109110
type: array
110111
results:
@@ -227,6 +228,21 @@ spec:
227228
value: $(tasks.prefetch-dependencies.results.CACHI2_ARTIFACT)
228229
- name: IMAGE_APPEND_PLATFORM
229230
value: "true"
231+
- name: LABELS
232+
value:
233+
- $(tasks.generate-labels.results.labels[*])
234+
- License=Apache License 2.0
235+
- com.redhat.component=oadp-hypershift-velero-plugin-container
236+
- io.k8s.description=OpenShift API for Data Protection - Hypershift Velero Plugin
237+
- io.k8s.display-name=OpenShift API for Data Protection Hypershift Velero Plugin
238+
- io.openshift.build.commit.branch=oadp-1.4
239+
- io.openshift.build.source-location=https://github.com/openshift/hypershift-oadp-plugin
240+
- io.openshift.tags=migration
241+
- maintainer=OpenShift API for Data Protection Team <oadp-team@redhat.com>
242+
- name=oadp/oadp-hypershift-velero-plugin-rhel9
243+
- summary=OpenShift API for Data Protection - Hypershift Velero Plugin
244+
- vendor=Red Hat, Inc.
245+
- version=1.4.6
230246
runAfter:
231247
- prefetch-dependencies
232248
taskRef:
@@ -548,6 +564,9 @@ spec:
548564
value: $(tasks.build-image-index.results.IMAGE_URL)
549565
- name: IMAGE_DIGEST
550566
value: $(tasks.build-image-index.results.IMAGE_DIGEST)
567+
- name: ADDITIONAL_TAGS
568+
value:
569+
- 'pull-request-{{pull_request_number}}'
551570
runAfter:
552571
- build-image-index
553572
taskRef:
@@ -604,6 +623,28 @@ spec:
604623
operator: in
605624
values:
606625
- "false"
626+
- name: generate-labels
627+
params:
628+
- name: label-templates
629+
value:
630+
- build-date=$SOURCE_DATE
631+
- short-commit=$(tasks.clone-repository.results.short-commit)
632+
- io.openshift.build.commit.id=$(tasks.clone-repository.results.commit)
633+
- io.openshift.build.commit.url=https://github.com/openshift/hypershift-oadp-plugin/commit/$(tasks.clone-repository.results.commit)
634+
- release=$ACTUAL_DATE_EPOCH
635+
- name: source-date-epoch
636+
value: $(tasks.clone-repository.results.commit-timestamp)
637+
runAfter:
638+
- clone-repository
639+
taskRef:
640+
params:
641+
- name: name
642+
value: generate-labels
643+
- name: bundle
644+
value: quay.io/konflux-ci/tekton-catalog/task-generate-labels:0.1@sha256:e1f4746dc33206a17867ead8f5c82a569cd925d352a19d108f205f54efc5589d
645+
- name: kind
646+
value: task
647+
resolver: bundles
607648
workspaces:
608649
- name: git-auth
609650
optional: true

‎.tekton/oadp-hypershift-oadp-plugin-oadp-1-4-push.yaml‎

Lines changed: 57 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,8 @@ metadata:
77
build.appstudio.redhat.com/target_branch: '{{target_branch}}'
88
pipelinesascode.tekton.dev/cancel-in-progress: "false"
99
pipelinesascode.tekton.dev/max-keep-runs: "3"
10-
pipelinesascode.tekton.dev/on-cel-expression: event == "push" && target_branch
11-
== "oadp-1.4"
12-
creationTimestamp: null
10+
pipelinesascode.tekton.dev/on-cel-expression: event == "push" && target_branch == "oadp-1.4"
11+
creationTimestamp:
1312
labels:
1413
appstudio.openshift.io/application: oadp-1-4
1514
appstudio.openshift.io/component: oadp-hypershift-oadp-plugin-oadp-1-4
@@ -26,9 +25,16 @@ spec:
2625
value: quay.io/redhat-user-workloads/ocp-art-tenant/oadp-hypershift-oadp-plugin-oadp-1-4:{{revision}}
2726
- name: build-platforms
2827
value:
28+
- linux/arm64
29+
- linux/ppc64le
30+
- linux/s390x
2931
- linux/x86_64
3032
- name: dockerfile
3133
value: Dockerfile.oadp
34+
- name: hermetic
35+
value: 'true'
36+
- name: prefetch-input
37+
value: '[{"type": "gomod", "path": "."}, {"type": "rpm", "path": "hack/build/"}]'
3238
pipelineSpec:
3339
description: |
3440
This pipeline is ideal for building multi-arch container images from a Containerfile while maintaining trust after pipeline customization.
@@ -47,13 +53,11 @@ spec:
4753
name: output-image
4854
type: string
4955
- default: .
50-
description: Path to the source code of an application's component from where
51-
to build image.
56+
description: Path to the source code of an application's component from where to build image.
5257
name: path-context
5358
type: string
5459
- default: Dockerfile
55-
description: Path to the Dockerfile inside the context specified by parameter
56-
path-context
60+
description: Path to the Dockerfile inside the context specified by parameter path-context
5761
name: dockerfile
5862
type: string
5963
- default: "false"
@@ -73,8 +77,7 @@ spec:
7377
name: prefetch-input
7478
type: string
7579
- default: ""
76-
description: Image tag expiration time, time values could be something like
77-
1h, 2d, 3w for hours, days, and weeks, respectively.
80+
description: Image tag expiration time, time values could be something like 1h, 2d, 3w for hours, days, and weeks, respectively.
7881
name: image-expires-after
7982
type: string
8083
- default: "false"
@@ -94,14 +97,12 @@ spec:
9497
name: build-args-file
9598
type: string
9699
- default: "false"
97-
description: Whether to enable privileged mode, should be used only with remote
98-
VMs
100+
description: Whether to enable privileged mode, should be used only with remote VMs
99101
name: privileged-nested
100102
type: string
101103
- default:
102104
- linux/x86_64
103-
description: List of platforms to build the container images on. The available
104-
set of values is determined by the configuration of the multi-platform-controller.
105+
description: List of platforms to build the container images on. The available set of values is determined by the configuration of the multi-platform-controller.
105106
name: build-platforms
106107
type: array
107108
results:
@@ -224,6 +225,21 @@ spec:
224225
value: $(tasks.prefetch-dependencies.results.CACHI2_ARTIFACT)
225226
- name: IMAGE_APPEND_PLATFORM
226227
value: "true"
228+
- name: LABELS
229+
value:
230+
- $(tasks.generate-labels.results.labels[*])
231+
- License=Apache License 2.0
232+
- com.redhat.component=oadp-hypershift-velero-plugin-container
233+
- io.k8s.description=OpenShift API for Data Protection - Hypershift Velero Plugin
234+
- io.k8s.display-name=OpenShift API for Data Protection Hypershift Velero Plugin
235+
- io.openshift.build.commit.branch=oadp-1.4
236+
- io.openshift.build.source-location=https://github.com/openshift/hypershift-oadp-plugin
237+
- io.openshift.tags=migration
238+
- maintainer=OpenShift API for Data Protection Team <oadp-team@redhat.com>
239+
- name=oadp/oadp-hypershift-velero-plugin-rhel9
240+
- summary=OpenShift API for Data Protection - Hypershift Velero Plugin
241+
- vendor=Red Hat, Inc.
242+
- version=1.4.6
227243
runAfter:
228244
- prefetch-dependencies
229245
taskRef:
@@ -545,6 +561,12 @@ spec:
545561
value: $(tasks.build-image-index.results.IMAGE_URL)
546562
- name: IMAGE_DIGEST
547563
value: $(tasks.build-image-index.results.IMAGE_DIGEST)
564+
- name: ADDITIONAL_TAGS
565+
value:
566+
- '1.4'
567+
- '1.4.6'
568+
- 'oadp-1.4'
569+
- 'latest'
548570
runAfter:
549571
- build-image-index
550572
taskRef:
@@ -601,6 +623,28 @@ spec:
601623
operator: in
602624
values:
603625
- "false"
626+
- name: generate-labels
627+
params:
628+
- name: label-templates
629+
value:
630+
- build-date=$SOURCE_DATE
631+
- short-commit=$(tasks.clone-repository.results.short-commit)
632+
- io.openshift.build.commit.id=$(tasks.clone-repository.results.commit)
633+
- io.openshift.build.commit.url=https://github.com/openshift/hypershift-oadp-plugin/commit/$(tasks.clone-repository.results.commit)
634+
- release=$ACTUAL_DATE_EPOCH
635+
- name: source-date-epoch
636+
value: $(tasks.clone-repository.results.commit-timestamp)
637+
runAfter:
638+
- clone-repository
639+
taskRef:
640+
params:
641+
- name: name
642+
value: generate-labels
643+
- name: bundle
644+
value: quay.io/konflux-ci/tekton-catalog/task-generate-labels:0.1@sha256:e1f4746dc33206a17867ead8f5c82a569cd925d352a19d108f205f54efc5589d
645+
- name: kind
646+
value: task
647+
resolver: bundles
604648
workspaces:
605649
- name: git-auth
606650
optional: true

0 commit comments

Comments
 (0)