Skip to content

Commit

Permalink
Remove sqlite from pulp_file
Browse files Browse the repository at this point in the history
  • Loading branch information
David Davis authored and daviddavis committed Apr 26, 2018
1 parent e939287 commit a706ed8
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 13 deletions.
3 changes: 0 additions & 3 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,6 @@ python:
# python versions used in el7 SCL & supported fedora
- "3.5"
- "3.6"
env:
- DB=sqlite
- DB=postgres
addons:
# postgres versions provided by el7 RHSCL (lowest supportable version)
postgresql: "9.5"
Expand Down
13 changes: 3 additions & 10 deletions .travis/before_script.sh
Original file line number Diff line number Diff line change
@@ -1,10 +1,8 @@
#!/usr/bin/env sh
set -v

if [ "$DB" = 'postgres' ]; then
psql -U postgres -c 'CREATE USER pulp WITH SUPERUSER LOGIN;'
psql -U postgres -c 'CREATE DATABASE pulp OWNER pulp;'
fi
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
Expand All @@ -15,11 +13,6 @@ sudo mkdir /etc/pulp/
sudo chown -R travis:travis /var/lib/pulp
sudo chown travis:travis /var/cache/pulp

if [ "$DB" = 'postgres' ]; then
sudo cp ../pulp/.travis/server.postgres.yaml /etc/pulp/server.yaml
else
# docs job also requires server.yaml
sudo cp ../pulp/.travis/server.sqlite.yaml /etc/pulp/server.yaml
fi
sudo cp ../pulp/.travis/server.yaml /etc/pulp/server.yaml

echo "SECRET_KEY: \"$(cat /dev/urandom | tr -dc 'a-z0-9!@#$%^&*(\-_=+)' | head -c 50)\"" | sudo tee -a /etc/pulp/server.yaml

0 comments on commit a706ed8

Please sign in to comment.