Add KfDef to install OpenShift Pipelines for tests

tests/Dockerfile

@@ -51,6 +51,7 @@ COPY setup/operatorsetup scripts/install.sh scripts/installandtest.sh $HOME/peak
 COPY resources $HOME/peak/operator-tests/odh-manifests/resources
 COPY util $HOME/peak/operator-tests/odh-manifests
 COPY setup/odh-core.yaml $HOME/kfdef/
+COPY setup/openshift-pipelines.yaml $HOME/kfdef/
 COPY basictests $HOME/peak/operator-tests/odh-manifests/basictests
 
 RUN chmod -R 777 $HOME/kfdef && \

tests/scripts/install.sh

@@ -2,6 +2,7 @@
 
 echo "Installing kfDef from test directory"
 KFDEF_FILENAME=odh-core.yaml
+KFDEF_OS_PIPELINE=openshift-pipelines.yaml
 
 set -x
 ## Install the opendatahub-operator
@@ -47,6 +48,7 @@ else
   if [ $REPO_NAME == "odh-manifests" ]; then
     echo "Setting manifests in kfctl_openshift to use pull number: $PULL_NUMBER"
     sed -i "s#uri: https://github.com/opendatahub-io/odh-manifests/tarball/master#uri: https://api.github.com/repos/opendatahub-io/odh-manifests/tarball/pull/${PULL_NUMBER}/head#" ./${KFDEF_FILENAME}
+    sed -i "s#uri: https://github.com/opendatahub-io/odh-manifests/tarball/master#uri: https://api.github.com/repos/opendatahub-io/odh-manifests/tarball/pull/${PULL_NUMBER}/head#" ./${KFDEF_OS_PIPELINE}
   fi
 fi
 
@@ -86,7 +88,11 @@ else
     oc apply -k $HOME/peak/operator-tests/odh-manifests/resources/odh-dashboard/crd
   fi
 
-  echo "Creating the following KfDef"
+  echo "Creating the openshift-pipelines KfDef"
+  cat ./${KFDEF_OS_PIPELINE} > ${ARTIFACT_DIR}/${KFDEF_OS_PIPELINE}
+  oc apply -f ./${KFDEF_OS_PIPELINE}
+
+  echo "Creating the odh-core KfDef"
   cat ./${KFDEF_FILENAME} > ${ARTIFACT_DIR}/${KFDEF_FILENAME}
   oc apply -f ./${KFDEF_FILENAME}
   kfctl_result=$?

tests/setup/odh-core.yaml

@@ -1,3 +1,4 @@
+# Deploy openshift-pipelines KfDef before odh-core.
 # This file should always match the KfDef used to deploy ODH Core components
 apiVersion: kfdef.apps.kubeflow.org/v1
 kind: KfDef
@@ -10,14 +11,6 @@ spec:
         name: manifests
         path: odh-common
     name: odh-common
-  - kustomizeConfig:
-      parameters:
-        - name: namespace
-          value: openshift-operators
-      repoRef:
-        name: manifests
-        path: openshift-pipelines/cluster
-    name: openshift-pipelines
   - kustomizeConfig:
       repoRef:
         name: manifests

tests/setup/openshift-pipelines.yaml

@@ -0,0 +1,21 @@
+# Openshift pipelines needs a dedicated KfDef, since it installed in a separate namespce
+# The operator cannot be installed in the opendatahub namespace
+apiVersion: kfdef.apps.kubeflow.org/v1
+kind: KfDef
+metadata:
+  name: openshift-pipelines
+  namespace: openshift-operators
+spec:
+  applications:
+  - kustomizeConfig:
+      parameters:
+        - name: namespace
+          value: openshift-operators
+      repoRef:
+        name: manifests
+        path: openshift-pipelines/cluster
+    name: openshift-pipelines
+  repos:
+  - name: manifests
+    uri: https://github.com/opendatahub-io/odh-manifests/tarball/master
+  version: master