diff --git a/.travis/before_script.sh b/.travis/before_script.sh index 4b3a9e4e..ed867e2c 100644 --- a/.travis/before_script.sh +++ b/.travis/before_script.sh @@ -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/ diff --git a/.travis/install.sh b/.travis/install.sh index bc4a4b3f..0f224bc2 100644 --- a/.travis/install.sh +++ b/.travis/install.sh @@ -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 diff --git a/.travis/script.sh b/.travis/script.sh index a6a1d162..902c734c 100644 --- a/.travis/script.sh +++ b/.travis/script.sh @@ -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