Skip to content

Commit a869c13

Browse files
committed
Fixing applying patch
1 parent 0b4a886 commit a869c13

File tree

1 file changed

+4
-4
lines changed

1 file changed

+4
-4
lines changed

tests/scripts/install.sh

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -28,22 +28,22 @@ else
2828
fi
2929
popd
3030
## Grabbing and applying the patch in the PR we are testing
31-
pushd ~/src/odh-manifests
31+
pushd ~/src/data-science-pipelines
3232
if [ -z "$PULL_NUMBER" ]; then
3333
echo "No pull number, assuming nightly run"
3434
else
3535
curl -O -L https://github.com/${REPO_OWNER}/${REPO_NAME}/pull/${PULL_NUMBER}.patch
36-
echo "Applying followng patch:"
36+
echo "Applying following patch:"
3737
cat ${PULL_NUMBER}.patch > ${ARTIFACT_DIR}/github-pr-${PULL_NUMBER}.patch
38-
git apply ${PULL_NUMBER}.patch
38+
git am ${PULL_NUMBER}.patch
3939
fi
4040
popd
4141
## Point kfctl_openshift.yaml to the manifests in the PR
4242
pushd ~/kfdef
4343
if [ -z "$PULL_NUMBER" ]; then
4444
echo "No pull number, not modifying kfctl_openshift.yaml"
4545
else
46-
if [ $REPO_NAME == "odh-manifests" ]; then
46+
if [ $REPO_NAME == "data-science-pipelines" ]; then
4747
echo "Setting manifests in kfctl_openshift to use pull number: $PULL_NUMBER"
4848
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#" ./kfctl_openshift.yaml
4949
fi

0 commit comments

Comments
 (0)