fix: clone from releaseBranch if possible, derivate release info from…

konflux-configs/base/project/base/ocp/v4.16/patch.yaml

@@ -47,7 +47,7 @@
           - name: revision
             value: main
           - name: pathInRepo
-            value: pipelines/integration-test/rhtas-operator-e2e.yaml
+            value: pipelines/integration-test/rhtas-fbc-e2e.yaml
         resolver: git
         resourceKind: pipelinerun
 
@@ -80,7 +80,7 @@
           - name: revision
             value: main
           - name: pathInRepo
-            value: pipelines/rhtas-operator-e2e.yaml
+            value: pipelines/integration-test/rhtas-fbc-e2e.yaml
         resolver: git
         resourceKind: pipeline
 

konflux-configs/base/project/base/ocp/v4.17/patch.yaml

@@ -47,7 +47,7 @@
           - name: revision
             value: main
           - name: pathInRepo
-            value: pipelines/integration-test/rhtas-operator-e2e.yaml
+            value: pipelines/integration-test/rhtas-fbc-e2e.yaml
         resolver: git
         resourceKind: pipelinerun
 
@@ -80,7 +80,7 @@
           - name: revision
             value: main
           - name: pathInRepo
-            value: pipelines/rhtas-operator-e2e.yaml
+            value: pipelines/integration-test/rhtas-fbc-e2e.yaml
         resolver: git
         resourceKind: pipeline
 

konflux-configs/base/project/base/ocp/v4.18/patch.yaml

@@ -47,7 +47,7 @@
           - name: revision
             value: main
           - name: pathInRepo
-            value: pipelines/integration-test/rhtas-operator-e2e.yaml
+            value: pipelines/integration-test/rhtas-fbc-e2e.yaml
         resolver: git
         resourceKind: pipelinerun
 
@@ -80,7 +80,7 @@
           - name: revision
             value: main
           - name: pathInRepo
-            value: pipelines/rhtas-operator-e2e.yaml
+            value: pipelines/integration-test/rhtas-fbc-e2e.yaml
         resolver: git
         resourceKind: pipeline
 

konflux-configs/base/project/base/ocp/v4.19/patch.yaml

@@ -47,7 +47,7 @@
           - name: revision
             value: main
           - name: pathInRepo
-            value: pipelines/integration-test/rhtas-operator-e2e.yaml
+            value: pipelines/integration-test/rhtas-fbc-e2e.yaml
         resolver: git
         resourceKind: pipelinerun
 
@@ -80,7 +80,7 @@
           - name: revision
             value: main
           - name: pathInRepo
-            value: pipelines/rhtas-operator-e2e.yaml
+            value: pipelines/integration-test/rhtas-fbc-e2e.yaml
         resolver: git
         resourceKind: pipeline
 

konflux-configs/base/project/base/ocp/v4.20/patch.yaml

@@ -47,7 +47,7 @@
           - name: revision
             value: main
           - name: pathInRepo
-            value: pipelines/integration-test/rhtas-operator-e2e.yaml
+            value: pipelines/integration-test/rhtas-fbc-e2e.yaml
         resolver: git
         resourceKind: pipelinerun
 
@@ -80,7 +80,7 @@
           - name: revision
             value: main
           - name: pathInRepo
-            value: pipelines/rhtas-operator-e2e.yaml
+            value: pipelines/integration-test/rhtas-fbc-e2e.yaml
         resolver: git
         resourceKind: pipeline
 
@@ -138,6 +138,6 @@
           - name: revision
             value: main
           - name: pathInRepo
-            value: pipelines/integration-test/rhtas-operator-e2e.yaml
+            value: pipelines/integration-test/rhtas-fbc-e2e.yaml
         resolver: git
         resourceKind: pipelinerun

konflux-configs/base/project/overlay/rhtas-operator/patch/e2e.yaml

@@ -13,7 +13,7 @@
         - description: runs the integration test for a group Snapshot
           name: group
       params:
-        - name: branch
+        - name: releaseBranch
           value: "{{.branch}}"
       resolverRef:
         params:
@@ -45,6 +45,8 @@
           value: "true"
         - name: KEYCLOAK_DISTRIBUTION
           value: "rhbk"
+        - name: releaseBranch
+          value: "{{.branch}}"
       resolverRef:
         params:
           - name: url

pipelines/integration-test/operator-dast.yaml

@@ -28,17 +28,36 @@ spec:
           resolver: git
           params:
             - name: url
-              value: https://github.com/securesign/pipelines.git
+              value: https://github.com/konflux-ci/tekton-integration-catalog
             - name: revision
               value: main
             - name: pathInRepo
-              value: tasks/integration-test/parse-metadata.yaml
+              value: tasks/test-metadata/0.3/test-metadata.yaml
         params:
           - name: SNAPSHOT
             value: $(params.SNAPSHOT)
-      - name: clone-operator-source-code
+      - name: release-info
         runAfter:
           - parse-metadata
+        taskRef:
+          resolver: git
+          params:
+            - name: url
+              value: https://github.com/securesign/pipelines.git
+            - name: revision
+              value: main
+            - name: pathInRepo
+              value: tasks/integration-test/derive-release-info.yaml
+        params:
+          - name: package-name
+            value: "rhtas-operator"
+          - name: fbc-image
+            value: "$(tasks.parse-metadata.results.container-image)"
+          - name: ocp-version
+            value: $(params.OCP_VERSION)
+      - name: clone-operator-source-code
+        runAfter:
+          - release-info
         taskRef:
           params:
             - name: name
@@ -50,9 +69,9 @@ spec:
           resolver: bundles
         params:
           - name: url
