Skip to content
This repository has been archived by the owner on Jan 31, 2024. It is now read-only.

Commit

Permalink
Add installation of OpenShift Pipelines using peak framework
Browse files Browse the repository at this point in the history
  • Loading branch information
VaishnaviHire committed Apr 19, 2023
1 parent 4596f8b commit c9507e1
Show file tree
Hide file tree
Showing 4 changed files with 15 additions and 10 deletions.
2 changes: 1 addition & 1 deletion tests/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ ENV PATH="${PATH}:$HOME/.local/bin"
RUN cd $HOME/src/ods-ci && poetry install


COPY setup/operatorsetup scripts/install.sh scripts/installandtest.sh $HOME/peak/
COPY setup/operatorsetup setup/pipelines-op-setup 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/
Expand Down
14 changes: 13 additions & 1 deletion tests/scripts/install.sh
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,18 @@ else
sleep 1m
done
fi

# Update Install Plan of opendatahub-operator to Automatic. It is set to manual if deployed in openshift-ci
oc patch installplan $(oc get installplan -l operators.coreos.com/opendatahub-operator.openshift-operators -n openshift-operators -o jsonpath="{$.items[*].metadata.name}") \
--namespace openshift-openshift-operators \
--type merge \
--patch '{"spec":{"approval":"Automatic"}}'

# Install OpenShift Pipelines operator irrespective of SKIP_OPERATOR_INSTALL value
echo "Installing OpenShift Pipelines operator"
./setup.sh -t ~/peak/pipelines-op-setup 2>&1


popd
## Grabbing and applying the patch in the PR we are testing
pushd ~/src/odh-manifests
Expand Down Expand Up @@ -86,7 +98,7 @@ else
oc apply -k $HOME/peak/operator-tests/odh-manifests/resources/odh-dashboard/crd
fi

echo "Creating the following KfDef"
echo "Creating the odh-core KfDef"
cat ./${KFDEF_FILENAME} > ${ARTIFACT_DIR}/${KFDEF_FILENAME}
oc apply -f ./${KFDEF_FILENAME}
kfctl_result=$?
Expand Down
8 changes: 0 additions & 8 deletions tests/setup/odh-core.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -10,14 +10,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
Expand Down
1 change: 1 addition & 0 deletions tests/setup/pipelines-op-setup
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
openshift-pipelines-operator-rh latest https://github.com/tektoncd/operator

0 comments on commit c9507e1

Please sign in to comment.