Merge branch 'update-konflux' into 'main'

tekton: s/centos/fedora/

See merge request fedora/bootc/base-images!2
This commit is contained in:
Colin Walters (Red Hat) 2024-04-25 16:01:14 +00:00
commit 9a89646282
3 changed files with 15 additions and 15 deletions

View File

@ -39,7 +39,7 @@ spec:
resolver: git resolver: git
params: params:
- name: url - name: url
value: https://github.com/centos/centos-bootc/ value: https://gitlab.com/fedora/bootc/base-images/
- name: revision - name: revision
value: main value: main
- name: pathInRepo - name: pathInRepo

View File

@ -2,7 +2,7 @@ apiVersion: tekton.dev/v1beta1
kind: PipelineRun kind: PipelineRun
metadata: metadata:
annotations: annotations:
build.appstudio.openshift.io/repo: https://github.com/CentOS/centos-bootc?rev={{revision}} build.appstudio.openshift.io/repo: https://gitlab.com/fedora/bootc/base-images/?rev={{revision}}
build.appstudio.redhat.com/commit_sha: "{{revision}}" build.appstudio.redhat.com/commit_sha: "{{revision}}"
build.appstudio.redhat.com/pull_request_number: "{{pull_request_number}}" build.appstudio.redhat.com/pull_request_number: "{{pull_request_number}}"
build.appstudio.redhat.com/target_branch: "{{target_branch}}" build.appstudio.redhat.com/target_branch: "{{target_branch}}"
@ -11,25 +11,25 @@ metadata:
event == "pull_request" && target_branch == "main" event == "pull_request" && target_branch == "main"
creationTimestamp: null creationTimestamp: null
labels: labels:
appstudio.openshift.io/application: centos-bootc appstudio.openshift.io/application: fedora-bootc
appstudio.openshift.io/component: centos-bootc appstudio.openshift.io/component: fedora-bootc
pipelines.appstudio.openshift.io/type: build pipelines.appstudio.openshift.io/type: build
name: centos-bootc-on-pull-request name: fedora-bootc-on-pull-request
namespace: centos-bootc-tenant namespace: centos-bootc-tenant
spec: spec:
params: params:
- name: image-file - name: image-file
value: centos-stream-9-tier1.yaml value: fedora-bootc.yaml
- name: git-url - name: git-url
value: "{{repo_url}}" value: "{{repo_url}}"
- name: output-image - name: output-image
value: quay.io/redhat-user-workloads/centos-bootc-tenant/centos-bootc/centos-bootc:on-pr-{{revision}} value: quay.io/redhat-user-workloads/centos-bootc-tenant/fedora-bootc/fedora-bootc:on-pr-{{revision}}
- name: path-context - name: path-context
value: . value: .
- name: revision - name: revision
value: "{{revision}}" value: "{{revision}}"
- name: config-file - name: config-file
value: "centos-bootc-config.json" value: "fedora-bootc-config.json"
pipelineRef: pipelineRef:
name: ostree-build name: ostree-build
workspaces: workspaces:

View File

@ -2,7 +2,7 @@ apiVersion: tekton.dev/v1beta1
kind: PipelineRun kind: PipelineRun
metadata: metadata:
annotations: annotations:
build.appstudio.openshift.io/repo: https://github.com/CentOS/centos-bootc?rev={{revision}} build.appstudio.openshift.io/repo: https://gitlab.com/fedora/bootc/base-images/?rev={{revision}}
build.appstudio.redhat.com/commit_sha: "{{revision}}" build.appstudio.redhat.com/commit_sha: "{{revision}}"
build.appstudio.redhat.com/pull_request_number: "{{pull_request_number}}" build.appstudio.redhat.com/pull_request_number: "{{pull_request_number}}"
build.appstudio.redhat.com/target_branch: "{{target_branch}}" build.appstudio.redhat.com/target_branch: "{{target_branch}}"
@ -11,25 +11,25 @@ metadata:
event == "push" && target_branch == "main" event == "push" && target_branch == "main"
creationTimestamp: null creationTimestamp: null
labels: labels:
appstudio.openshift.io/application: centos-bootc appstudio.openshift.io/application: fedora-bootc
appstudio.openshift.io/component: centos-bootc appstudio.openshift.io/component: fedora-bootc
pipelines.appstudio.openshift.io/type: build pipelines.appstudio.openshift.io/type: build
name: centos-bootc-on-push name: fedora-bootc-on-push
namespace: centos-bootc-tenant namespace: centos-bootc-tenant
spec: spec:
params: params:
- name: image-file - name: image-file
value: centos-stream-9-tier1.yaml value: fedora-bootc.yaml
- name: git-url - name: git-url
value: "{{repo_url}}" value: "{{repo_url}}"
- name: output-image - name: output-image
value: quay.io/redhat-user-workloads/centos-bootc-tenant/centos-bootc/centos-bootc:on-pr-{{revision}} value: quay.io/redhat-user-workloads/centos-bootc-tenant/fedora-bootc/fedora-bootc:on-pr-{{revision}}
- name: path-context - name: path-context
value: . value: .
- name: revision - name: revision
value: "{{revision}}" value: "{{revision}}"
- name: config-file - name: config-file
value: "centos-bootc-config.json" value: "fedora-bootc-config.json"
pipelineRef: pipelineRef:
name: ostree-build name: ostree-build
workspaces: workspaces: