diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index b6eb6d9..8abcdc4 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -16,15 +16,9 @@ jobs: strategy: matrix: - os: [centos, fedora] - tier: [tier-0, tier-1] + os: [fedora] + tier: [tier-1] include: - - os: centos - version: stream9 - - os: centos - variant: "" - - os: centos - variant: "-rt" - os: fedora version: eln diff --git a/.tekton/centos-tier-0-stream9-pull-request.yaml b/.tekton/fedora-tier-1-eln-pull-request.yaml similarity index 84% rename from .tekton/centos-tier-0-stream9-pull-request.yaml rename to .tekton/fedora-tier-1-eln-pull-request.yaml index 009d9bf..7e5b8cb 100644 --- a/.tekton/centos-tier-0-stream9-pull-request.yaml +++ b/.tekton/fedora-tier-1-eln-pull-request.yaml @@ -2,7 +2,7 @@ apiVersion: tekton.dev/v1beta1 kind: PipelineRun metadata: annotations: - build.appstudio.openshift.io/repo: https://github.com/CentOS/sagano?rev={{revision}} + build.appstudio.openshift.io/repo: https://github.com/CentOS/centos-boot?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: sagano - appstudio.openshift.io/component: centos-tier-0-stream9 + appstudio.openshift.io/application: centos-boot + appstudio.openshift.io/component: fedora-tier-1-eln pipelines.appstudio.openshift.io/type: build - name: centos-tier-0-stream9-on-pull-request - namespace: project-sagano-tenant + name: fedora-tier-1-eln-on-pull-request + namespace: centos-boot-tenant spec: params: - name: image-file - value: centos-tier-0-stream9.yaml + value: fedora-tier-1-eln.yaml - name: git-url value: '{{repo_url}}' - name: output-image - value: quay.io/redhat-user-workloads/project-sagano-tenant/sagano/centos-tier-0-stream9:on-pr-{{revision}} + value: quay.io/redhat-user-workloads/centos-boot-tenant/centos-boot/fedora-tier-1-eln:on-pr-{{revision}} - name: path-context value: . - name: revision diff --git a/.tekton/centos-tier-0-stream9-push.yaml b/.tekton/fedora-tier-1-eln-push.yaml similarity index 75% rename from .tekton/centos-tier-0-stream9-push.yaml rename to .tekton/fedora-tier-1-eln-push.yaml index 206d5a4..57ab097 100644 --- a/.tekton/centos-tier-0-stream9-push.yaml +++ b/.tekton/fedora-tier-1-eln-push.yaml @@ -2,7 +2,7 @@ apiVersion: tekton.dev/v1beta1 kind: PipelineRun metadata: annotations: - build.appstudio.openshift.io/repo: https://github.com/CentOS/sagano?rev={{revision}} + 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}}' pipelinesascode.tekton.dev/max-keep-runs: "3" @@ -10,23 +10,23 @@ metadata: == "main" creationTimestamp: null labels: - appstudio.openshift.io/application: sagano - appstudio.openshift.io/component: centos-tier-0-stream9 + appstudio.openshift.io/application: centos-boot + appstudio.openshift.io/component: fedora-tier-1-eln pipelines.appstudio.openshift.io/type: build - name: centos-tier-0-stream9-on-push - namespace: project-sagano-tenant + name: fedora-tier-1-eln-on-push + namespace: centos-boot-tenant spec: params: - - name: dockerfile - value: Dockerfile - - name: git-url - value: '{{repo_url}}' - - name: output-image - value: quay.io/redhat-user-workloads/project-sagano-tenant/sagano/centos-tier-0-stream9:{{revision}} - - name: path-context - value: . - - name: revision - value: '{{revision}}' + - name: image-file + value: fedora-tier-1-eln.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}} + - name: path-context + value: . + - name: revision + value: '{{revision}}' pipelineRef: name: ostree-build workspaces: diff --git a/.tekton/ostree-build.yaml b/.tekton/ostree-build.yaml index 43029d8..f70a28d 100644 --- a/.tekton/ostree-build.yaml +++ b/.tekton/ostree-build.yaml @@ -191,34 +191,6 @@ spec: workspace: workspace-s390x - name: basic-auth workspace: git-auth - - name: clone-repository-ppc64le - params: - - name: url - value: $(params.git-url) - - name: revision - value: $(params.revision) - runAfter: - - init - taskRef: - kind: Task - params: - - name: name - value: git-clone - - name: bundle - value: quay.io/redhat-appstudio-tekton-catalog/task-git-clone:0.1@sha256:d9e1ab10d72953e7a85dab69b8b96f5b41580a6d4026f77b6a5ba6f3ed227cc3 - - name: kind - value: task - resolver: bundles - when: - - input: $(tasks.init.results.build) - operator: in - values: - - "true" - workspaces: - - name: output - workspace: workspace-ppc64le - - name: basic-auth - workspace: git-auth - name: build-container-amd64 params: - name: IMAGE @@ -324,41 +296,6 @@ spec: workspaces: - name: source workspace: workspace-s390x - - name: build-container-ppc64le - params: - - name: IMAGE - value: $(params.output-image)-ppc64le - - name: IMAGE_FILE - value: $(params.image-file) - - name: CONTEXT - value: $(params.path-context) - - name: IMAGE_EXPIRES_AFTER - value: $(params.image-expires-after) - - name: COMMIT_SHA - value: $(tasks.clone-repository.results.commit) - - name: PLATFORM - value: linux/ppc64le - - name: BUILDER_IMAGE - value: quay.io/centos-boot/builder:latest - runAfter: - - clone-repository-ppc64le - taskRef: - params: - - name: name - value: rpm-ostree - - name: bundle - value: quay.io/redhat-appstudio-tekton-catalog/task-rpm-ostree:0.1@sha256:b7dbe76640d10cd7b7ff39573ad7f5ca7523237449e38447c9bdca0ec3e1f187 - - name: kind - value: task - resolver: bundles - when: - - input: $(tasks.init.results.build) - operator: in - values: - - "true" - workspaces: - - name: source - workspace: workspace-s390x - name: build-container params: - name: IMAGE @@ -370,12 +307,10 @@ spec: - $(tasks.build-container-amd64.results.IMAGE_URL)@$(tasks.build-container-amd64.results.IMAGE_DIGEST) - $(tasks.build-container-arm64.results.IMAGE_URL)@$(tasks.build-container-arm64.results.IMAGE_DIGEST) - $(tasks.build-container-s390x.results.IMAGE_URL)@$(tasks.build-container-s390x.results.IMAGE_DIGEST) - - $(tasks.build-container-ppc64le.results.IMAGE_URL)@$(tasks.build-container-ppc64le.results.IMAGE_DIGEST) runAfter: - build-container-amd64 - build-container-arm64 - build-container-s390x - - build-container-ppc64le taskRef: params: - name: name @@ -500,7 +435,6 @@ spec: workspaces: - name: workspace - name: workspace-arm64 - - name: workspace-ppc64le - name: workspace-s390x - name: git-auth optional: true