Merge pull request #2 from redhat-appstudio-qe/config_pac1

config PaC in staging cluster
redhat-appstudio-qe · Jul 5, 2024 · d85fb9f · d85fb9f
2 parents 9cfabdc + cc3e730
commit d85fb9f
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 36 deletions.
diff --git a/.tekton/build-pipeline.yaml b/.tekton/build-pipeline.yaml
@@ -631,28 +631,6 @@ spec:
       workspaces:
         - name: workspace
           workspace: workspace-amd64
-    - name: clamav-scan
-      params:
-        - name: image-digest
-          value: $(tasks.build-container-amd64.results.IMAGE_DIGEST)
-        - name: image-url
-          value: $(tasks.build-container-amd64.results.IMAGE_URL)
-      runAfter:
-        - build-container-amd64
-      taskRef:
-        params:
-          - name: name
-            value: clamav-scan
-          - name: bundle
-            value: quay.io/redhat-appstudio-tekton-catalog/task-clamav-scan:0.1@sha256:6ba32717bd837ca0d5714b518cc4530e1f1d5bef137df54c02b0c2151b9d217e
-          - name: kind
-            value: task
-        resolver: bundles
-      when:
-        - input: $(params.skip-checks)
-          operator: in
-          values:
-            - "false"
     - name: sbom-json-check
       params:
         - name: IMAGE_URL

diff --git a/.tekton/multi-platform-test-prod-pull-request.yaml b/.tekton/multi-platform-test-prod-pull-request.yaml
@@ -2,29 +2,29 @@ apiVersion: tekton.dev/v1
 kind: PipelineRun
 metadata:
   annotations:
-    build.appstudio.openshift.io/repo: https://github.com/stuartwdouglas/multi-platform-test-prod?rev={{revision}}
+    build.appstudio.openshift.io/repo: https://github.com/redhat-appstudio-qe/multi-platform-test-prod?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}}'
     pipelinesascode.tekton.dev/max-keep-runs: "3"
     pipelinesascode.tekton.dev/on-event: '[pull_request]'
     pipelinesascode.tekton.dev/on-target-branch: '[main]'
   labels:
-    appstudio.openshift.io/application: multi-platform-test-prod
-    appstudio.openshift.io/component: multi-platform-test-prod
+    appstudio.openshift.io/application: e2e-multi-platform-test-prod
+    appstudio.openshift.io/component: e2e-multi-platform-test
     pipelines.appstudio.openshift.io/type: build
-  name: multi-platform-test-prod-on-pull-request
-  namespace: sdouglas1-tenant
+  name: e2e-multi-platform-test-on-pull-request
+  namespace: dev-release-team-tenant
 spec:
   params:
   - name: dockerfile
     value: docker/Dockerfile
   - name: git-url
-    value: '{{repo_url}}'
+    value: '{{source_url}}'
   - name: image-expires-after
     value: 5d
   - name: output-image
-    value: quay.io/redhat-user-workloads/sdouglas1-tenant/multi-platform-test-prod/multi-platform-test-prod:on-pr-{{revision}}
+    value: quay.io/redhat-user-workloads-stage/dev-release-team-tenant/e2e-multi-platform-test-prod/e2e-multi-platform-test:on-pr-{{revision}}
   - name: path-context
     value: .
   - name: revision

diff --git a/.tekton/multi-platform-test-prod-push.yaml b/.tekton/multi-platform-test-prod-push.yaml
@@ -2,27 +2,27 @@ apiVersion: tekton.dev/v1
 kind: PipelineRun
 metadata:
   annotations:
-    build.appstudio.openshift.io/repo: https://github.com/stuartwdouglas/multi-platform-test-prod?rev={{revision}}
+    build.appstudio.openshift.io/repo: https://github.com/redhat-appstudio-qe/multi-platform-test-prod?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-event: '[push]'
     pipelinesascode.tekton.dev/on-target-branch: '[main]'
   creationTimestamp: null
   labels:
-    appstudio.openshift.io/application: multi-platform-test-prod
-    appstudio.openshift.io/component: multi-platform-test-prod
+    appstudio.openshift.io/application: e2e-multi-platform-test-prod
+    appstudio.openshift.io/component: e2e-multi-platform-test
     pipelines.appstudio.openshift.io/type: build
-  name: multi-platform-test-prod-on-push
-  namespace: sdouglas1-tenant
+  name: e2e-multi-platform-test-on-push
+  namespace: dev-release-team-tenant
 spec:
   params:
   - name: dockerfile
     value: docker/Dockerfile
   - name: git-url
-    value: '{{repo_url}}'
+    value: '{{source_url}}'
   - name: output-image
-    value: quay.io/redhat-user-workloads/sdouglas1-tenant/multi-platform-test-prod/multi-platform-test-prod:{{revision}}
+    value: quay.io/redhat-user-workloads-stage/dev-release-team-tenant/e2e-multi-platform-test-prod/e2e-multi-platform-test:{{revision}}
   - name: path-context
     value: .
   - name: revision