Merge "Update Deckhand test-/requirements.txt"

requirements.txt

@@ -3,39 +3,39 @@
 # process, which may cause wedges in the gate later.
 
 # Hacking already pins down pep8, pyflakes and flake8
-hacking>=1.0.0 # Apache-2.0
+hacking>=1.1.0 # Apache-2.0
 
 alembic>=0.9.6 # MIT
 falcon>=1.4.1 # Apache-2.0
-pbr!=2.1.0,>=3.1.1 # Apache-2.0
+pbr!=2.1.0,>=4.0.3 # Apache-2.0
 PasteDeploy>=1.5.2 # MIT
 Paste # MIT
 Routes>=2.4.1 # MIT
-keystoneauth1>=3.4.0 # Apache-2.0
+keystoneauth1>=3.6.1 # Apache-2.0
 networkx==2.1
 
 six>=1.11.0 # MIT
 stevedore>=1.28.0 # Apache-2.0
-python-keystoneclient>=3.15.0 # Apache-2.0
+python-keystoneclient>=3.16.0 # Apache-2.0
 python-memcached==1.59
-keystonemiddleware>=4.21.0 # Apache-2.0
+keystonemiddleware>=5.1.0 # Apache-2.0
 psycopg2==2.7.4
-uwsgi==2.0.16
+uwsgi==2.0.17
 jsonpath-ng==1.4.3
 jsonschema==2.6.0
 
-oslo.cache>=1.28.0 # Apache-2.0
-oslo.concurrency>=3.25.0 # Apache-2.0
-oslo.config!=4.3.0,!=4.4.0,>=5.2.0 # Apache-2.0
+oslo.cache>=1.30.1 # Apache-2.0
+oslo.concurrency>=3.27.0 # Apache-2.0
+oslo.config!=4.3.0,!=4.4.0  # Apache-2.0
 oslo.context>=2.20.0 # Apache-2.0
-oslo.messaging!=5.25.0,>=5.35.0 # Apache-2.0
-oslo.db>=4.33.0 # Apache-2.0
-oslo.i18n!=3.15.2,>=3.19.0 # Apache-2.0
-oslo.log>=3.36.0 # Apache-2.0
-oslo.middleware>=3.34.0 # Apache-2.0
-oslo.policy>=1.33.1 # Apache-2.0
-oslo.serialization!=2.19.1,>=2.24.0 # Apache-2.0
-oslo.utils>=3.35.0 # Apache-2.0
+oslo.messaging!=5.25.0,>=6.2.0 # Apache-2.0
+oslo.db>=4.38.0 # Apache-2.0
+oslo.i18n!=3.15.2,>=3.20.0 # Apache-2.0
+oslo.log>=3.38.1 # Apache-2.0
+oslo.middleware>=3.35.0 # Apache-2.0
+oslo.policy>=1.35.0 # Apache-2.0
+oslo.serialization!=2.19.1,>=2.25.0 # Apache-2.0
+oslo.utils>=3.36.2 # Apache-2.0
 
 # TODO(alanmeadows)
 # this must match the container service

test-requirements.txt

@@ -3,15 +3,17 @@
 # process, which may cause wedges in the gate later.
 
 # Hacking already pins down pep8, pyflakes and flake8
-hacking>=1.0.0 # Apache-2.0
+hacking>=1.1.0 # Apache-2.0
 
 coverage!=4.4,>=4.5.1 # Apache-2.0
 fixtures>=3.0.0 # Apache-2.0/BSD
-python-subunit>=1.2.0 # Apache-2.0/BSD
-oslotest>=3.2.0 # Apache-2.0
+python-subunit>=1.3.0 # Apache-2.0/BSD
+oslotest>=3.4.2 # Apache-2.0
 os-testr>=1.0.0 # Apache-2.0
 testrepository>=0.0.20 # Apache-2.0/BSD
 testtools>=2.3.0 # MIT
 bandit>=1.4.0 # Apache-2.0
+# NOTE(felipemonteiro): Pin here because later versions require that
+# content-type be present in empty responses, which is apparently a bug.
 gabbi==1.35.1
 pifpaf>=0.10.0 # Apache-2.0

tools/integration-tests.sh

@@ -51,9 +51,8 @@ function deploy_osh_keystone_barbican {
     make dev-deploy setup-host
     make dev-deploy k8s
 
-    # NOTE(fmontei): Use this version because newer versions might
-    # be slightly different in terms of test syntax in YAML files.
-    sudo -H -E pip install gabbi==1.35.1
+    cd ${CURRENT_DIR}
+    sudo -H -E pip install -r test-requirements.txt
 
     cd ${OSH_PATH}
     # Setup clients on the host and assemble the charts¶

tools/run_pifpaf.sh

@@ -13,6 +13,10 @@ trap cleanup EXIT
 # Instantiate an ephemeral PostgreSQL DB and print out the `pifpaf` environment
 # variables for debugging purposes.
 set -ex
+if [ -z $(which pg_config) ]; then
+    sudo apt-get install libpq-dev -y
+fi
+
 eval `pifpaf run postgresql`
 env | grep PIFPAF
 set +ex