From ebeeaa0184be5603858e2d98f7182292c6be80aa Mon Sep 17 00:00:00 2001 From: red-hat-trusted-app-pipeline Date: Wed, 22 Nov 2023 16:49:00 +0000 Subject: [PATCH] Red Hat Trusted App Pipeline update fedora-bootc --- .github/workflows/ci.yml | 13 ++++----- .github/workflows/publish-image.yml | 20 +++++++------- ...st.yaml => fedora-bootc-pull-request.yaml} | 14 +++++----- ...1-eln-push.yaml => fedora-bootc-push.yaml} | 27 ++++++++++--------- ...s-tier-1-stream9.yaml => centos-bootc.yaml | 0 fedora-tier-1-eln.yaml => fedora-bootc.yaml | 0 6 files changed, 35 insertions(+), 39 deletions(-) rename .tekton/{fedora-tier-1-eln-pull-request.yaml => fedora-bootc-pull-request.yaml} (84%) rename .tekton/{fedora-tier-1-eln-push.yaml => fedora-bootc-push.yaml} (70%) rename centos-tier-1-stream9.yaml => centos-bootc.yaml (100%) rename fedora-tier-1-eln.yaml => fedora-bootc.yaml (100%) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 2d6bfbc..1e79ea0 100644 --- a/.github/workflows/ci.yml +++ b/.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: @@ -20,10 +20,8 @@ jobs: os: [fedora, centos] tier: [tier-1] include: - - os: fedora - version: eln - - os: centos - version: stream9 + - os: fedora + - os: centos 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 \ - dest.oci-archive + --initialize ${{ matrix.os }}-bootc.yaml dest.oci-archive diff --git a/.github/workflows/publish-image.yml b/.github/workflows/publish-image.yml index fdcb927..97a411f 100644 --- a/.github/workflows/publish-image.yml +++ b/.github/workflows/publish-image.yml @@ -5,32 +5,30 @@ 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 - - os: centos - version: stream9 + - os: fedora + version: eln + - os: centos + version: stream9 steps: - name: Checkout repository @@ -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 \ - ${{ env.REGISTRY }}/${{ env.QUAY_ORG }}/${{ matrix.os }}-${{ matrix.tier}}:${{ matrix.version }} + --format=registry ${{ matrix.os }}-bootc.yaml \ + ${{ env.REGISTRY }}/${{ env.QUAY_ORG }}/${{ matrix.os }}-bootc:${{ matrix.version }} diff --git a/.tekton/fedora-tier-1-eln-pull-request.yaml b/.tekton/fedora-bootc-pull-request.yaml similarity index 84% rename from .tekton/fedora-tier-1-eln-pull-request.yaml rename to .tekton/fedora-bootc-pull-request.yaml index 7e5b8cb..0149323 100644 --- a/.tekton/fedora-tier-1-eln-pull-request.yaml +++ b/.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/component: fedora-tier-1-eln + appstudio.openshift.io/application: centos-bootc + appstudio.openshift.io/component: fedora-bootc pipelines.appstudio.openshift.io/type: build - name: fedora-tier-1-eln-on-pull-request - namespace: centos-boot-tenant + name: fedora-bootc-on-pull-request + 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 diff --git a/.tekton/fedora-tier-1-eln-push.yaml b/.tekton/fedora-bootc-push.yaml similarity index 70% rename from .tekton/fedora-tier-1-eln-push.yaml rename to .tekton/fedora-bootc-push.yaml index 57ab097..a6312d9 100644 --- a/.tekton/fedora-tier-1-eln-push.yaml +++ b/.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.redhat.com/commit_sha: '{{revision}}' - build.appstudio.redhat.com/target_branch: '{{target_branch}}' + build.appstudio.openshift.io/repo: https://github.com/CentOS/centos-bootc?rev={{revision}} + build.appstudio.redhat.com/commit_sha: "{{revision}}" + 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/component: fedora-tier-1-eln + appstudio.openshift.io/application: centos-bootc + appstudio.openshift.io/component: fedora-bootc pipelines.appstudio.openshift.io/type: build - name: fedora-tier-1-eln-on-push - namespace: centos-boot-tenant + name: fedora-bootc-on-push + 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: {} diff --git a/centos-tier-1-stream9.yaml b/centos-bootc.yaml similarity index 100% rename from centos-tier-1-stream9.yaml rename to centos-bootc.yaml diff --git a/fedora-tier-1-eln.yaml b/fedora-bootc.yaml similarity index 100% rename from fedora-tier-1-eln.yaml rename to fedora-bootc.yaml