From e6767f09be213137734d7f1ca2b4993bd54f9674 Mon Sep 17 00:00:00 2001 From: serverless-qe Date: Wed, 11 Dec 2024 13:05:08 +0000 Subject: [PATCH] [release-v1.16] Sync Konflux configurations --- .../kn-eventing-istio-controller-116.yaml | 6 +++ .../tests/ec-test.yaml | 4 +- .../tests/override-snapshot-ec-test.yaml | 23 +++++++++ .tekton/docker-build.yaml | 50 +++++++++++++++++++ ...ing-istio-controller-116-pull-request.yaml | 2 +- ...kn-eventing-istio-controller-116-push.yaml | 3 +- 6 files changed, 84 insertions(+), 4 deletions(-) create mode 100755 .konflux/applications/serverless-operator-136/tests/override-snapshot-ec-test.yaml diff --git a/.konflux/applications/serverless-operator-136/components/kn-eventing-istio-controller-116.yaml b/.konflux/applications/serverless-operator-136/components/kn-eventing-istio-controller-116.yaml index 609824eb..fc07d6f0 100755 --- a/.konflux/applications/serverless-operator-136/components/kn-eventing-istio-controller-116.yaml +++ b/.konflux/applications/serverless-operator-136/components/kn-eventing-istio-controller-116.yaml @@ -3,11 +3,17 @@ kind: Component metadata: annotations: build.appstudio.openshift.io/pipeline: '{"name":"docker-build","bundle":"latest"}' + build.appstudio.openshift.io/request: configure-pac-no-mr name: kn-eventing-istio-controller-116 spec: componentName: kn-eventing-istio-controller-116 application: serverless-operator-136 + build-nudges-ref: + + - "serverless-bundle-136" + + source: git: url: https://github.com/openshift-knative/eventing-istio.git diff --git a/.konflux/applications/serverless-operator-136/tests/ec-test.yaml b/.konflux/applications/serverless-operator-136/tests/ec-test.yaml index f06b8864..5b29ed6f 100755 --- a/.konflux/applications/serverless-operator-136/tests/ec-test.yaml +++ b/.konflux/applications/serverless-operator-136/tests/ec-test.yaml @@ -1,13 +1,13 @@ apiVersion: appstudio.redhat.com/v1beta2 kind: IntegrationTestScenario metadata: - name: serverless-operator-136-enterprise-contract + name: serverless-operator-136-ec spec: params: - name: POLICY_CONFIGURATION value: rhtap-releng-tenant/registry-standard-stage - name: TIMEOUT - value: "45m0s" + value: "120m" application: serverless-operator-136 contexts: - description: Application testing diff --git a/.konflux/applications/serverless-operator-136/tests/override-snapshot-ec-test.yaml b/.konflux/applications/serverless-operator-136/tests/override-snapshot-ec-test.yaml new file mode 100755 index 00000000..a1b14a3c --- /dev/null +++ b/.konflux/applications/serverless-operator-136/tests/override-snapshot-ec-test.yaml @@ -0,0 +1,23 @@ +apiVersion: appstudio.redhat.com/v1beta2 +kind: IntegrationTestScenario +metadata: + name: serverless-operator-136-ec-override-snapshot +spec: + params: + - name: POLICY_CONFIGURATION + value: rhtap-releng-tenant/registry-standard + - name: TIMEOUT + value: "120m" + application: serverless-operator-136 + contexts: + - description: Override Snapshot testing + name: override + resolverRef: + params: + - name: url + value: 'https://github.com/redhat-appstudio/build-definitions' + - name: revision + value: main + - name: pathInRepo + value: pipelines/enterprise-contract.yaml + resolver: git diff --git a/.tekton/docker-build.yaml b/.tekton/docker-build.yaml index 1a0f70b1..debf3f8f 100755 --- a/.tekton/docker-build.yaml +++ b/.tekton/docker-build.yaml @@ -429,6 +429,56 @@ spec: operator: in values: - "false" + - name: sast-shell-check + params: + - name: image-digest + value: $(tasks.build-image-index.results.IMAGE_DIGEST) + - name: image-url + value: $(tasks.build-image-index.results.IMAGE_URL) + - name: SOURCE_ARTIFACT + value: $(tasks.prefetch-dependencies.results.SOURCE_ARTIFACT) + - name: CACHI2_ARTIFACT + value: $(tasks.prefetch-dependencies.results.CACHI2_ARTIFACT) + runAfter: + - build-image-index + taskRef: + params: + - name: name + value: sast-shell-check-oci-ta + - name: bundle + value: quay.io/konflux-ci/tekton-catalog/task-sast-shell-check-oci-ta:0.1@sha256:e1049e55bdd8cf16fba605285a58bd6f61f95694e84b3fffe5d9191417263266 + - name: kind + value: task + resolver: bundles + when: + - input: $(params.skip-checks) + operator: in + values: + - "false" + - name: sast-unicode-check + params: + - name: image-url + value: $(tasks.build-image-index.results.IMAGE_URL) + - name: SOURCE_ARTIFACT + value: $(tasks.prefetch-dependencies.results.SOURCE_ARTIFACT) + - name: CACHI2_ARTIFACT + value: $(tasks.prefetch-dependencies.results.CACHI2_ARTIFACT) + runAfter: + - build-image-index + taskRef: + params: + - name: name + value: sast-shell-check-oci-ta + - name: bundle + value: quay.io/konflux-ci/tekton-catalog/task-sast-shell-check-oci-ta:0.1@sha256:e1049e55bdd8cf16fba605285a58bd6f61f95694e84b3fffe5d9191417263266 + - name: kind + value: task + resolver: bundles + when: + - input: $(params.skip-checks) + operator: in + values: + - "false" - name: push-dockerfile params: - name: IMAGE diff --git a/.tekton/kn-eventing-istio-controller-116-pull-request.yaml b/.tekton/kn-eventing-istio-controller-116-pull-request.yaml index e10b1957..e67fbec2 100755 --- a/.tekton/kn-eventing-istio-controller-116-pull-request.yaml +++ b/.tekton/kn-eventing-istio-controller-116-pull-request.yaml @@ -22,10 +22,10 @@ spec: - name: build-args value: - VERSION=1.36.0 - - GO_BUILDER=brew.registry.redhat.io/rh-osbs/openshift-golang-builder:rhel_8_golang_1.22 - GO_RUNTIME=registry.access.redhat.com/ubi8/ubi-minimal - JAVA_BUILDER=registry.access.redhat.com/ubi8/openjdk-21 - JAVA_RUNTIME=registry.access.redhat.com/ubi8/openjdk-21-runtime + - GO_BUILDER=brew.registry.redhat.io/rh-osbs/openshift-golang-builder:rhel_8_golang_1.22 - name: git-url value: '{{source_url}}' - name: hermetic diff --git a/.tekton/kn-eventing-istio-controller-116-push.yaml b/.tekton/kn-eventing-istio-controller-116-push.yaml index 61167e1c..5e5e805c 100755 --- a/.tekton/kn-eventing-istio-controller-116-push.yaml +++ b/.tekton/kn-eventing-istio-controller-116-push.yaml @@ -21,10 +21,10 @@ spec: - name: build-args value: - VERSION=1.36.0 - - GO_BUILDER=brew.registry.redhat.io/rh-osbs/openshift-golang-builder:rhel_8_golang_1.22 - GO_RUNTIME=registry.access.redhat.com/ubi8/ubi-minimal - JAVA_BUILDER=registry.access.redhat.com/ubi8/openjdk-21 - JAVA_RUNTIME=registry.access.redhat.com/ubi8/openjdk-21-runtime + - GO_BUILDER=brew.registry.redhat.io/rh-osbs/openshift-golang-builder:rhel_8_golang_1.22 - name: git-url value: '{{source_url}}' - name: hermetic @@ -35,6 +35,7 @@ spec: value: '{{revision}}' - name: additional-tags value: + - $(context.pipelineRun.uid)-{{revision}} - 1.36.0 - latest pipelineRef: