Skip to content

Commit

Permalink
Switches Travis to using the new pulpcore repo
Browse files Browse the repository at this point in the history
  • Loading branch information
dkliban committed Feb 28, 2019
1 parent 10201e1 commit 9a8da5b
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 6 deletions.
2 changes: 1 addition & 1 deletion .travis/before_script.sh
Expand Up @@ -5,7 +5,7 @@ psql -U postgres -c 'CREATE USER pulp WITH SUPERUSER LOGIN;'
psql -U postgres -c 'CREATE DATABASE pulp OWNER pulp;'

mkdir -p ~/.config/pulp_smash
cp ../pulp/.travis/pulp-smash-config.json ~/.config/pulp_smash/settings.json
cp ../pulpcore/.travis/pulp-smash-config.json ~/.config/pulp_smash/settings.json

sudo mkdir -p /var/lib/pulp/tmp
sudo mkdir /etc/pulp/
Expand Down
8 changes: 4 additions & 4 deletions .travis/install.sh
Expand Up @@ -2,22 +2,22 @@
set -v

export COMMIT_MSG=$(git show HEAD^2 -s)
export PULP_PR_NUMBER=$(echo $COMMIT_MSG | grep -oP 'Required\ PR:\ https\:\/\/github\.com\/pulp\/pulp\/pull\/(\d+)' | awk -F'/' '{print $7}')
export PULP_PR_NUMBER=$(echo $COMMIT_MSG | grep -oP 'Required\ PR:\ https\:\/\/github\.com\/pulp\/pulpcore\/pull\/(\d+)' | awk -F'/' '{print $7}')
export PULP_PLUGIN_PR_NUMBER=$(echo $COMMIT_MSG | grep -oP 'Required\ PR:\ https\:\/\/github\.com\/pulp\/pulpcore-plugin\/pull\/(\d+)' | awk -F'/' '{print $7}')
export PULP_SMASH_PR_NUMBER=$(echo $COMMIT_MSG | grep -oP 'Required\ PR:\ https\:\/\/github\.com\/PulpQE\/pulp-smash\/pull\/(\d+)' | awk -F'/' '{print $7}')

pip install -r test_requirements.txt

cd .. && git clone https://github.com/pulp/pulp.git
cd .. && git clone https://github.com/pulp/pulpcore.git

if [ -n "$PULP_PR_NUMBER" ]; then
pushd pulp
pushd pulpcore
git fetch origin +refs/pull/$PULP_PR_NUMBER/merge
git checkout FETCH_HEAD
popd
fi

pip install -e ./pulp
pip install -e ./pulpcore

git clone https://github.com/pulp/pulpcore-plugin.git

Expand Down
2 changes: 1 addition & 1 deletion .travis/script.sh
Expand Up @@ -12,7 +12,7 @@ pulp-manager makemigrations python
pulp-manager migrate --noinput

# Run unit tests.
(cd ../pulp && coverage run manage.py test pulp_python.tests.unit)
(cd ../pulpcore && coverage run manage.py test pulp_python.tests.unit)

# Run functional tests.
pulp-manager reset-admin-password --password admin
Expand Down

0 comments on commit 9a8da5b

Please sign in to comment.