Skip to content

Commit 2e33077

Browse files
red-hat-konflux[bot]red-hat-konfluxrayfordj
authored andcommitted
Red Hat Konflux update oadp-velero-oadp-1-5 (openshift#411)
* Red Hat Konflux update oadp-velero-oadp-1-5 Signed-off-by: red-hat-konflux <[email protected]> * Konflux: openshift-preflight: failed: HasLicense "suggestion": "Create a directory named /licenses and include all relevant licensing and/or terms and conditions as text file(s) in that directory." https://docs.redhat.com/en/documentation/red_hat_software_certification/2025/html-single/red_hat_openshift_software_certification_policy_guide/index#assembly-requirements-for-container-ima > Container images must contain a “licenses” directory. Use this > directory to add files containing software terms and conditions for your > product and any open source software included in the image. > > Test name: HasLicense --------- Co-authored-by: red-hat-konflux <[email protected]> Co-authored-by: Rayford Johnson <[email protected]>
1 parent 1415424 commit 2e33077

File tree

6 files changed

+5
-4
lines changed

6 files changed

+5
-4
lines changed

.tekton/oadp-velero-oadp-1-5-pull-request.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ metadata:
1111
pipelinesascode.tekton.dev/on-cel-expression: event == "pull_request" && target_branch == "oadp-1.5"
1212
creationTimestamp:
1313
labels:
14-
appstudio.openshift.io/application: oadp-velero
14+
appstudio.openshift.io/application: oadp-1-5
1515
appstudio.openshift.io/component: oadp-velero-oadp-1-5
1616
pipelines.appstudio.openshift.io/type: build
1717
name: oadp-velero-oadp-1-5-on-pull-request
@@ -37,7 +37,7 @@ spec:
3737
- name: hermetic
3838
value: "true"
3939
- name: prefetch-input
40-
value: '[{"type": "gomod", "path": "."}, {"type": "gomod", "path": "restic/"}, {"type": "rpm", "path": "."}]'
40+
value: '[{"type": "gomod", "path": "."}, {"type": "gomod", "path": "restic/"}, {"type": "rpm", "path": "hack/build/"}]'
4141
pipelineSpec:
4242
description: |
4343
This pipeline is ideal for building multi-arch container images from a Containerfile while maintaining trust after pipeline customization.

.tekton/oadp-velero-oadp-1-5-push.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ metadata:
1010
pipelinesascode.tekton.dev/on-cel-expression: event == "push" && target_branch == "oadp-1.5"
1111
creationTimestamp:
1212
labels:
13-
appstudio.openshift.io/application: oadp-velero
13+
appstudio.openshift.io/application: oadp-1-5
1414
appstudio.openshift.io/component: oadp-velero-oadp-1-5
1515
pipelines.appstudio.openshift.io/type: build
1616
name: oadp-velero-oadp-1-5-on-push
@@ -34,7 +34,7 @@ spec:
3434
- name: hermetic
3535
value: "true"
3636
- name: prefetch-input
37-
value: '[{"type": "gomod", "path": "."}, {"type": "gomod", "path": "restic/"}, {"type": "rpm", "path": "."}]'
37+
value: '[{"type": "gomod", "path": "."}, {"type": "gomod", "path": "restic/"}, {"type": "rpm", "path": "hack/build/"}]'
3838
pipelineSpec:
3939
description: |
4040
This pipeline is ideal for building multi-arch container images from a Containerfile while maintaining trust after pipeline customization.

Dockerfile.oadp

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,7 @@ COPY --from=builder /workspace/bin/velero velero
4242
COPY --from=builder /workspace/bin/velero-restore-helper velero-restore-helper
4343
COPY --from=builder /workspace/bin/velero-helper velero-helper
4444
COPY --from=builder /workspace/restic/bin/restic /usr/bin/restic
45+
COPY LICENSE /licenses/
4546

4647
RUN mkdir -p /home/velero
4748
RUN chmod -R 777 /home/velero
File renamed without changes.
File renamed without changes.

0 commit comments

Comments
 (0)