added steps to sync with upstream origin and delete updater branch once PR merged

Author: abhijeet-dhumal

.github/workflows/odh-notebooks-sync.yml

@@ -1,9 +1,12 @@
----
 # The aim of this GitHub workflow is to update the pipfile to sync with Codeflare-SDK release.
 name: Sync with codeflare-sdk release
-on:  # yamllint disable-line rule:truthy
+on:
   workflow_dispatch:
     inputs:
+      upstream-repository-organization:
+        required: true
+        description: "Provide the upstream repository organization name"
+
       codeflare-repository-organization:
         required: true
         description: "Provide the Codeflare repository organization name"
@@ -16,6 +19,7 @@ env:
   BRANCH_NAME: main
   CODEFLARE_RELEASE_VERSION: ${{ github.event.inputs.codeflare_sdk_release_version }}
   UPDATER_BRANCH: odh-sync-updater-${{ github.run_id }}
+  UPSTREAM_OWNER: ${{ github.event.inputs.upstream-repository-organization }}
   REPO_OWNER: ${{ github.event.inputs.codeflare-repository-organization }}
   REPO_NAME: notebooks
   GITHUB_TOKEN: ${{ secrets.CODEFLARE_MACHINE_ACCOUNT_TOKEN }}
@@ -24,22 +28,20 @@ jobs:
   build:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
         with:
           ref: ${{ env.BRANCH_NAME }}
 
-      - name: Clone repository
-        id: Clone
+      - name: Clone repository and Sync
         run: |
-          git clone https://github.com/$REPO_OWNER/$REPO_NAME.git $REPO_NAME
+          git clone https://x-access-token:${GITHUB_TOKEN}@github.com/$REPO_OWNER/$REPO_NAME.git $REPO_NAME
           cd $REPO_NAME
-
-      - name: Set up Git
-        run: |
+          git remote add upstream https://github.com/$UPSTREAM_OWNER/$REPO_NAME.git
           git config --global user.email "[email protected]"
           git config --global user.name "codeflare-machine-account"
+          git remote -v
+          git pull upstream main && git push origin main
 
-      # Setup Python environment
       - name: Setup Python environment
         uses: actions/setup-python@v4
         with:
@@ -82,12 +84,12 @@ jobs:
           total=${#directories[@]}
           for dir in "${directories[@]}"; do
             counter=$((counter+1))
-            echo -e "\n--Processing directory ($counter)'$dir' of total $total"
+            echo "--Processing directory $counter '$dir' of total $total"
             cd "$dir" && pipenv install codeflare-sdk~="${CODEFLARE_RELEASE_VERSION}" && pipenv --rm && cd -
             echo "$((total-counter)) directories remaining.."
           done
 
-      - name: Push changes to forked repository
+      - name: Push changes
         run: |
           cd $REPO_NAME
           git add . && git status && git checkout -b ${{ env.UPDATER_BRANCH }} && \
@@ -97,14 +99,12 @@ jobs:
 
       - name: Create Pull Request
         run: |
-          gh pr create --repo $REPO_OWNER/$REPO_NAME \
+          gh pr create --repo $UPSTREAM_OWNER/$REPO_NAME \
             --title "$pr_title" \
             --body "$pr_body" \
-            --label "$pr_label" \
             --head $REPO_OWNER:$UPDATER_BRANCH \
             --base $BRANCH_NAME
         env:
-          pr_label: "automated pr"
           pr_title: "[Digest Updater Action] Update notebook's pipfile to sync with Codeflare-SDK release"
           pr_body: |
             :rocket: This is an automated Pull Request.

.github/workflows/project-codeflare-release.yml

@@ -157,6 +157,7 @@ jobs:
         gh workflow run odh-notebooks-sync.yml \
           --repo ${{ github.event.inputs.codeflare-repository-organization }}/codeflare-operator \
           --ref ${{ github.ref }} \
+          --field upstream-repository-organization=opendatahub-io
           --field codeflare-repository-organization=${{ github.event.inputs.codeflare-repository-organization }} \
           --field codeflare_sdk_release_version=${{ github.event.inputs.codeflare-sdk-version }}
       env: