Skip to content

Commit 73fa6c1

Browse files
authored
Uniform FBC definitions (netobserv#1178)
* remove duplicate build-platform fbc4.18 * uniformize fbc yaml * remove buildpatforms on push
1 parent 04d9e56 commit 73fa6c1

File tree

4 files changed

+2
-10
lines changed

4 files changed

+2
-10
lines changed

.tekton/fbc-v-4-12-push.yaml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,8 @@ spec:
3232
value: quay.io/redhat-user-workloads/ocp-network-observab-tenant/fbc-v-4-12:latest
3333
- name: dockerfile
3434
value: catalog.Dockerfile.downstream
35+
- name: opm-image
36+
value: registry.redhat.io/openshift4/ose-operator-registry:v4.12
3537
pipelineRef:
3638
name: build-fbc-pipeline
3739
workspaces:

.tekton/fbc-v4-17-push.yaml

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -30,9 +30,6 @@ spec:
3030
value: '{{revision}}'
3131
- name: output-image
3232
value: quay.io/redhat-user-workloads/ocp-network-observab-tenant/fbc-v4-17:latest
33-
- name: build-platforms
34-
value:
35-
- linux/x86_64
3633
- name: dockerfile
3734
value: catalog.Dockerfile.downstream
3835
- name: opm-image

.tekton/fbc-v4-18-pull-request.yaml

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@ metadata:
1313
"catalog.Dockerfile.downstream".pathChanged() ||
1414
"catalog/***".pathChanged() ||
1515
"hack/update-build.sh".pathChanged() ||
16-
"hack/bundle_digest.sh".pathChanged() ||
1716
"hack/patch_catalog.py".pathChanged() ||
1817
"hack/patch_csv.py".pathChanged())
1918
creationTimestamp: null
@@ -33,9 +32,6 @@ spec:
3332
value: quay.io/redhat-user-workloads/ocp-network-observab-tenant/fbc-v4-18:on-pr-{{revision}}
3433
- name: image-expires-after
3534
value: 5d
36-
- name: build-platforms
37-
value:
38-
- linux/x86_64
3935
- name: dockerfile
4036
value: catalog.Dockerfile.downstream
4137
- name: opm-image

.tekton/fbc-v4-18-push.yaml

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -30,9 +30,6 @@ spec:
3030
value: '{{revision}}'
3131
- name: output-image
3232
value: quay.io/redhat-user-workloads/ocp-network-observab-tenant/fbc-v4-18:{{revision}}
33-
- name: build-platforms
34-
value:
35-
- linux/x86_64
3633
- name: dockerfile
3734
value: catalog.Dockerfile.downstream
3835
- name: opm-image

0 commit comments

Comments
 (0)