Red Hat Trusted App Pipeline update fedora-bootc

.github/workflows/ci.yml

@@ -5,14 +5,14 @@ on:
     branches:
       - main
     paths-ignore:
-      - 'docs/**'
+      - "docs/**"
 
 jobs:
   build-image:
     runs-on: ubuntu-latest
 
     container:
-      image: quay.io/centos-boot/builder:latest@sha256:c57f2d2e9672baaddf501ee91c799903517c4b6ee38fd2dbd6e98171fd1c180c
+      image: quay.io/centos-boot/builder:latest
       options: --privileged
 
     strategy:
@@ -21,9 +21,7 @@ jobs:
         tier: [tier-1]
         include:
           - os: fedora
-          version: eln
           - os: centos
-          version: stream9
 
     steps:
       - name: Checkout repository
@@ -38,5 +36,4 @@ jobs:
       - name: Build
         run: |
           rpm-ostree compose image --format=ociarchive \
-          --initialize ${{ matrix.os }}-${{ matrix.tier }}${{ matrix.variant }}-${{ matrix.version }}.yaml \
+          --initialize ${{ matrix.os }}-bootc.yaml dest.oci-archive
-          dest.oci-archive

.github/workflows/publish-image.yml

@@ -5,27 +5,25 @@ on:
     branches:
       - main
     paths-ignore:
-      - 'docs/**'
+      - "docs/**"
 
   workflow_dispatch:
 
 env:
   REGISTRY: quay.io
-  QUAY_ORG: centos-boot
+  QUAY_ORG: centos-bootc
 
 jobs:
-
   build-and-push-image:
     runs-on: ubuntu-latest
 
     container:
-      image: quay.io/centos-boot/builder:latest@sha256:c57f2d2e9672baaddf501ee91c799903517c4b6ee38fd2dbd6e98171fd1c180c
+      image: quay.io/centos-boot/builder:latest
       options: --privileged
 
     strategy:
       matrix:
         os: [fedora, centos]
-        tier: [tier-1]
         include:
           - os: fedora
             version: eln
@@ -48,5 +46,5 @@ jobs:
           echo "${{ secrets.QUAY_PASSWORD }}" | skopeo login -u "${{ secrets.QUAY_USER }}" \
           --password-stdin ${{ env.REGISTRY }}
           rpm-ostree compose image --initialize-mode if-not-exists \
-          --format=registry ${{ matrix.os }}-${{ matrix.tier }}-${{ matrix.version }}.yaml \
+          --format=registry ${{ matrix.os }}-bootc.yaml \
-          ${{ env.REGISTRY }}/${{ env.QUAY_ORG }}/${{ matrix.os }}-${{ matrix.tier}}:${{ matrix.version }}
+          ${{ env.REGISTRY }}/${{ env.QUAY_ORG }}/${{ matrix.os }}-bootc:${{ matrix.version }}

.tekton/fedora-bootc-pull-request.yaml

@@ -2,7 +2,7 @@ apiVersion: tekton.dev/v1beta1
 kind: PipelineRun
 metadata:
   annotations:
-    build.appstudio.openshift.io/repo: https://github.com/CentOS/centos-boot?rev={{revision}}
+    build.appstudio.openshift.io/repo: https://github.com/CentOS/centos-bootc?rev={{revision}}
     build.appstudio.redhat.com/commit_sha: '{{revision}}'
     build.appstudio.redhat.com/pull_request_number: '{{pull_request_number}}'
     build.appstudio.redhat.com/target_branch: '{{target_branch}}'
@@ -11,19 +11,19 @@ metadata:
       == "main"
   creationTimestamp: null
   labels:
-    appstudio.openshift.io/application: centos-boot
+    appstudio.openshift.io/application: centos-bootc
-    appstudio.openshift.io/component: fedora-tier-1-eln
+    appstudio.openshift.io/component: fedora-bootc
     pipelines.appstudio.openshift.io/type: build
-  name: fedora-tier-1-eln-on-pull-request
+  name: fedora-bootc-on-pull-request
-  namespace: centos-boot-tenant
+  namespace: centos-bootc-tenant
 spec:
   params:
     - name: image-file
-      value: fedora-tier-1-eln.yaml
+      value: fedora-bootc.yaml
     - name: git-url
       value: '{{repo_url}}'
     - name: output-image
-      value: quay.io/redhat-user-workloads/centos-boot-tenant/centos-boot/fedora-tier-1-eln:on-pr-{{revision}}
+      value: quay.io/redhat-user-workloads/centos-bootc-tenant/centos-bootc/fedora-bootc:on-pr-{{revision}}
     - name: path-context
       value: .
     - name: revision

.tekton/fedora-bootc-push.yaml

@@ -2,31 +2,32 @@ apiVersion: tekton.dev/v1beta1
 kind: PipelineRun
 metadata:
   annotations:
-    build.appstudio.openshift.io/repo: https://github.com/CentOS/centos-boot?rev={{revision}}
+    build.appstudio.openshift.io/repo: https://github.com/CentOS/centos-bootc?rev={{revision}}
-    build.appstudio.redhat.com/commit_sha: '{{revision}}'
+    build.appstudio.redhat.com/commit_sha: "{{revision}}"
-    build.appstudio.redhat.com/target_branch: '{{target_branch}}'
+    build.appstudio.redhat.com/target_branch: "{{target_branch}}"
     pipelinesascode.tekton.dev/max-keep-runs: "3"
-    pipelinesascode.tekton.dev/on-cel-expression: event == "push" && target_branch
+    pipelinesascode.tekton.dev/on-cel-expression:
+      event == "push" && target_branch
       == "main"
   creationTimestamp: null
   labels:
-    appstudio.openshift.io/application: centos-boot
+    appstudio.openshift.io/application: centos-bootc
-    appstudio.openshift.io/component: fedora-tier-1-eln
+    appstudio.openshift.io/component: fedora-bootc
     pipelines.appstudio.openshift.io/type: build
-  name: fedora-tier-1-eln-on-push
+  name: fedora-bootc-on-push
-  namespace: centos-boot-tenant
+  namespace: centos-bootc-tenant
 spec:
   params:
     - name: image-file
-      value: fedora-tier-1-eln.yaml
+      value: fedora-bootc.yaml
     - name: git-url
-      value: '{{repo_url}}'
+      value: "{{repo_url}}"
     - name: output-image
-      value: quay.io/redhat-user-workloads/centos-boot-tenant/centos-boot/fedora-tier-1-eln:on-pr-{{revision}}
+      value: quay.io/redhat-user-workloads/centos-bootc-tenant/centos-bootc/fedora-bootc:on-pr-{{revision}}
     - name: path-context
       value: .
     - name: revision
-      value: '{{revision}}'
+      value: "{{revision}}"
   pipelineRef:
     name: ostree-build
   workspaces:
@@ -76,5 +77,5 @@ spec:
         status: {}
     - name: git-auth
       secret:
-        secretName: '{{ git_auth_secret }}'
+        secretName: "{{ git_auth_secret }}"
 status: {}