Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Updates for pulpcore repo move #182

Merged
merged 1 commit into from Feb 28, 2019
Merged

Updates for pulpcore repo move #182

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion .travis/before_script.sh
View file
Open in desktop
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 /var/cache/pulp
Expand Down
8 changes: 4 additions & 4 deletions .travis/install.sh
View file
Open in desktop
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
bmbouter marked this conversation as resolved.
Show resolved Hide resolved
fi

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

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

Expand Down
4 changes: 2 additions & 2 deletions .travis/script.sh
View file
Open in desktop
Expand Up @@ -15,7 +15,7 @@ pulp-manager makemigrations file
pulp-manager migrate --noinput

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

# Run functional tests.
pulp-manager reset-admin-password --password admin
Expand All @@ -36,7 +36,7 @@ show_logs_and_return_non_zero() {
pytest -v -r sx --color=yes --pyargs pulp_file.tests.functional || show_logs_and_return_non_zero

# test against pulpcore as well since pulpcore has a set of tests which use pulp_file
cd ../pulp
cd ../pulpcore
pytest -v -r sx --color=yes --pyargs pulpcore.tests.functional.api.using_plugin || show_logs_and_return_non_zero

# Travis' scripts use unbound variables. This is problematic, because the
Expand Down