-            value: $(tasks.parse-metadata.results.operator-url)
+            value: "https://github.com/securesign/secure-sign-operator.git"
           - name: revision
-            value: $(tasks.parse-metadata.results.operator-revision)
+            value: "$(tasks.release-info.results.release-branch)"
           - name: subdirectory
             value: "operator"
         workspaces:
@@ -188,7 +207,7 @@ spec:
         timeout: "0h10m0s"
         runAfter:
           - provision-cluster
-          - parse-metadata
+          - release-info
         taskRef:
           resolver: git
           params:
@@ -204,7 +223,9 @@ spec:
           - name: clusterName
             value: "$(tasks.provision-cluster.results.clusterName)"
           - name: fbcImage
-            value: "$(tasks.parse-metadata.results.image)"
+            value: "$(tasks.parse-metadata.results.container-image)"
+          - name: installChannel
+            value: "$(tasks.release-info.results.channel)"
       - name: prepare-tests
         runAfter:
           - install-operator-from-fbc
@@ -288,8 +309,6 @@ spec:
                   value: $(workspaces.source-code.path)/operator
                 - name: tas-namespace
                   value: "$(params.TAS_DEPLOY_NAMESPACE)"
-                - name: OIDC_HOST
-                  value: "$(steps.install-keycloak.results.oidc-hostname)"
                 - name: OIDC_ISSUER_URL
                   value: "$(steps.install-keycloak.results.oidc-issuer-url)"
 # FULCIO DAST testing

pipelines/integration-test/operator-upgrade.yaml

@@ -20,8 +20,6 @@ spec:
         default: "4.19"
       - name: TAS_DEPLOY_NAMESPACE
         default: "tas-e2e"
-      - name: branch
-        default: main
     workspaces:
       - name: work
     tasks:
@@ -30,19 +28,36 @@ spec:
           resolver: git
           params:
             - name: url
-              value: https://github.com/securesign/pipelines.git
+              value: https://github.com/konflux-ci/tekton-integration-catalog
             - name: revision
-              value: $(params.branch)
+              value: main
             - name: pathInRepo
-              value: tasks/integration-test/parse-metadata.yaml
+              value: tasks/test-metadata/0.3/test-metadata.yaml
         params:
           - name: SNAPSHOT
             value: $(params.SNAPSHOT)
-          - name: branch
-            value: $(params.branch)
-      - name: clone-operator-source-code
+      - name: release-info
         runAfter:
           - parse-metadata
+        taskRef:
+          resolver: git
+          params:
+            - name: url
+              value: https://github.com/securesign/pipelines.git
+            - name: revision
+              value: main
+            - name: pathInRepo
+              value: tasks/integration-test/derive-release-info.yaml
+        params:
+          - name: package-name
+            value: "rhtas-operator"
+          - name: fbc-image
+            value: "$(tasks.parse-metadata.results.container-image)"
+          - name: ocp-version
+            value: $(params.OCP_VERSION)
+      - name: clone-operator-source-code
+        runAfter:
+          - release-info
         taskRef:
           params:
             - name: name
@@ -54,9 +69,9 @@ spec:
           resolver: bundles
         params:
           - name: url
-            value: $(tasks.parse-metadata.results.operator-url)
+            value: "https://github.com/securesign/secure-sign-operator.git"
           - name: revision
-            value: $(tasks.parse-metadata.results.operator-revision)
+            value: "$(tasks.release-info.results.release-branch)"
           - name: subdirectory
             value: "operator"
         workspaces:
@@ -243,7 +258,7 @@ spec:
                   - name: url
                     value: https://github.com/securesign/pipelines.git
                   - name: revision
-                    value: $(params.branch)
+                    value: main
                   - name: pathInRepo
                     value: stepactions/integration-test/install-keycloak.yaml
               params:
@@ -253,8 +268,6 @@ spec:
                   value: "$(steps.get-kubeconfig.results.kubeconfig)"
                 - name: workdir
                   value: "$(workspaces.source-code.path)/operator"
-                - name: branch
-                  value: $(params.branch)
       - name: run-operator-upgrade
         runAfter:
           - prepare-tests
@@ -302,7 +315,9 @@ spec:
                 - name: TEST_BASE_CATALOG
                   value: "registry.redhat.io/redhat/redhat-operator-index:v$(params.OCP_VERSION)"
                 - name: TEST_TARGET_CATALOG
-                  value: "$(tasks.parse-metadata.results.image)"
+                  value: "$(tasks.parse-metadata.results.container-image)"
+                - name: TEST_UPGRADE_CHANNEL
+                  value: "$(tasks.release-info.results.channel)"
               volumeMounts:
                 - name: credentials
                   mountPath: /credentials
@@ -332,11 +347,9 @@ spec:
                   - name: url
                     value: https://github.com/securesign/pipelines.git
                   - name: revision
-                    value: $(params.branch)
+                    value: main
                   - name: pathInRepo
                     value: stepactions/integration-test/process-go-test-results.yaml
               params:
                 - name: test_output_file
                   value: $(workspaces.source-code.path)/dump/operator-upgrade/test-result.json
-                - name: branch
-                  value: $(params.branch)

pipelines/integration-test/policy-controller-operator-e2e.yaml

@@ -293,8 +293,6 @@ spec:
                   value: $(workspaces.source-code.path)/tas-operator
                 - name: tas-namespace
                   value: "$(params.TAS_DEPLOY_NAMESPACE)"
-                - name: OIDC_HOST
-                  value: "$(steps.install-keycloak.results.oidc-hostname)"
                 - name: OIDC_ISSUER_URL
                   value: "$(steps.install-keycloak.results.oidc-issuer-url)"
       - name: install-operator-from-bundle