d4025b99b1
This patch also corrects oslo imports in order to allow it to pass pep8 checks, removes the db models from the stackforge and adds a way to pull unmerged patches into the test environment so that development progress isn't blocked by required neutron patches. Change-Id: I2650ea6aa7bb5ad78d4247e5e1b593f2705bbe42
37 lines
858 B
Bash
Executable File
37 lines
858 B
Bash
Executable File
#!/bin/sh
|
|
|
|
echo "Adding neutron patches into the testing env"
|
|
|
|
DIRECTORY="$1/src/neutron"
|
|
LIST_SRC="$2/test-patches.txt"
|
|
|
|
echo "Checking Directory Existance: $DIRECTORY"
|
|
|
|
if [ ! -d "$DIRECTORY" ]; then
|
|
echo "Directory $DIRECTORY does not exist, aborting..."
|
|
exit 1
|
|
fi
|
|
|
|
cd $DIRECTORY
|
|
|
|
# Ensure we're on toxBranch not master or other branches
|
|
git checkout -b toxBranch 2> /dev/null
|
|
git checkout toxBranch 2> /dev/null
|
|
|
|
# Fetch and rebase patches into neutron src
|
|
while read p; do
|
|
git fetch https://review.openstack.org/openstack/neutron $p
|
|
git checkout FETCH_HEAD
|
|
git rebase master
|
|
git rebase HEAD toxBranch
|
|
|
|
if [ -d "$2/.git/rebase-merge" ]; then
|
|
echo "Patch $p in confict and can not be added..."
|
|
git rebase --abort
|
|
fi
|
|
done <$LIST_SRC
|
|
|
|
# Ensure we're up to date with master even after rebases
|
|
git checkout toxBranch
|
|
git rebase master
|