From 27bb2d81ab173ebbb123cb79f8685eb0a77b24e6 Mon Sep 17 00:00:00 2001 From: openshift-pipelines-bot Date: Wed, 30 Oct 2024 10:22:32 +0000 Subject: [PATCH] [bot] update konflux configuration --- .konflux/main/component-cache.yaml | 4 ++-- .konflux/main/tests.yaml | 2 ++ .tekton/tekton-caches-main-cache-pull-request.yaml | 6 +++--- .tekton/tekton-caches-main-cache-push.yaml | 6 +++--- 4 files changed, 10 insertions(+), 8 deletions(-) diff --git a/.konflux/main/component-cache.yaml b/.konflux/main/component-cache.yaml index 5d45e702c..7e636300d 100644 --- a/.konflux/main/component-cache.yaml +++ b/.konflux/main/component-cache.yaml @@ -4,7 +4,7 @@ apiVersion: appstudio.redhat.com/v1alpha1 kind: Component metadata: annotations: - build.appstudio.openshift.io/pipeline: '{"name":"docker-build","bundle":"latest"}' + build.appstudio.openshift.io/pipeline: '{"name":"docker-build-ta","bundle":"latest"}' name: tekton-caches-main-cache spec: componentName: cache @@ -14,5 +14,5 @@ spec: source: git: url: https://github.com/openshift-pipelines/tekton-caches - dockerfileUrl: openshift/dockerfiles/cache.Dockerfile + dockerfileUrl: .konflux/dockerfiles/cache.Dockerfile revision: main diff --git a/.konflux/main/tests.yaml b/.konflux/main/tests.yaml index 503bf5730..a577043c5 100644 --- a/.konflux/main/tests.yaml +++ b/.konflux/main/tests.yaml @@ -12,6 +12,8 @@ spec: params: - name: POLICY_CONFIGURATION value: tekton-ecosystem-tenant/tekton-ecosystem-tenant-containers + - name: TIMEOUT + value: "15m0s" resolverRef: params: - name: url diff --git a/.tekton/tekton-caches-main-cache-pull-request.yaml b/.tekton/tekton-caches-main-cache-pull-request.yaml index 3e0a77a9c..786ca2987 100644 --- a/.tekton/tekton-caches-main-cache-pull-request.yaml +++ b/.tekton/tekton-caches-main-cache-pull-request.yaml @@ -11,7 +11,7 @@ metadata: pipelinesascode.tekton.dev/on-cel-expression: event == "pull_request" && target_branch == "main" && ("***".pathChanged() || - "openshift/dockerfiles/cache.Dockerfile".pathChanged() || + ".konflux/dockerfiles/cache.Dockerfile".pathChanged() || ".tekton/tekton-caches-main-cache-pull-request.yaml".pathChanged() || ".tekton/docker-build-ta.yaml".pathChanged()) creationTimestamp: null @@ -32,13 +32,13 @@ spec: - name: image-expires-after value: 5d - name: dockerfile - value: openshift/dockerfiles/cache.Dockerfile + value: .konflux/dockerfiles/cache.Dockerfile - name: build-platforms value: - linux/x86_64 - name: prefetch-input value: | - {"type": "rpm", "path": "openshift/rpms"} + {"type": "rpm", "path": ".konflux/rpms"} pipelineRef: name: docker-build-ta workspaces: diff --git a/.tekton/tekton-caches-main-cache-push.yaml b/.tekton/tekton-caches-main-cache-push.yaml index 4796493cb..863a47c71 100644 --- a/.tekton/tekton-caches-main-cache-push.yaml +++ b/.tekton/tekton-caches-main-cache-push.yaml @@ -10,7 +10,7 @@ metadata: pipelinesascode.tekton.dev/on-cel-expression: event == "push" && target_branch == "main" && ("***".pathChanged() || - "openshift/dockerfiles/cache.Dockerfile".pathChanged() || + ".konflux/dockerfiles/cache.Dockerfile".pathChanged() || ".tekton/tekton-caches-main-cache-push.yaml".pathChanged() || ".tekton/docker-build-ta.yaml".pathChanged()) creationTimestamp: null @@ -29,10 +29,10 @@ spec: - name: output-image value: quay.io/redhat-user-workloads/tekton-ecosystem-tenant/tekton-caches-main/cache:{{revision}} - name: dockerfile - value: openshift/dockerfiles/cache.Dockerfile + value: .konflux/dockerfiles/cache.Dockerfile - name: prefetch-input value: | - {"type": "rpm", "path": "openshift/rpms"} + {"type": "rpm", "path": ".konflux/rpms"} pipelineRef: name: docker-build-ta workspaces: