Merge "Update Deckhand commit"

This commit is contained in:
Zuul 2018-05-29 13:53:29 +00:00 committed by Gerrit Code Review
commit a48dcacecc
5 changed files with 64 additions and 64 deletions

View File

@ -42,7 +42,8 @@ while true; do
log Armada static pod manifest still in place after expected duration
fail
fi
sleep 5
sleep 30
kubectl get pods --all-namespaces || echo "Could not get current pod status."
else
log Armada static pod manifest removed
break

View File

@ -13,4 +13,4 @@ pbr==3.0.1
pyyaml==3.12
requests==2.18.4
uwsgi==2.0.15
git+https://github.com/att-comdev/deckhand.git@c962eeb975af5ecf9793f794d536538d210b7735#egg=deckhand
git+https://git.openstack.org/openstack/airship-deckhand@177675e96fffcda9799c68bbce831424c1167020#egg=deckhand

View File

@ -1,42 +1,31 @@
Babel==2.5.3
Jinja2==2.9.6
Mako==1.0.7
MarkupSafe==1.0
Paste==2.0.3
PasteDeploy==1.5.2
PyYAML==3.12
Routes==2.4.1
SQLAlchemy==1.2.6
Tempita==0.5.2
WebOb==1.8.0
Werkzeug==0.14.1
alembic==0.9.9
alembic==0.8.2
amqp==2.2.2
cachetools==2.0.1
certifi==2018.1.18
Babel==2.5.3
cachetools==2.1.0
certifi==2018.4.16
chardet==3.0.4
click==6.7
cliff==2.11.0
cmd2==0.8.2
cmd2==0.8.5
contextlib2==0.5.5
debtcollector==1.19.0
decorator==4.2.1
git+https://git.openstack.org/openstack/airship-deckhand@177675e96fffcda9799c68bbce831424c1167020#egg=deckhand
decorator==4.3.0
dogpile.cache==0.6.5
enum-compat==0.0.2
eventlet==0.20.0
eventlet==0.23.0
extras==1.0.0
falcon==1.2.0
fasteners==0.14.1
fixtures==3.0.0
flake8==2.5.5
futurist==1.6.0
git+https://github.com/att-comdev/deckhand.git@c962eeb975af5ecf9793f794d536538d210b7735#egg=deckhand
flake8==2.6.2
futurist==1.7.0
google-auth==1.4.1
greenlet==0.4.13
hacking==1.0.0
hacking==1.1.0
idna==2.6
ipaddress==1.0.19
ipaddress==1.0.22
iso8601==0.1.12
Jinja2==2.9.6
jsonpath-ng==1.4.3
jsonschema==2.6.0
keystoneauth1==3.2.0
@ -44,62 +33,73 @@ keystonemiddleware==4.17.0
kombu==4.1.0
kubernetes==3.0.0
linecache2==1.0.0
mccabe==0.2.1
monotonic==1.4
Mako==1.0.7
MarkupSafe==1.0
mccabe==0.5.3
monotonic==1.5
msgpack==0.5.6
netaddr==0.7.19
netifaces==0.10.6
netifaces==0.10.7
networkx==2.1
oslo.cache==1.30.0
oslo.concurrency==3.26.0
oslo.config==6.0.1
oslo.cache==1.30.1
oslo.concurrency==3.27.0
oslo.config==6.2.1
oslo.context==2.19.2
oslo.db==4.35.0
oslo.db==4.38.0
oslo.i18n==3.20.0
oslo.log==3.37.0
oslo.messaging==6.0.0
oslo.log==3.38.1
oslo.messaging==6.2.0
oslo.middleware==3.35.0
oslo.policy==1.22.1
oslo.serialization==2.25.0
oslo.service==1.30.0
oslo.utils==3.36.0
oslo.service==1.31.2
oslo.utils==3.36.2
Paste==2.0.3
PasteDeploy==1.5.2
pbr==3.0.1
pep8==1.5.7
ply==3.11
positional==1.2.1
prettytable==0.7.2
psycopg2==2.7.4
pyasn1-modules==0.2.1
pyasn1==0.4.2
pyasn1-modules==0.2.1
pycadf==2.7.0
pyflakes==0.8.1
pycodestyle==2.0.0
pyflakes==1.2.3
pyinotify==0.9.6
pyparsing==2.2.0
pyperclip==1.6.0
python-barbicanclient==4.6.0
python-dateutil==2.7.2
python-dateutil==2.7.3
python-editor==1.0.3
python-keystoneclient==3.15.0
python-keystoneclient==3.16.0
python-memcached==1.59
python-mimeparse==1.6.0
pytz==2018.3
pytz==2018.4
PyYAML==3.12
repoze.lru==0.7
requests==2.18.4
rfc3986==1.1.0
Routes==2.4.1
rsa==3.4.2
six==1.11.0
SQLAlchemy==1.2.7
sqlalchemy-migrate==0.11.0
sqlparse==0.2.4
statsd==3.2.2
stevedore==1.28.0
tenacity==4.9.0
Tempita==0.5.2
tenacity==4.12.0
testresources==2.0.1
testscenarios==0.5.0
testtools==2.3.0
traceback2==1.4.0
uWSGI==2.0.15
unittest2==1.1.0
urllib3==1.22
uWSGI==2.0.15
vine==1.1.4
wcwidth==0.1.7
WebOb==1.8.1
websocket-client==0.40.0
Werkzeug==0.14.1
wrapt==1.10.11

View File

@ -100,7 +100,6 @@ data:
chart_name: helm-toolkit
release: helm-toolkit
namespace: helm-toolkit
timeout: 600
upgrade:
no_hooks: true
values: {}
@ -123,9 +122,6 @@ data:
chart_name: infra-helm-toolkit
release: infra-helm-toolkit
namespace: infra-helm-toolkit
timeout: 600
wait:
timeout: 600
upgrade:
no_hooks: true
values: {}
@ -148,7 +144,8 @@ data:
chart_name: proxy
release: kubernetes-proxy
namespace: kube-system
timeout: 600
wait:
timeout: 120
upgrade:
no_hooks: true
values:
@ -323,9 +320,8 @@ data:
chart_name: etcd
release: calico-etcd
namespace: kube-system
timeout: 600
wait:
timeout: 6000
timeout: 300
upgrade:
no_hooks: true
values:
@ -443,7 +439,8 @@ data:
chart_name: calico
release: calico
namespace: kube-system
timeout: 600
wait:
timeout: 300
upgrade:
no_hooks: true
values:
@ -523,9 +520,8 @@ data:
release: coredns
namespace: kube-system
test: true
timeout: 600
wait:
timeout: 600
timeout: 300
upgrade:
no_hooks: true
values:
@ -550,9 +546,8 @@ data:
chart_name: haproxy
release: haproxy
namespace: kube-system
timeout: 600
wait:
timeout: 600
timeout: 300
upgrade:
no_hooks: true
values:
@ -659,7 +654,8 @@ data:
chart_name: apiserver
release: kubernetes-apiserver
namespace: kube-system
timeout: 600
wait:
timeout: 300
upgrade:
no_hooks: true
values:
@ -737,7 +733,8 @@ data:
chart_name: controller_manager
release: kubernetes-controller-manager
namespace: kube-system
timeout: 600
wait:
timeout: 300
upgrade:
no_hooks: true
values:
@ -799,7 +796,8 @@ data:
chart_name: scheduler
release: kubernetes-scheduler
namespace: kube-system
timeout: 600
wait:
timeout: 300
upgrade:
no_hooks: true
values:
@ -954,9 +952,8 @@ data:
chart_name: etcd
release: kubernetes-etcd
namespace: kube-system
timeout: 600
wait:
timeout: 6000
timeout: 300
test: true
upgrade:
no_hooks: true
@ -1039,7 +1036,8 @@ data:
chart_name: promenade
release: promenade
namespace: ucp
timeout: 600
wait:
timeout: 120
values:
conf:
paste:

View File

@ -37,8 +37,9 @@ commands =
deps = -r{toxinidir}/requirements-direct.txt
recreate = True
whitelist_externals = sh
grep
commands=
sh -c "pip freeze | grep -v '^promenade' > {toxinidir}/requirements-frozen.txt"
sh -c "pip freeze | grep -vE '^(promenade)|(pkg-resources)' > {toxinidir}/requirements-frozen.txt"
[testenv:gate-lint]
deps =