Skip to content

Commit

Permalink
feat: use pull request creator from repo-tools, not testeng-ci (#137)
Browse files Browse the repository at this point in the history
testeng-ci is deprecated in favor of repo-tools.
See the DEPR [1] and the PR that moved pull_request_creator to repo-tools [2].

This also includes some cosmetic changes to the upgrade PRs.

Before:
* branch == jenkins/upgrade-python-requirements-{id}
* title  == Python Requirements Update
* commit == chore: Updating Python Requirements

After:
* branch == repo-tools/upgrade-python-requirements-{id}
* title  == chore: Upgrade Python requirements
* commit == chore: Upgrade Python requirements

NOTE: This leaves behind a testeng-ci reference in the repo-health job. We need to figure out the future of the edx-repo-health repo. This will be a future task [3]

[1] openedx/public-engineering#265
[2] openedx/repo-tools#517
[3] #138
  • Loading branch information
kdmccormick committed Jun 7, 2024
1 parent ea32d1d commit e2fbf6d
Show file tree
Hide file tree
Showing 2 changed files with 12 additions and 16 deletions.
15 changes: 6 additions & 9 deletions .github/workflows/bulk_repo_update.yml
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,7 @@ jobs:
uses: actions/setup-python@v5
with:
python-version: ${{ github.event.inputs.python_version }}

- name: Setup Nodejs
uses: actions/setup-node@v4
with:
Expand All @@ -110,28 +110,25 @@ jobs:
- name: run script
run: ${{ github.event.inputs.script }}

- name: setup testeng-ci
- name: setup pull_request_creator
run: |
git clone https://github.com/edx/testeng-ci.git
cd $GITHUB_WORKSPACE/testeng-ci
pip install -r requirements/base.txt
pip install 'edx-repo-tools[pull_request_creator]'
- name: setup draft flag
run: echo "draftflag=$(if ${{ github.event.inputs.draft }}; then echo '--draft'; else echo ''; fi)" >> $GITHUB_ENV

- name: setup force delete flag
run: echo "force_delete_old_prs_flag=$(if ${{ github.event.inputs.force_delete_old_prs }}; then echo '--force-delete-old-prs'; else echo '--no-force-delete-old-prs'; fi)" >> $GITHUB_ENV

- name: ignore testeng-ci
run: echo "testeng-ci" >> .git/info/exclude
- name: ignore repo-tools
run: echo "repo-tools" >> .git/info/exclude

- name: create pull request
env:
GITHUB_TOKEN: ${{ secrets.requirements_bot_github_token }}
GITHUB_USER_EMAIL: ${{ secrets.requirements_bot_github_email }}
run: |
cd $GITHUB_WORKSPACE/testeng-ci
python -m jenkins.pull_request_creator --repo-root=$GITHUB_WORKSPACE \
pull_request_creator --repo-root=$GITHUB_WORKSPACE \
--target-branch="${{ env.BRANCH }}" --base-branch-name="${{ github.event.inputs.branch }}" \
--commit-message="${{ github.event.inputs.commit_message }}" \
--pr-title="${{ github.event.inputs.commit_message }}" \
Expand Down
13 changes: 6 additions & 7 deletions .github/workflows/upgrade-python-requirements.yml
Original file line number Diff line number Diff line change
Expand Up @@ -74,11 +74,10 @@ jobs:
cd $GITHUB_WORKSPACE
make upgrade
- name: setup testeng-ci
- name: setup pull_request_creator
run: |
git clone https://github.com/edx/testeng-ci.git
cd $GITHUB_WORKSPACE/testeng-ci
pip install -r requirements/base.txt
pip install 'edx-repo-tools[pull_request_creator]'
- name: create pull request
id: createpullrequest
env:
Expand All @@ -88,10 +87,10 @@ jobs:
USER_REVIEWERS: ${{ inputs.user_reviewers }}
TEAM_REVIEWERS: ${{ inputs.team_reviewers }}
run: |
cd $GITHUB_WORKSPACE/testeng-ci
python -m jenkins.pull_request_creator --repo-root=$GITHUB_WORKSPACE \
pull_request_creator --repo-root=$GITHUB_WORKSPACE \
--target-branch="$TARGET_BRANCH" --base-branch-name="upgrade-python-requirements" \
--commit-message="chore: Updating Python Requirements" --pr-title="Python Requirements Update" \
--commit-message="chore: Upgrade Python requirements" \
--pr-title="chore: Upgrade Python requirements" \
--pr-body="Python requirements update. Please review the [changelogs](https://openedx.atlassian.net/wiki/spaces/TE/pages/1001521320/Python+Package+Changelogs) for the upgraded packages." \
--user-reviewers="$USER_REVIEWERS" \
--team-reviewers="$TEAM_REVIEWERS" \
Expand Down

0 comments on commit e2fbf6d

Please sign in to comment.