[release-v1.16] Sync Konflux configurations

openshift-knative · Dec 11, 2024 · 263f631 · 263f631
1 parent 3240730
commit 263f631
Show file tree

Hide file tree

Showing 6 changed files with 84 additions and 4 deletions.
diff --git a/...lux/applications/serverless-operator-136/components/kn-eventing-istio-controller-116.yaml b/...lux/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
@@ -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
@@ -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
@@ -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:ac6a35e4143a68f841e363da3f21f2123de9f3acf76596f79ecb60c501eed408
+      - 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:ac6a35e4143a68f841e363da3f21f2123de9f3acf76596f79ecb60c501eed408
+      - 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
@@ -21,11 +21,11 @@ spec:
       value: openshift/ci-operator/knative-images/controller/Dockerfile
     - 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
+        - VERSION=1.36.0
     - 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
@@ -20,11 +20,11 @@ spec:
       value: openshift/ci-operator/knative-images/controller/Dockerfile
     - 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
+        - VERSION=1.36.0
     - 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: