Merge "Rollback to revision 0 instead of clearing Deckhand DB"
This commit is contained in:
commit
b5c42a6b50
|
@ -23,7 +23,6 @@ python-openstackclient==3.16.1
|
||||||
kubernetes>=6.0.0
|
kubernetes>=6.0.0
|
||||||
|
|
||||||
# Dependencies for other UCP components
|
# Dependencies for other UCP components
|
||||||
git+https://git.openstack.org/openstack/airship-deckhand@d1701774266069dda6eab9e70c7851da7e97919a#egg=deckhand
|
git+https://git.openstack.org/openstack/airship-deckhand@0b5aa2e98a1ab5ab8a58c9dec3c1f88ef00d17a9#egg=deckhand
|
||||||
git+https://git.openstack.org/openstack/airship-drydock.git@b1d24ad254c04cdbb4dc4e06f2bfe92c266aad70#egg=drydock_provisioner&subdirectory=python
|
git+https://git.openstack.org/openstack/airship-drydock.git@b1d24ad254c04cdbb4dc4e06f2bfe92c266aad70#egg=drydock_provisioner&subdirectory=python
|
||||||
git+https://git.openstack.org/openstack/airship-armada.git@90618f549c1f6d7741b11dc5c4898f3c6d536895#egg=armada
|
git+https://git.openstack.org/openstack/airship-armada.git@90618f549c1f6d7741b11dc5c4898f3c6d536895#egg=armada
|
||||||
|
|
||||||
|
|
|
@ -36,5 +36,6 @@ ulid==1.1
|
||||||
uwsgi==2.0.17
|
uwsgi==2.0.17
|
||||||
|
|
||||||
# Dependencies for other UCP components
|
# Dependencies for other UCP components
|
||||||
git+https://git.openstack.org/openstack/airship-deckhand@d1701774266069dda6eab9e70c7851da7e97919a#egg=deckhand
|
git+https://git.openstack.org/openstack/airship-deckhand@0b5aa2e98a1ab5ab8a58c9dec3c1f88ef00d17a9#egg=deckhand
|
||||||
git+https://git.openstack.org/openstack/airship-drydock.git@b1d24ad254c04cdbb4dc4e06f2bfe92c266aad70#egg=drydock_provisioner&subdirectory=python
|
git+https://git.openstack.org/openstack/airship-drydock.git@b1d24ad254c04cdbb4dc4e06f2bfe92c266aad70#egg=drydock_provisioner&subdirectory=python
|
||||||
|
git+https://git.openstack.org/openstack/airship-armada.git@90618f549c1f6d7741b11dc5c4898f3c6d536895#egg=armada
|
||||||
|
|
|
@ -156,12 +156,10 @@ class ConfigdocsHelper(object):
|
||||||
if committed_rev:
|
if committed_rev:
|
||||||
committed_rev_id = committed_rev['id']
|
committed_rev_id = committed_rev['id']
|
||||||
if committed_rev_id is None:
|
if committed_rev_id is None:
|
||||||
# TODO (bryan-strassner) use rollback to 0 if/when that
|
# Simulate rolling back to a blank revision history, which
|
||||||
# is implemented in deckhand.
|
# creates an empty revision with no documents, while still
|
||||||
# reset_to_empty has side effect of deleting history
|
# retaining the previous revision history.
|
||||||
# from deckhand although it is only the corner case
|
self.deckhand.rollback(0)
|
||||||
# where no commit has ever been done.
|
|
||||||
self.deckhand.reset_to_empty()
|
|
||||||
else:
|
else:
|
||||||
self.deckhand.rollback(committed_rev_id)
|
self.deckhand.rollback(committed_rev_id)
|
||||||
return True
|
return True
|
||||||
|
|
|
@ -5,15 +5,10 @@ responses==0.8.1
|
||||||
testfixtures==5.1.1
|
testfixtures==5.1.1
|
||||||
apache-airflow[crypto,celery,postgres,hive,hdfs,jdbc]==1.10.0
|
apache-airflow[crypto,celery,postgres,hive,hdfs,jdbc]==1.10.0
|
||||||
|
|
||||||
# Testing - Client libraries for UCP components
|
|
||||||
git+https://git.openstack.org/openstack/airship-deckhand@d1701774266069dda6eab9e70c7851da7e97919a#egg=deckhand
|
|
||||||
git+https://git.openstack.org/openstack/airship-drydock.git@b1d24ad254c04cdbb4dc4e06f2bfe92c266aad70#egg=drydock_provisioner&subdirectory=python
|
|
||||||
git+https://git.openstack.org/openstack/airship-armada.git@90618f549c1f6d7741b11dc5c4898f3c6d536895#egg=armada
|
|
||||||
# TODO(bryan-strassner) Pin to version for airflow when added to the
|
# TODO(bryan-strassner) Pin to version for airflow when added to the
|
||||||
# requirements.txt in the airflow images directory
|
# requirements.txt in the airflow images directory
|
||||||
git+https://git.openstack.org/openstack/airship-promenade.git@master#egg=promenade
|
git+https://git.openstack.org/openstack/airship-promenade.git@master#egg=promenade
|
||||||
|
|
||||||
|
|
||||||
# Linting
|
# Linting
|
||||||
flake8==3.3.0
|
flake8==3.3.0
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue