Run upgrade testing from git (bp #1129)

[mergify]

This is an automatic backport of pull request #1129 done by Mergify.

Cherry-pick of c6757fe has failed:

On branch mergify/bp/stable/4.3/pr-1129
Your branch is up to date with 'origin/stable/4.3'.

You are currently cherry-picking commit c6757fe1.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Changes to be committed:
	modified:   run-upgrade-tests.sh

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   tox.ini

To fixup this pull request, you can check out it locally. See documentation: https://help.github.com/articles/checking-out-pull-requests-locally/

---

Mergify commands and options

More conditions and actions can be found in the documentation.

You can also trigger Mergify actions by commenting on this pull request:

• @Mergifyio refresh will re-evaluate the rules
• @Mergifyio rebase will rebase this PR on its base branch
• @Mergifyio update will merge the base branch into this PR
• @Mergifyio backport <destination> will backport this PR on <destination> branch

Additionally, on Mergify dashboard you can:

• look at your merge queues
• generate the Mergify configuration with the config editor.

Finally, you can contact us on https://mergify.io/

[tobias-urdin]

@Mergifyio rebase

[mergify]

Command rebase: failure

Base branch update has failed
Git reported the following error:

First, rewinding head to replay your work on top of it...
Applying: Run upgrade testing from git
Applying: Run upgrade testing from git
Using index info to reconstruct a base tree...
M	run-upgrade-tests.sh
M	tox.ini
Falling back to patching base and 3-way merge...
Auto-merging tox.ini
CONFLICT (content): Merge conflict in tox.ini
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch' to see the failed patch
Patch failed at 0002 Run upgrade testing from git
Resolve all conflicts manually, mark them as resolved with
"git add/rm <conflicted_files>", then run "git rebase --continue".
You can instead skip this commit: run "git rebase --skip".
To abort and get back to the state before "git rebase", run "git rebase --abort".

err-code: 0FF27