diff --git a/Makefile b/Makefile index f7750108..83f2c883 100644 --- a/Makefile +++ b/Makefile @@ -12,6 +12,8 @@ # See the License for the specific language governing permissions and # limitations under the License. +include vcs-requirements.env + PEGLEG_BUILD_CTX ?= pegleg IMAGE_NAME ?= pegleg IMAGE_PREFIX ?= airshipit @@ -75,7 +77,7 @@ ifeq ($(USE_PROXY), true) --label "org.opencontainers.image.revision=$(COMMIT)" \ --label "org.opencontainers.image.created=$(shell date --rfc-3339=seconds --utc)" \ --label "org.opencontainers.image.title=$(IMAGE_NAME)" \ - -f images/pegleg/Dockerfile.$(DISTRO) \ + -f images/pegleg/Dockerfile.${DISTRO} \ $(_BASE_IMAGE_ARG) \ --build-arg http_proxy=$(PROXY) \ --build-arg https_proxy=$(PROXY) \ @@ -83,15 +85,21 @@ ifeq ($(USE_PROXY), true) --build-arg HTTPS_PROXY=$(PROXY) \ --build-arg no_proxy=$(NO_PROXY) \ --build-arg NO_PROXY=$(NO_PROXY) \ - --build-arg ctx_base=$(PEGLEG_BUILD_CTX) . + --build-arg ctx_base=$(PEGLEG_BUILD_CTX) . \ + --build-arg DECKHAND_VERSION=${DECKHAND_VERSION} \ + --build-arg PROMENADE_VERSION=${PROMENADE_VERSION} \ + --build-arg SHIPYARD_VERSION=${SHIPYARD_VERSION} else docker build -t $(IMAGE) --network=host --label $(LABEL) \ --label "org.opencontainers.image.revision=$(COMMIT)" \ --label "org.opencontainers.image.created=$(shell date --rfc-3339=seconds --utc)" \ --label "org.opencontainers.image.title=$(IMAGE_NAME)" \ - -f images/pegleg/Dockerfile.$(DISTRO) \ + -f images/pegleg/Dockerfile.${DISTRO} \ $(_BASE_IMAGE_ARG) \ - --build-arg ctx_base=$(PEGLEG_BUILD_CTX) . + --build-arg ctx_base=$(PEGLEG_BUILD_CTX) . \ + --build-arg DECKHAND_VERSION=${DECKHAND_VERSION} \ + --build-arg PROMENADE_VERSION=${PROMENADE_VERSION} \ + --build-arg SHIPYARD_VERSION=${SHIPYARD_VERSION} endif ifeq ($(PUSH_IMAGE), true) docker push $(IMAGE) diff --git a/Pipfile b/Pipfile index 0a41bcd8..717e5a7d 100644 --- a/Pipfile +++ b/Pipfile @@ -16,7 +16,6 @@ yapf = ">=0.27.0" hacking = ">=1.1.0" flake8-import-order = ">=0.18.1" bandit = ">=1.6.0" -docker = ">=3.7.2" [packages] click = ">=6.7" @@ -24,10 +23,11 @@ jsonschema = "~=2.6.0" cryptography = "~=2.3.1" python-dateutil = "~=2.7.3" GitPython = "~=2.1.11" +docker = ">=3.7.2" PyYAML = "~=5.1" -deckhand = {git = "https://opendev.org/airship/deckhand.git",ref = "a4850f8c4fc02dd1971282c6d9e4beb9cd5be320",editable = true} -shipyard-client = {git = "https://opendev.org/airship/shipyard.git",ref = "1472a22dce698ea77f15b007906b263eef470f52",subdirectory = "src/bin/shipyard_client",editable = true} -promenade = {git = "https://opendev.org/airship/promenade.git",ref = "89f9842b2ec428709a05fd0a8d4cd1796043375d",editable = true} +deckhand = {git = "https://opendev.org/airship/deckhand.git",ref = "a4850f8c4fc02dd1971282c6d9e4beb9cd5be320"} +shipyard-client = {git = "https://opendev.org/airship/shipyard.git",ref = "1472a22dce698ea77f15b007906b263eef470f52",subdirectory = "src/bin/shipyard_client"} +promenade = {git = "https://opendev.org/airship/promenade.git",ref = "89f9842b2ec428709a05fd0a8d4cd1796043375d"} oslo-utils = "~=3.41.0" [requires] diff --git a/Pipfile.lock b/Pipfile.lock index a9419e6d..3647caa9 100644 --- a/Pipfile.lock +++ b/Pipfile.lock @@ -1,7 +1,7 @@ { "_meta": { "hash": { - "sha256": "8f1bacdb3f58337cce65e006405e27d6df66cdf9de81d0c7c1a4c46140f10a08" + "sha256": "82b92d92ddbd2d6ae72bfa461fc7f504505d90f64f2ddbc138153ed217e5b16b" }, "pipfile-spec": 6, "requires": { @@ -16,32 +16,6 @@ ] }, "default": { - "alembic": { - "hashes": [ - "sha256:0fe570f23dc48fb1bbda6f6a396f1c0c28d7045c0ad14018c104a511e6c1fe8a" - ], - "version": "==1.0.1" - }, - "amqp": { - "hashes": [ - "sha256:aa4409446139676943a2eaa27d5f58caf750f4ca5a89f888c452afd86be6a67d", - "sha256:cbb6f87d53cac612a594f982b717cc1c54c6a1e17943a0a0d32dc6cc9e2120c8" - ], - "version": "==2.5.0" - }, - "argparse": { - "hashes": [ - "sha256:62b089a55be1d8949cd2bc7e0df0bddb9e028faefc8c32038cc84862aefdd6e4", - "sha256:c31647edb69fd3d465a847ea3157d37bed1f95f19760b11a47aa91c04b666314" - ], - "version": "==1.4.0" - }, - "arrow": { - "hashes": [ - "sha256:a558d3b7b6ce7ffc74206a86c147052de23d3d4ef0e17c210dd478c53575c4cd" - ], - "version": "==0.12.1" - }, "asn1crypto": { "hashes": [ "sha256:2f1adbb7546ed199e3c90ef23ec95c5cf3585bac7d11fb7eb562a3fe89c64e87", @@ -49,13 +23,6 @@ ], "version": "==0.24.0" }, - "attrs": { - "hashes": [ - "sha256:69c0dbf2ed392de1cb5ec704444b08a5ef81680a61cb899dc08127123af36a79", - "sha256:f0b870f674851ecbfbbbd364d6b5cbdff9dcedbc7f3f5e18a6891057f21fe399" - ], - "version": "==19.1.0" - }, "babel": { "hashes": [ "sha256:af92e6106cb7c55286b25b38ad7695f8b4efb36a90ba483d7f7a6628c46158ab", @@ -63,19 +30,6 @@ ], "version": "==2.7.0" }, - "beaker": { - "hashes": [ - "sha256:6072892918225f5a055413082f2ff285f3ebca6a3873a0d6e163253ba83f0450" - ], - "version": "==1.10.0" - }, - "cachetools": { - "hashes": [ - "sha256:428266a1c0d36dc5aca63a2d7c5942e88c2c898d72139fca0e97fdd2380517ae", - "sha256:8ea2d3ce97850f31e4a08b0e2b5e6c34997d7216a9d2c98e0f3978630d4da69a" - ], - "version": "==3.1.1" - }, "certifi": { "hashes": [ "sha256:046832c04d4e752f37383b628bc601a7ea7211496b4638f6514d0e5b9acc4939", @@ -125,39 +79,11 @@ }, "click": { "hashes": [ - "sha256:29f99fc6125fbc931b758dc053b3114e55c77a6e4c6c3a2674a2dc986016381d", - "sha256:f15516df478d5a56180fbf80e68f206010e6d160fc39fa508b65e035fd75130b" + "sha256:2335065e6395b9e67ca716de5f7526736bfa6ceead690adf616d925bdc622b13", + "sha256:5b94b49521f6456670fdb30cd82a4eca9412788a93fa6dd6df72c94d5a8ff2d7" ], "index": "pypi", - "version": "==6.7" - }, - "click-default-group": { - "hashes": [ - "sha256:ba8c43d9c384e1ea7127484c5fc8f4e1ca759519a64fff10718d53f4b82c412a" - ], - "version": "==1.2" - }, - "cliff": { - "hashes": [ - "sha256:3ab93f8dbc0e0042fe8d8e0c9db3ee2c54bfc911c593e32ccbb0c26cf03ccf40", - "sha256:fe044273539250a99a5b9915843902e40e4e9b32ac5698c1fae89e31200d649f" - ], - "version": "==2.15.0" - }, - "cmd2": { - "hashes": [ - "sha256:4b78379d53aff811d1deac720bbe71661769822a5fb2d830cd730656d180fb3d", - "sha256:afebd649dda771b1de893e8df0a5f6085da5f0dcf7f63e18b247b3284f9365ce" - ], - "markers": "python_version >= '3.0'", - "version": "==0.9.16" - }, - "colorama": { - "hashes": [ - "sha256:05eed71e2e327246ad6b38c540c4a3117230b19679b875190486ddd2d721422d", - "sha256:f8ac84de7840f5b9c4e3347b3c1eaa50f7e49c2b07596221daec5edaabbd7c48" - ], - "version": "==0.4.1" + "version": "==7.0" }, "cryptography": { "hashes": [ @@ -192,86 +118,16 @@ "version": "==1.21.0" }, "deckhand": { - "editable": true, "git": "https://opendev.org/airship/deckhand.git", "ref": "a4850f8c4fc02dd1971282c6d9e4beb9cd5be320" }, - "decorator": { + "docker": { "hashes": [ - "sha256:86156361c50488b84a3f148056ea716ca587df2f0de1d34750d35c21312725de", - "sha256:f069f3a01830ca754ba5258fde2278454a0b5b79e0d7f5c13b3b97e57d4acff6" + "sha256:acf51b5e3e0d056925c3b780067a6f753c915fffaa46c5f2d79eb0fc1cbe6a01", + "sha256:cc5b2e94af6a2b1e1ed9d7dcbdc77eff56c36081757baf9ada6e878ea0213164" ], - "version": "==4.4.0" - }, - "deepdiff": { - "hashes": [ - "sha256:152b29dd9cd97cc78403121fb394925ec47377d4a410751e56547c3930ba2b39", - "sha256:b4150052e610b231885c4c0be3eea86e4c029df91550ec51b9fc14dd209a5055", - "sha256:ecad8e16a96ffd27e8f40c9801a6ab16ec6a7e7e6e6859a7710ba4695f22702c" - ], - "version": "==3.3.0" - }, - "dnspython": { - "hashes": [ - "sha256:36c5e8e38d4369a08b6780b7f27d790a292b2b08eea01607865bf0936c558e01", - "sha256:f69c21288a962f4da86e56c4905b49d11aba7938d3d740e80d9e366ee4f1632d" - ], - "version": "==1.16.0" - }, - "dogpile.cache": { - "hashes": [ - "sha256:691b7f199561c4bd6e7e96f164a43cc3781b0c87bea29b7d59d859f873fd4a31" - ], - "version": "==0.7.1" - }, - "eventlet": { - "hashes": [ - "sha256:62b9d7581229c5195c3411dd30d15dea351daa5ee37e45a1329ee56fac0e4ef4", - "sha256:f0610bd0d3bb3d51d69f74caa4ad04fc7bce424cdb72e54d08ccda90d8c69800" - ], - "version": "==0.25.0" - }, - "extras": { - "hashes": [ - "sha256:132e36de10b9c91d5d4cc620160a476e0468a88f16c9431817a6729611a81b4e", - "sha256:f689f08df47e2decf76aa6208c081306e7bd472630eb1ec8a875c67de2366e87" - ], - "version": "==1.0.0" - }, - "falcon": { - "hashes": [ - "sha256:0a66b33458fab9c1e400a9be1a68056abda178eb02a8cb4b8f795e9df20b053b", - "sha256:3981f609c0358a9fcdb25b0e7fab3d9e23019356fb429c635ce4133135ae1bc4" - ], - "version": "==1.4.1" - }, - "fasteners": { - "hashes": [ - "sha256:007e4d2b2d4a10093f67e932e5166722d2eab83b77724156e92ad013c6226574", - "sha256:3a176da6b70df9bb88498e1a18a9e4a8579ed5b9141207762368a1017bf8f5ef" - ], - "version": "==0.15" - }, - "fixtures": { - "hashes": [ - "sha256:2a551b0421101de112d9497fb5f6fd25e5019391c0fbec9bad591ecae981420d", - "sha256:fcf0d60234f1544da717a9738325812de1f42c2fa085e2d9252d8fff5712b2ef" - ], - "version": "==3.0.0" - }, - "flake8": { - "hashes": [ - "sha256:231cd86194aaec4bdfaa553ae1a1cd9b7b4558332fbc10136c044940d587a778", - "sha256:7ac3bbaac27174d95bc4734ed23a07de567ffbcf4fc7e316854b4f3015d4fd15" - ], - "version": "==2.6.2" - }, - "futurist": { - "hashes": [ - "sha256:499ee57728a987028725f836ac22aa18899702162fa0a0f1bbe2ecd5c8daf1eb", - "sha256:c203fb7f524774295d8a8e6cd22054260cc130dc425b1002259aa4cb09f7698a" - ], - "version": "==1.8.1" + "index": "pypi", + "version": "==4.0.2" }, "gitdb2": { "hashes": [ @@ -282,49 +138,18 @@ }, "gitpython": { "hashes": [ - "sha256:c15c55ff890cd3a6a8330059e80885410a328f645551b55a91d858bfb3eb2573", - "sha256:df752b6b6f06f11213e91c4925aea7eaf9e37e88fb71c8a7a1aa0a5c10852120" + "sha256:17815b908454e49604e86ffb0e4d981c463d009b54ab30ead7f6ad8ad3a8cffb", + "sha256:392f31eaadc19db35a54e3ab7285577fb4a86d96ecee08cf22a573f06633baab" ], "index": "pypi", - "version": "==2.1.13" - }, - "greenlet": { - "hashes": [ - "sha256:000546ad01e6389e98626c1367be58efa613fa82a1be98b0c6fc24b563acc6d0", - "sha256:0d48200bc50cbf498716712129eef819b1729339e34c3ae71656964dac907c28", - "sha256:23d12eacffa9d0f290c0fe0c4e81ba6d5f3a5b7ac3c30a5eaf0126bf4deda5c8", - "sha256:37c9ba82bd82eb6a23c2e5acc03055c0e45697253b2393c9a50cef76a3985304", - "sha256:51503524dd6f152ab4ad1fbd168fc6c30b5795e8c70be4410a64940b3abb55c0", - "sha256:8041e2de00e745c0e05a502d6e6db310db7faa7c979b3a5877123548a4c0b214", - "sha256:81fcd96a275209ef117e9ec91f75c731fa18dcfd9ffaa1c0adbdaa3616a86043", - "sha256:853da4f9563d982e4121fed8c92eea1a4594a2299037b3034c3c898cb8e933d6", - "sha256:8b4572c334593d449113f9dc8d19b93b7b271bdbe90ba7509eb178923327b625", - "sha256:9416443e219356e3c31f1f918a91badf2e37acf297e2fa13d24d1cc2380f8fbc", - "sha256:9854f612e1b59ec66804931df5add3b2d5ef0067748ea29dc60f0efdcda9a638", - "sha256:99a26afdb82ea83a265137a398f570402aa1f2b5dfb4ac3300c026931817b163", - "sha256:a19bf883b3384957e4a4a13e6bd1ae3d85ae87f4beb5957e35b0be287f12f4e4", - "sha256:a9f145660588187ff835c55a7d2ddf6abfc570c2651c276d3d4be8a2766db490", - "sha256:ac57fcdcfb0b73bb3203b58a14501abb7e5ff9ea5e2edfa06bb03035f0cff248", - "sha256:bcb530089ff24f6458a81ac3fa699e8c00194208a724b644ecc68422e1111939", - "sha256:beeabe25c3b704f7d56b573f7d2ff88fc99f0138e43480cecdfcaa3b87fe4f87", - "sha256:d634a7ea1fc3380ff96f9e44d8d22f38418c1c381d5fac680b272d7d90883720", - "sha256:d97b0661e1aead761f0ded3b769044bb00ed5d33e1ec865e891a8b128bf7c656" - ], - "version": "==0.4.15" - }, - "hacking": { - "hashes": [ - "sha256:23a306f3a1070a4469a603886ba709780f02ae7e0f1fc7061e5c6fb203828fee", - "sha256:d9ccda97228a46cbe562843469f3a82eb072f9ac1acefb4368c49a239bb19936" - ], - "version": "==1.1.0" + "version": "==2.1.14" }, "idna": { "hashes": [ - "sha256:156a6814fb5ac1fc6850fb002e0852d56c0c8d2531923a51032d1b70760e186e", - "sha256:684a38a6f903c1d71d6d5fac066b58d7768af4de2b832e426ec79c30daa94a16" + "sha256:c357b3f628cf53ae2c4c05627ecc484553142ca23264e593d327bcde5e9c3407", + "sha256:ea8b7f6188e6fa117537c3df7da9fc686d485087abf6ac197f9c46432f7e4a3c" ], - "version": "==2.7" + "version": "==2.8" }, "iso8601": { "hashes": [ @@ -334,27 +159,6 @@ ], "version": "==0.1.12" }, - "jinja2": { - "hashes": [ - "sha256:065c4f02ebe7f7cf559e49ee5a95fb800a9e4528727aec6f24402a5374c65013", - "sha256:14dd6caf1527abb21f08f86c784eac40853ba93edb79552aa1e4b8aef1b61c7b" - ], - "version": "==2.10.1" - }, - "jsonpath-ng": { - "hashes": [ - "sha256:0aeb1e9f5232bb9e1b34f02b90ac51a80100b66ffc742e0b11df93ccbde82765", - "sha256:b1fc75b877e9b2f46845a455fbdcfb0f0d9c727c45c19a745d02db620a9ef0be" - ], - "version": "==1.4.3" - }, - "jsonpickle": { - "hashes": [ - "sha256:d0c5a4e6cb4e58f6d5406bdded44365c2bcf9c836c4f52910cc9ba7245a59dc2", - "sha256:d3e922d781b1d0096df2dad89a2e1f47177d7969b596aea806a9d91b4626b29b" - ], - "version": "==1.2" - }, "jsonschema": { "hashes": [ "sha256:000e68abd33c972a5248544925a0cae7d1125f9bf6c58280d37546b946769a08", @@ -363,109 +167,6 @@ "index": "pypi", "version": "==2.6.0" }, - "keystoneauth1": { - "hashes": [ - "sha256:7c9bc04706b0fb6def7061f8b78e40eb4f6cfa6a83849ec261dea639ab6dd546", - "sha256:c1adb59c82c989b7c6293231da0fd46d30adfe2b7d9e35f327e3bfe7a0f99656" - ], - "version": "==3.11.1" - }, - "keystonemiddleware": { - "hashes": [ - "sha256:a7f706469e97821c7e8500fe73ee01f977968bfaa31ff2b65f7ec6b46ff5a19f", - "sha256:d3b81d0335730dd11999fd47e332db0933769d8a53becd82945ca37ff4f3236e" - ], - "version": "==5.3.0" - }, - "kombu": { - "hashes": [ - "sha256:55b71d3785def3470a16217fe0780f9e6f95e61bf9ad39ef8dce0177224eab77", - "sha256:eb365ea795cd7e629ba2f1f398e0c3ba354b91ef4de225ffdf6ab45fdfc7d581" - ], - "version": "==4.6.3" - }, - "linecache2": { - "hashes": [ - "sha256:4b26ff4e7110db76eeb6f5a7b64a82623839d595c2038eeda662f2a2db78e97c", - "sha256:e78be9c0a0dfcbac712fe04fbf92b96cddae80b1b842f24248214c8496f006ef" - ], - "version": "==1.0.0" - }, - "mako": { - "hashes": [ - "sha256:a36919599a9b7dc5d86a7a8988f23a9a3a3d083070023bab23d64f7f1d1e0a4b" - ], - "version": "==1.1.0" - }, - "markupsafe": { - "hashes": [ - "sha256:00bc623926325b26bb9605ae9eae8a215691f33cae5df11ca5424f06f2d1f473", - "sha256:09027a7803a62ca78792ad89403b1b7a73a01c8cb65909cd876f7fcebd79b161", - "sha256:09c4b7f37d6c648cb13f9230d847adf22f8171b1ccc4d5682398e77f40309235", - "sha256:1027c282dad077d0bae18be6794e6b6b8c91d58ed8a8d89a89d59693b9131db5", - "sha256:24982cc2533820871eba85ba648cd53d8623687ff11cbb805be4ff7b4c971aff", - "sha256:29872e92839765e546828bb7754a68c418d927cd064fd4708fab9fe9c8bb116b", - "sha256:43a55c2930bbc139570ac2452adf3d70cdbb3cfe5912c71cdce1c2c6bbd9c5d1", - "sha256:46c99d2de99945ec5cb54f23c8cd5689f6d7177305ebff350a58ce5f8de1669e", - "sha256:500d4957e52ddc3351cabf489e79c91c17f6e0899158447047588650b5e69183", - "sha256:535f6fc4d397c1563d08b88e485c3496cf5784e927af890fb3c3aac7f933ec66", - "sha256:62fe6c95e3ec8a7fad637b7f3d372c15ec1caa01ab47926cfdf7a75b40e0eac1", - "sha256:6dd73240d2af64df90aa7c4e7481e23825ea70af4b4922f8ede5b9e35f78a3b1", - "sha256:717ba8fe3ae9cc0006d7c451f0bb265ee07739daf76355d06366154ee68d221e", - "sha256:79855e1c5b8da654cf486b830bd42c06e8780cea587384cf6545b7d9ac013a0b", - "sha256:7c1699dfe0cf8ff607dbdcc1e9b9af1755371f92a68f706051cc8c37d447c905", - "sha256:88e5fcfb52ee7b911e8bb6d6aa2fd21fbecc674eadd44118a9cc3863f938e735", - "sha256:8defac2f2ccd6805ebf65f5eeb132adcf2ab57aa11fdf4c0dd5169a004710e7d", - "sha256:98c7086708b163d425c67c7a91bad6e466bb99d797aa64f965e9d25c12111a5e", - "sha256:9add70b36c5666a2ed02b43b335fe19002ee5235efd4b8a89bfcf9005bebac0d", - "sha256:9bf40443012702a1d2070043cb6291650a0841ece432556f784f004937f0f32c", - "sha256:ade5e387d2ad0d7ebf59146cc00c8044acbd863725f887353a10df825fc8ae21", - "sha256:b00c1de48212e4cc9603895652c5c410df699856a2853135b3967591e4beebc2", - "sha256:b1282f8c00509d99fef04d8ba936b156d419be841854fe901d8ae224c59f0be5", - "sha256:b2051432115498d3562c084a49bba65d97cf251f5a331c64a12ee7e04dacc51b", - "sha256:ba59edeaa2fc6114428f1637ffff42da1e311e29382d81b339c1817d37ec93c6", - "sha256:c8716a48d94b06bb3b2524c2b77e055fb313aeb4ea620c8dd03a105574ba704f", - "sha256:cd5df75523866410809ca100dc9681e301e3c27567cf498077e8551b6d20e42f", - "sha256:e249096428b3ae81b08327a63a485ad0878de3fb939049038579ac0ef61e17e7" - ], - "version": "==1.1.1" - }, - "mccabe": { - "hashes": [ - "sha256:16293af41e7242031afd73896fef6458f4cad38201d21e28f344fff50ae1c25e", - "sha256:f9b58bf366c1506dcd6117b33e5c4874746f0de859c9c7cab8b516cb6be1d22e" - ], - "version": "==0.5.3" - }, - "monotonic": { - "hashes": [ - "sha256:23953d55076df038541e648a53676fb24980f7a1be290cdda21300b3bc21dfb0", - "sha256:552a91f381532e33cbd07c6a2655a21908088962bb8fa7239ecbcc6ad1140cc7" - ], - "version": "==1.5" - }, - "msgpack": { - "hashes": [ - "sha256:26cb40116111c232bc235ce131cc3b4e76549088cb154e66a2eb8ff6fcc907ec", - "sha256:300fd3f2c664a3bf473d6a952f843b4a71454f4c592ed7e74a36b205c1782d28", - "sha256:3129c355342853007de4a2a86e75eab966119733eb15748819b6554363d4e85c", - "sha256:31f6d645ee5a97d59d3263fab9e6be76f69fa131cddc0d94091a3c8aca30d67a", - "sha256:3ce7ef7ee2546c3903ca8c934d09250531b80c6127e6478781ae31ed835aac4c", - "sha256:4008c72f5ef2b7936447dcb83db41d97e9791c83221be13d5e19db0796df1972", - "sha256:62bd8e43d204580308d477a157b78d3fee2fb4c15d32578108dc5d89866036c8", - "sha256:70cebfe08fb32f83051971264466eadf183101e335d8107b80002e632f425511", - "sha256:72cb7cf85e9df5251abd7b61a1af1fb77add15f40fa7328e924a9c0b6bc7a533", - "sha256:7c55649965c35eb32c499d17dadfb8f53358b961582846e1bc06f66b9bccc556", - "sha256:86b963a5de11336ec26bc4f839327673c9796b398b9f1fe6bb6150c2a5d00f0f", - "sha256:8c73c9bcdfb526247c5e4f4f6cf581b9bb86b388df82cfcaffde0a6e7bf3b43a", - "sha256:8e68c76c6aff4849089962d25346d6784d38e02baa23ffa513cf46be72e3a540", - "sha256:97ac6b867a8f63debc64f44efdc695109d541ecc361ee2dce2c8884ab37360a1", - "sha256:9d4f546af72aa001241d74a79caec278bcc007b4bcde4099994732e98012c858", - "sha256:a28e69fe5468c9f5251c7e4e7232286d71b7dfadc74f312006ebe984433e9746", - "sha256:fd509d4aa95404ce8d86b4e32ce66d5d706fd6646c205e1c2a715d87078683a2" - ], - "version": "==0.6.1" - }, "netaddr": { "hashes": [ "sha256:38aeec7cdd035081d3a4c306394b19d677623bf76fa0913f6695127c7753aefd", @@ -500,19 +201,6 @@ ], "version": "==0.10.9" }, - "networkx": { - "hashes": [ - "sha256:45e56f7ab6fe81652fb4bc9f44faddb0e9025f469f602df14e3b2551c2ea5c8b" - ], - "version": "==2.2" - }, - "os-service-types": { - "hashes": [ - "sha256:0505c72205690910077fb72b88f2a1f07533c8d39f2fe75b29583481764965d6", - "sha256:31800299a82239363995b91f1ebf9106ac7758542a1e4ef6dc737a5932878c6c" - ], - "version": "==1.7.0" - }, "oslo-utils": { "hashes": [ "sha256:10cc04d6b75e57dd6e6eccd3745bbce6002567a77f8ddc4103bcea53763bca41" @@ -520,41 +208,6 @@ "index": "pypi", "version": "==3.41.0" }, - "oslo.cache": { - "hashes": [ - "sha256:6888a549822cb9ddfa0402cf0a279d71256b31b781524fa732c9b5304f79070a", - "sha256:77dbb733b17af40b79505beaeb6550f2e9c8a8034200d7db3eeafedd5503e827" - ], - "version": "==1.31.1" - }, - "oslo.concurrency": { - "hashes": [ - "sha256:145771c1d9261628ae397e14faea9133ea269dfb2f53c5a5964183335fb4064b", - "sha256:9f0876d99e3d60192ca080923e37e4bda2742a9e648f99e9557ba2a9dd8e5995" - ], - "version": "==3.28.1" - }, - "oslo.config": { - "hashes": [ - "sha256:c3f63f6c06bcb4ab52004721cba4fd36456522c73fd1b3c8cae1e36af5049516", - "sha256:eb0c7b255f17bd27c279c659263b8d02a05ee607b8c4c9cba179df833db46229" - ], - "version": "==6.6.2" - }, - "oslo.context": { - "hashes": [ - "sha256:345cee82594a0237f89511c9db3ae759ef0553c278433c894509b63f7d6c3907", - "sha256:ac0878a47599cd18699e00836567a0626d749252f91cf20037f495e8eda437cc" - ], - "version": "==2.22.1" - }, - "oslo.db": { - "hashes": [ - "sha256:44e815f146ea1b8221e2892feab9dfd9a22ab674be39cedafd59af7518a228e7", - "sha256:97e4a49de771be021739fc406b0dc8e11e2bb61462b602077fdfc3dbcb91ffb2" - ], - "version": "==4.41.1" - }, "oslo.i18n": { "hashes": [ "sha256:2669908357e1e49a754dc0c279512246341ae889176c568b89fd9233e65a6ae1", @@ -562,171 +215,23 @@ ], "version": "==3.23.1" }, - "oslo.log": { - "hashes": [ - "sha256:2209490e6326c23e1310ca26e8956aedbc7b8d5eea537689b8342efd353efdbe", - "sha256:7bc1375596a09746beac1706f361b3ebb6bf05d447537cae63847cb4c2b4b774" - ], - "version": "==3.40.1" - }, - "oslo.messaging": { - "hashes": [ - "sha256:9ae91fe4147b96c84352ab6fc614a7e9556b96922777511214912406b932ad17", - "sha256:b18cbe8bfc6c09201a5e3e61648751c674e54ccd8ba67ccc7155b31df739ddbb" - ], - "version": "==9.1.1" - }, - "oslo.middleware": { - "hashes": [ - "sha256:4508c01dfb63b5e140939bf2e7e3293a5cf51d48cf7b5a85020a29d37d8a216b", - "sha256:a7ffa765e5b6b5ac8f653f6d91cecbd8a02c85c100c876a97b41eab0af9afe31" - ], - "version": "==3.36.0" - }, - "oslo.policy": { - "hashes": [ - "sha256:57f481085c12e97d042847e812c772057bd40040d45b9394043ce7d358efd524", - "sha256:c5ae09294a606ac684a9b8fb40483dd445a19d09701e3fd1b856946d3a1cfc43" - ], - "version": "==1.40.1" - }, - "oslo.serialization": { - "hashes": [ - "sha256:5ead69bbbb30d6c6b228ac14bcd5364c776162151ede04c1662bca7fc0879a3b", - "sha256:fd1febd9abe2042052846a39b7b8ad0f878cc5365d4484d241f0b0711601b8ee" - ], - "version": "==2.28.1" - }, - "oslo.service": { - "hashes": [ - "sha256:aca0d5209c184566115dc1300686e5e622f34e4e6e1c1641515f6b37d8f27f78", - "sha256:f4500c2a14c264e1eb1ae83db3022f80aef91ee49b5729673f099d7a0c94edd8" - ], - "version": "==1.40.0" - }, - "oslo.utils": { - "hashes": [ - "sha256:328cd172546fcc42c02d3617a1ea433b1f5f3d0593e88cafdf1a8420177789ac", - "sha256:b2192558a8a16e0368b65ab62ca1986507f0caab3ff595e1268de8212aafe77d" - ], - "version": "==3.40.2" - }, - "paste": { - "hashes": [ - "sha256:3f6645ae38dbb6f7ada7fa90ac347fe5e8e82fdcacf3c425db8694f1930bc0a4", - "sha256:e42eb7be79c94f0877e66cfa51c5fdc5c486d21228362eda1b6361123ec59dab" - ], - "version": "==3.0.1" - }, - "pastedeploy": { - "hashes": [ - "sha256:39973e73f391335fac8bc8a8a95f7d34a9f42e2775600ce2dc518d93b37ef943", - "sha256:d5858f89a255e6294e63ed46b73613c56e3b9a2d82a42f1df4d06c8421a9e3cb" - ], - "version": "==1.5.2" - }, "pbr": { "hashes": [ - "sha256:8fc938b1123902f5610b06756a31b1e6febf0d105ae393695b0c9d4244ed2910", - "sha256:f20ec0abbf132471b68963bb34d9c78e603a5cf9e24473f14358e66551d47475" + "sha256:56e52299170b9492513c64be44736d27a512fa7e606f21942160b68ce510b4bc", + "sha256:9b321c204a88d8ab5082699469f52cc94c5da45c51f114113d01b3d993c24cdf" ], - "version": "==5.1.0" - }, - "ply": { - "hashes": [ - "sha256:00c7c1aaa88358b9c765b6d3000c6eec0ba42abca5351b095321aef446081da3", - "sha256:096f9b8350b65ebd2fd1346b12452efe5b9607f7482813ffca50c22722a807ce" - ], - "version": "==3.11" - }, - "prettytable": { - "hashes": [ - "sha256:2d5460dc9db74a32bcc8f9f67de68b2c4f4d2f01fa3bd518764c69156d9cacd9", - "sha256:853c116513625c738dc3ce1aee148b5b5757a86727e67eff6502c7ca59d43c36", - "sha256:a53da3b43d7a5c229b5e3ca2892ef982c46b7923b51e98f0db49956531211c4f" - ], - "version": "==0.7.2" + "version": "==5.4.2" }, "promenade": { - "editable": true, "git": "https://opendev.org/airship/promenade.git", "ref": "89f9842b2ec428709a05fd0a8d4cd1796043375d" }, - "psycopg2": { - "hashes": [ - "sha256:0b9e48a1c1505699a64ac58815ca99104aacace8321e455072cee4f7fe7b2698", - "sha256:0f4c784e1b5a320efb434c66a50b8dd7e30a7dc047e8f45c0a8d2694bfe72781", - "sha256:0fdbaa32c9eb09ef09d425dc154628fca6fa69d2f7c1a33f889abb7e0efb3909", - "sha256:11fbf688d5c953c0a5ba625cc42dea9aeb2321942c7c5ed9341a68f865dc8cb1", - "sha256:19eaac4eb25ab078bd0f28304a0cb08702d120caadfe76bb1e6846ed1f68635e", - "sha256:3232ec1a3bf4dba97fbf9b03ce12e4b6c1d01ea3c85773903a67ced725728232", - "sha256:36f8f9c216fcca048006f6dd60e4d3e6f406afde26cfb99e063f137070139eaf", - "sha256:59c1a0e4f9abe970062ed35d0720935197800a7ef7a62b3a9e3a70588d9ca40b", - "sha256:6506c5ff88750948c28d41852c09c5d2a49f51f28c6d90cbf1b6808e18c64e88", - "sha256:6bc3e68ee16f571681b8c0b6d5c0a77bef3c589012352b3f0cf5520e674e9d01", - "sha256:6dbbd7aabbc861eec6b910522534894d9dbb507d5819bc982032c3ea2e974f51", - "sha256:6e737915de826650d1a5f7ff4ac6cf888a26f021a647390ca7bafdba0e85462b", - "sha256:6ed9b2cfe85abc720e8943c1808eeffd41daa73e18b7c1e1a228b0b91f768ccc", - "sha256:711ec617ba453fdfc66616db2520db3a6d9a891e3bf62ef9aba4c95bb4e61230", - "sha256:844dacdf7530c5c612718cf12bc001f59b2d9329d35b495f1ff25045161aa6af", - "sha256:86b52e146da13c896e50c5a3341a9448151f1092b1a4153e425d1e8b62fec508", - "sha256:985c06c2a0f227131733ae58d6a541a5bc8b665e7305494782bebdb74202b793", - "sha256:a86dfe45f4f9c55b1a2312ff20a59b30da8d39c0e8821d00018372a2a177098f", - "sha256:aa3cd07f7f7e3183b63d48300666f920828a9dbd7d7ec53d450df2c4953687a9", - "sha256:b1964ed645ef8317806d615d9ff006c0dadc09dfc54b99ae67f9ba7a1ec9d5d2", - "sha256:b2abbff9e4141484bb89b96eb8eae186d77bc6d5ffbec6b01783ee5c3c467351", - "sha256:cc33c3a90492e21713260095f02b12bee02b8d1f2c03a221d763ce04fa90e2e9", - "sha256:d7de3bf0986d777807611c36e809b77a13bf1888f5c8db0ebf24b47a52d10726", - "sha256:db5e3c52576cc5b93a959a03ccc3b02cb8f0af1fbbdc80645f7a215f0b864f3a", - "sha256:e168aa795ffbb11379c942cf95bf813c7db9aa55538eb61de8c6815e092416f5", - "sha256:e9ca911f8e2d3117e5241d5fa9aaa991cb22fb0792627eeada47425d706b5ec8", - "sha256:eccf962d41ca46e6326b97c8fe0a6687b58dfc1a5f6540ed071ff1474cea749e", - "sha256:efa19deae6b9e504a74347fe5e25c2cb9343766c489c2ae921b05f37338b18d1", - "sha256:f4b0460a21f784abe17b496f66e74157a6c36116fa86da8bf6aa028b9e8ad5fe", - "sha256:f93d508ca64d924d478fb11e272e09524698f0c581d9032e68958cfbdd41faef" - ], - "version": "==2.7.5" - }, - "ptable": { - "hashes": [ - "sha256:aa7fc151cb40f2dabcd2275ba6f7fd0ff8577a86be3365cd3fb297cbe09cc292" - ], - "version": "==0.9.2" - }, - "pycadf": { - "hashes": [ - "sha256:df6b5a4d5f876140f211e691287cb0d91036c0822e5013d03de6926f18ac5368", - "sha256:e47e27e102010d910c949a5cbb42114b6311d07d88a2a9959830b49f8a7b3465" - ], - "version": "==2.9.0" - }, - "pycodestyle": { - "hashes": [ - "sha256:2ce83f2046f5ab85c652ceceddfbde7a64a909900989b4b43e92b10b743d0ce5", - "sha256:37f0420b14630b0eaaf452978f3a6ea4816d787c3e6dcbba6fb255030adae2e7" - ], - "version": "==2.0.0" - }, "pycparser": { "hashes": [ "sha256:a988718abfad80b6b157acce7bf130a30876d27603738ac39f140993246b25b3" ], "version": "==2.19" }, - "pyflakes": { - "hashes": [ - "sha256:2e4a1b636d8809d8f0a69f341acf15b2e401a3221ede11be439911d23ce2139e", - "sha256:e87bac26c62ea5b45067cc89e4a12f56e1483f1f2cda17e7c9b375b9fd2f40da" - ], - "version": "==1.2.3" - }, - "pyinotify": { - "hashes": [ - "sha256:9c998a5d7606ca835065cdabc013ae6c66eb9ea76a00a1e3bc6e0cfe2b4f71f4" - ], - "markers": "sys_platform != 'win32' and sys_platform != 'darwin' and sys_platform != 'sunos5'", - "version": "==0.9.6" - }, "pyparsing": { "hashes": [ "sha256:6f98a7b9397e206d78cc01df10131398f1c8b8510a2f4d97d9abd82e1aacdd80", @@ -734,19 +239,6 @@ ], "version": "==2.4.2" }, - "pyperclip": { - "hashes": [ - "sha256:979325468ccf682104d5dcaf753f869868100631301d3e72f47babdea5700d1c" - ], - "version": "==1.7.0" - }, - "python-barbicanclient": { - "hashes": [ - "sha256:85e7ce9f29145e77fedbe241f98b8aeea283b8c4095974e2623c69f499f0105f", - "sha256:e2d77a56ad20f3c7dd32f2a581d60f55fad817dbb4b8ecdbd9fd1009d5dab68b" - ], - "version": "==4.7.0" - }, "python-dateutil": { "hashes": [ "sha256:063df5763652e21de43de7d9e00ccf239f953a832941e37be541614732cdfc93", @@ -755,35 +247,6 @@ "index": "pypi", "version": "==2.7.5" }, - "python-editor": { - "hashes": [ - "sha256:1bf6e860a8ad52a14c3ee1252d5dc25b2030618ed80c022598f00176adc8367d", - "sha256:51fda6bcc5ddbbb7063b2af7509e43bd84bfc32a4ff71349ec7847713882327b", - "sha256:5f98b069316ea1c2ed3f67e7f5df6c0d8f10b689964a4a811ff64f0106819ec8" - ], - "version": "==1.0.4" - }, - "python-keystoneclient": { - "hashes": [ - "sha256:2825f3bf20f8b4f6b43bdf393462de3d4b116135b02bb4059960c7e9caf638d3", - "sha256:666ccbe40961f197812b63e008180daba079cba884b6852597c9a337a6b972e9" - ], - "version": "==3.18.0" - }, - "python-memcached": { - "hashes": [ - "sha256:4dac64916871bd3550263323fc2ce18e1e439080a2d5670c594cf3118d99b594", - "sha256:a2e28637be13ee0bf1a8b6843e7490f9456fd3f2a4cb60471733c7b5d5557e4f" - ], - "version": "==1.59" - }, - "python-mimeparse": { - "hashes": [ - "sha256:76e4b03d700a641fd7761d3cd4fdbbdcd787eade1ebfac43f877016328334f78", - "sha256:a295f03ff20341491bfe4717a39cd0a8cc9afad619ba44b77e86b0ab8a2b8282" - ], - "version": "==1.6.0" - }, "pytz": { "hashes": [ "sha256:26c0b32e437e54a18161324a2fca3c4b9846b74a8dccddd843113109e1116b32", @@ -793,61 +256,41 @@ }, "pyyaml": { "hashes": [ - "sha256:1adecc22f88d38052fb787d959f003811ca858b799590a5eaa70e63dca50308c", - "sha256:436bc774ecf7c103814098159fbb84c2715d25980175292c648f2da143909f95", - "sha256:460a5a4248763f6f37ea225d19d5c205677d8d525f6a83357ca622ed541830c2", - "sha256:5a22a9c84653debfbf198d02fe592c176ea548cccce47553f35f466e15cf2fd4", - "sha256:7a5d3f26b89d688db27822343dfa25c599627bc92093e788956372285c6298ad", - "sha256:9372b04a02080752d9e6f990179a4ab840227c6e2ce15b95e1278456664cf2ba", - "sha256:a5dcbebee834eaddf3fa7366316b880ff4062e4bcc9787b78c7fbb4a26ff2dd1", - "sha256:aee5bab92a176e7cd034e57f46e9df9a9862a71f8f37cad167c6fc74c65f5b4e", - "sha256:c51f642898c0bacd335fc119da60baae0824f2cde95b0330b56c0553439f0673", - "sha256:c68ea4d3ba1705da1e0d85da6684ac657912679a649e8868bd850d2c299cce13", - "sha256:e23d0cc5299223dcc37885dae624f382297717e459ea24053709675a976a3e19" + "sha256:0113bc0ec2ad727182326b61326afa3d1d8280ae1122493553fd6f4397f33df9", + "sha256:01adf0b6c6f61bd11af6e10ca52b7d4057dd0be0343eb9283c878cf3af56aee4", + "sha256:5124373960b0b3f4aa7df1707e63e9f109b5263eca5976c66e08b1c552d4eaf8", + "sha256:5ca4f10adbddae56d824b2c09668e91219bb178a1eee1faa56af6f99f11bf696", + "sha256:7907be34ffa3c5a32b60b95f4d95ea25361c951383a894fec31be7252b2b6f34", + "sha256:7ec9b2a4ed5cad025c2278a1e6a19c011c80a3caaac804fd2d329e9cc2c287c9", + "sha256:87ae4c829bb25b9fe99cf71fbb2140c448f534e24c998cc60f39ae4f94396a73", + "sha256:9de9919becc9cc2ff03637872a440195ac4241c80536632fffeb6a1e25a74299", + "sha256:a5a85b10e450c66b49f98846937e8cfca1db3127a9d5d1e31ca45c3d0bef4c5b", + "sha256:b0997827b4f6a7c286c01c5f60384d218dca4ed7d9efa945c3e1aa623d5709ae", + "sha256:b631ef96d3222e62861443cc89d6563ba3eeb816eeb96b2629345ab795e53681", + "sha256:bf47c0607522fdbca6c9e817a6e81b08491de50f3766a7a0e6a5be7905961b41", + "sha256:f81025eddd0327c7d4cfe9b62cf33190e1e736cc6e97502b3ec425f574b3e7a8" ], "index": "pypi", - "version": "==5.1" - }, - "repoze.lru": { - "hashes": [ - "sha256:0429a75e19380e4ed50c0694e26ac8819b4ea7851ee1fc7583c8572db80aff77", - "sha256:f77bf0e1096ea445beadd35f3479c5cff2aa1efe604a133e67150bc8630a62ea" - ], - "version": "==0.7" + "version": "==5.1.2" }, "requests": { "hashes": [ - "sha256:99dcfdaaeb17caf6e526f32b6a7b780461512ab3f1d992187801694cba42770c", - "sha256:a84b8c9ab6239b578f22d1c21d51b696dcfe004032bb80ea832398d6909d7279" + "sha256:11e007a8a2aa0323f5a921e9e6a2d7e4e67d9877e85773fba9ba6419025cbeb4", + "sha256:9cf5292fcd0f598c671cfc1e0d7d1a7f13bb8085e9a590f48c010551dc6c4b31" ], - "version": "==2.20.0" - }, - "rfc3986": { - "hashes": [ - "sha256:0344d0bd428126ce554e7ca2b61787b6a28d2bbd19fc70ed2dd85efe31176405", - "sha256:df4eba676077cefb86450c8f60121b9ae04b94f65f85b69f3f731af0516b7b18" - ], - "version": "==1.3.2" - }, - "routes": { - "hashes": [ - "sha256:26ee43340fca5a32769ffe0c58edcb396ccce6bc1dfa689ddf844d50877355fd", - "sha256:d64b8ae22bef127d856afd9266a3e4cfc9e0dda0e120195e38268a95d20de135" - ], - "version": "==2.4.1" + "version": "==2.22.0" }, "shipyard-client": { - "editable": true, "git": "https://opendev.org/airship/shipyard.git", "ref": "1472a22dce698ea77f15b007906b263eef470f52", "subdirectory": "src/bin/shipyard_client" }, "six": { "hashes": [ - "sha256:70e8a77beed4562e7f14fe23a786b54f6296e34344c23bc42f07b15018ff98e9", - "sha256:832dc0e10feb1aa2c68dcc57dbb658f1c7e65b9b61af69048abc87a2db00a0eb" + "sha256:3350809f0555b11f552448330d0b52d5f24c91a322ea4a15ef22629740f3761c", + "sha256:d16a0141ec1a18405cd4ce8b4613101da75da0e9a7aec5bdd4fa804d0e0eba73" ], - "version": "==1.11.0" + "version": "==1.12.0" }, "smmap2": { "hashes": [ @@ -856,133 +299,25 @@ ], "version": "==2.0.5" }, - "sqlalchemy": { - "hashes": [ - "sha256:217e7fc52199a05851eee9b6a0883190743c4fb9c8ac4313ccfceaffd852b0ff" - ], - "version": "==1.3.6" - }, - "sqlalchemy-migrate": { - "hashes": [ - "sha256:8cfada30bbcf79a83b3a2d1bcd637de7e1f43e390d54de33e4f3249fd9aacfae", - "sha256:c0ef4165e47a049b3e7ce77637a40df31db7648c08f5a2f3cd26a53ad0b95ab4" - ], - "version": "==0.12.0" - }, - "sqlparse": { - "hashes": [ - "sha256:40afe6b8d4b1117e7dff5504d7a8ce07d9a1b15aeeade8a2d10f130a834f8177", - "sha256:7c3dca29c022744e95b547e867cee89f4fce4373f3549ccd8797d8eb52cdb873" - ], - "version": "==0.3.0" - }, - "statsd": { - "hashes": [ - "sha256:c610fb80347fca0ef62666d241bce64184bd7cc1efe582f9690e045c25535eaa", - "sha256:e3e6db4c246f7c59003e51c9720a51a7f39a396541cb9b147ff4b14d15b5dd1f" - ], - "version": "==3.3.0" - }, - "stevedore": { - "hashes": [ - "sha256:b92bc7add1a53fb76c634a178978d113330aaf2006f9498d9e2414b31fbfc104", - "sha256:c58b7c231a9c4890cd3c2b5d2b23bd63fa807ff934d68579e3f6c3a1735e8a7c" - ], - "version": "==1.30.0" - }, - "tempita": { - "hashes": [ - "sha256:cacecf0baa674d356641f1d406b8bff1d756d739c46b869a54de515d08e6fc9c" - ], - "version": "==0.5.2" - }, - "testresources": { - "hashes": [ - "sha256:67a361c3a2412231963b91ab04192209aa91a1aa052f0ab87245dbea889d1282", - "sha256:ee9d1982154a1e212d4e4bac6b610800bfb558e4fb853572a827bc14a96e4417" - ], - "version": "==2.0.1" - }, - "testscenarios": { - "hashes": [ - "sha256:480263fa5d6e618125bdf092aab129a3aeed5996b1e668428f12cc56d6d01d28", - "sha256:c257cb6b90ea7e6f8fef3158121d430543412c9a87df30b5dde6ec8b9b57a2b6" - ], - "version": "==0.5.0" - }, - "testtools": { - "hashes": [ - "sha256:5827ec6cf8233e0f29f51025addd713ca010061204fdea77484a2934690a0559", - "sha256:a2be448869171b6e0f26d9544088b8b98439ec180ce272040236d570a40bcbed" - ], - "version": "==2.3.0" - }, - "traceback2": { - "hashes": [ - "sha256:05acc67a09980c2ecfedd3423f7ae0104839eccb55fc645773e1caa0951c3030", - "sha256:8253cebec4b19094d67cc5ed5af99bf1dba1285292226e98a31929f87a5d6b23" - ], - "version": "==1.4.0" - }, - "unittest2": { - "hashes": [ - "sha256:13f77d0875db6d9b435e1d4f41e74ad4cc2eb6e1d5c824996092b3430f088bb8", - "sha256:22882a0e418c284e1f718a822b3b022944d53d2d908e1690b319a9d3eb2c0579" - ], - "version": "==1.1.0" - }, "urllib3": { "hashes": [ - "sha256:2393a695cd12afedd0dcb26fe5d50d0cf248e5a66f75dbd89a3d4eb333a61af4", - "sha256:a637e5fae88995b256e3409dc4d52c2e2e0ba32c42a6365fee8bbd2238de3cfb" + "sha256:b246607a25ac80bedac05c6f282e3cdaf3afb65420fd024ac94435cabe6e18d1", + "sha256:dbe59173209418ae49d485b87d1681aefa36252ee85884c31346debd19463232" ], - "version": "==1.24.3" + "version": "==1.25.3" }, - "uwsgi": { + "websocket-client": { "hashes": [ - "sha256:d2318235c74665a60021a4fc7770e9c2756f9fc07de7b8c22805efe85b5ab277" + "sha256:1151d5fb3a62dc129164292e1227655e4bbc5dd5340a5165dfae61128ec50aa9", + "sha256:1fd5520878b68b84b5748bb30e592b10d0a91529d5383f74f4964e72b297fd3a" ], - "version": "==2.0.17.1" - }, - "vine": { - "hashes": [ - "sha256:133ee6d7a9016f177ddeaf191c1f58421a1dcc6ee9a42c58b34bed40e1d2cd87", - "sha256:ea4947cc56d1fd6f2095c8d543ee25dad966f78692528e68b4fada11ba3f98af" - ], - "version": "==1.3.0" - }, - "wcwidth": { - "hashes": [ - "sha256:3df37372226d6e63e1b1e1eda15c594bca98a22d33a23832a90998faa96bc65e", - "sha256:f4ebe71925af7b40a864553f761ed559b43544f8f71746c2d756c7fe788ade7c" - ], - "version": "==0.1.7" - }, - "webob": { - "hashes": [ - "sha256:05aaab7975e0ee8af2026325d656e5ce14a71f1883c52276181821d6d5bf7086", - "sha256:36db8203c67023d68c1b00208a7bf55e3b10de2aa317555740add29c619de12b" - ], - "version": "==1.8.5" - }, - "werkzeug": { - "hashes": [ - "sha256:c3fd7a7d41976d9f44db327260e263132466836cef6f91512889ed60ad26557c", - "sha256:d5da73735293558eb1651ee2fddc4d0dedcfa06538b8813a2e20011583c9e49b" - ], - "version": "==0.14.1" + "version": "==0.56.0" }, "wrapt": { "hashes": [ "sha256:565a021fd19419476b9362b05eeaa094178de64f8361e44468f9e9d7843901e1" ], "version": "==1.11.2" - }, - "yappi": { - "hashes": [ - "sha256:7f814131515d51db62b1a3468bcb84de30499124752806a5a6e11caf0b4344bf" - ], - "version": "==1.0" } }, "develop": { @@ -1073,14 +408,6 @@ ], "version": "==1.2.1" }, - "docker": { - "hashes": [ - "sha256:acf51b5e3e0d056925c3b780067a6f753c915fffaa46c5f2d79eb0fc1cbe6a01", - "sha256:cc5b2e94af6a2b1e1ed9d7dcbdc77eff56c36081757baf9ada6e878ea0213164" - ], - "index": "pypi", - "version": "==4.0.2" - }, "execnet": { "hashes": [ "sha256:0dd40ad3b960aae93bdad7fe1c3f049bbcc8fba47094655a4301f5b33e906816", @@ -1093,6 +420,7 @@ "sha256:231cd86194aaec4bdfaa553ae1a1cd9b7b4558332fbc10136c044940d587a778", "sha256:7ac3bbaac27174d95bc4734ed23a07de567ffbcf4fc7e316854b4f3015d4fd15" ], + "index": "pypi", "version": "==2.6.2" }, "flake8-import-order": { @@ -1103,12 +431,6 @@ "index": "pypi", "version": "==0.18.1" }, - "gitdb": { - "hashes": [ - "sha256:a3ebbc27be035a2e874ed904df516e35f4a29a778a764385de09de9e0f139658" - ], - "version": "==0.6.4" - }, "gitdb2": { "hashes": [ "sha256:83361131a1836661a155172932a13c08bda2db3674e4caa32368aa6eb02f38c2", @@ -1118,25 +440,26 @@ }, "gitpython": { "hashes": [ - "sha256:c15c55ff890cd3a6a8330059e80885410a328f645551b55a91d858bfb3eb2573", - "sha256:df752b6b6f06f11213e91c4925aea7eaf9e37e88fb71c8a7a1aa0a5c10852120" + "sha256:17815b908454e49604e86ffb0e4d981c463d009b54ab30ead7f6ad8ad3a8cffb", + "sha256:392f31eaadc19db35a54e3ab7285577fb4a86d96ecee08cf22a573f06633baab" ], "index": "pypi", - "version": "==2.1.13" + "version": "==2.1.14" }, "hacking": { "hashes": [ "sha256:23a306f3a1070a4469a603886ba709780f02ae7e0f1fc7061e5c6fb203828fee", "sha256:d9ccda97228a46cbe562843469f3a82eb072f9ac1acefb4368c49a239bb19936" ], + "index": "pypi", "version": "==1.1.0" }, "idna": { "hashes": [ - "sha256:156a6814fb5ac1fc6850fb002e0852d56c0c8d2531923a51032d1b70760e186e", - "sha256:684a38a6f903c1d71d6d5fac066b58d7768af4de2b832e426ec79c30daa94a16" + "sha256:c357b3f628cf53ae2c4c05627ecc484553142ca23264e593d327bcde5e9c3407", + "sha256:ea8b7f6188e6fa117537c3df7da9fc686d485087abf6ac197f9c46432f7e4a3c" ], - "version": "==2.7" + "version": "==2.8" }, "importlib-metadata": { "hashes": [ @@ -1168,10 +491,10 @@ }, "pbr": { "hashes": [ - "sha256:8fc938b1123902f5610b06756a31b1e6febf0d105ae393695b0c9d4244ed2910", - "sha256:f20ec0abbf132471b68963bb34d9c78e603a5cf9e24473f14358e66551d47475" + "sha256:56e52299170b9492513c64be44736d27a512fa7e606f21942160b68ce510b4bc", + "sha256:9b321c204a88d8ab5082699469f52cc94c5da45c51f114113d01b3d993c24cdf" ], - "version": "==5.1.0" + "version": "==5.4.2" }, "pluggy": { "hashes": [ @@ -1241,40 +564,36 @@ }, "pyyaml": { "hashes": [ - "sha256:1adecc22f88d38052fb787d959f003811ca858b799590a5eaa70e63dca50308c", - "sha256:436bc774ecf7c103814098159fbb84c2715d25980175292c648f2da143909f95", - "sha256:460a5a4248763f6f37ea225d19d5c205677d8d525f6a83357ca622ed541830c2", - "sha256:5a22a9c84653debfbf198d02fe592c176ea548cccce47553f35f466e15cf2fd4", - "sha256:7a5d3f26b89d688db27822343dfa25c599627bc92093e788956372285c6298ad", - "sha256:9372b04a02080752d9e6f990179a4ab840227c6e2ce15b95e1278456664cf2ba", - "sha256:a5dcbebee834eaddf3fa7366316b880ff4062e4bcc9787b78c7fbb4a26ff2dd1", - "sha256:aee5bab92a176e7cd034e57f46e9df9a9862a71f8f37cad167c6fc74c65f5b4e", - "sha256:c51f642898c0bacd335fc119da60baae0824f2cde95b0330b56c0553439f0673", - "sha256:c68ea4d3ba1705da1e0d85da6684ac657912679a649e8868bd850d2c299cce13", - "sha256:e23d0cc5299223dcc37885dae624f382297717e459ea24053709675a976a3e19" + "sha256:0113bc0ec2ad727182326b61326afa3d1d8280ae1122493553fd6f4397f33df9", + "sha256:01adf0b6c6f61bd11af6e10ca52b7d4057dd0be0343eb9283c878cf3af56aee4", + "sha256:5124373960b0b3f4aa7df1707e63e9f109b5263eca5976c66e08b1c552d4eaf8", + "sha256:5ca4f10adbddae56d824b2c09668e91219bb178a1eee1faa56af6f99f11bf696", + "sha256:7907be34ffa3c5a32b60b95f4d95ea25361c951383a894fec31be7252b2b6f34", + "sha256:7ec9b2a4ed5cad025c2278a1e6a19c011c80a3caaac804fd2d329e9cc2c287c9", + "sha256:87ae4c829bb25b9fe99cf71fbb2140c448f534e24c998cc60f39ae4f94396a73", + "sha256:9de9919becc9cc2ff03637872a440195ac4241c80536632fffeb6a1e25a74299", + "sha256:a5a85b10e450c66b49f98846937e8cfca1db3127a9d5d1e31ca45c3d0bef4c5b", + "sha256:b0997827b4f6a7c286c01c5f60384d218dca4ed7d9efa945c3e1aa623d5709ae", + "sha256:b631ef96d3222e62861443cc89d6563ba3eeb816eeb96b2629345ab795e53681", + "sha256:bf47c0607522fdbca6c9e817a6e81b08491de50f3766a7a0e6a5be7905961b41", + "sha256:f81025eddd0327c7d4cfe9b62cf33190e1e736cc6e97502b3ec425f574b3e7a8" ], "index": "pypi", - "version": "==5.1" + "version": "==5.1.2" }, "requests": { "hashes": [ - "sha256:99dcfdaaeb17caf6e526f32b6a7b780461512ab3f1d992187801694cba42770c", - "sha256:a84b8c9ab6239b578f22d1c21d51b696dcfe004032bb80ea832398d6909d7279" + "sha256:11e007a8a2aa0323f5a921e9e6a2d7e4e67d9877e85773fba9ba6419025cbeb4", + "sha256:9cf5292fcd0f598c671cfc1e0d7d1a7f13bb8085e9a590f48c010551dc6c4b31" ], - "version": "==2.20.0" + "version": "==2.22.0" }, "six": { "hashes": [ - "sha256:70e8a77beed4562e7f14fe23a786b54f6296e34344c23bc42f07b15018ff98e9", - "sha256:832dc0e10feb1aa2c68dcc57dbb658f1c7e65b9b61af69048abc87a2db00a0eb" + "sha256:3350809f0555b11f552448330d0b52d5f24c91a322ea4a15ef22629740f3761c", + "sha256:d16a0141ec1a18405cd4ce8b4613101da75da0e9a7aec5bdd4fa804d0e0eba73" ], - "version": "==1.11.0" - }, - "smmap": { - "hashes": [ - "sha256:0e2b62b497bd5f0afebc002eda4d90df9d209c30ef257e8673c90a6b5c119d62" - ], - "version": "==0.9.0" + "version": "==1.12.0" }, "smmap2": { "hashes": [ @@ -1285,10 +604,10 @@ }, "stevedore": { "hashes": [ - "sha256:b92bc7add1a53fb76c634a178978d113330aaf2006f9498d9e2414b31fbfc104", - "sha256:c58b7c231a9c4890cd3c2b5d2b23bd63fa807ff934d68579e3f6c3a1735e8a7c" + "sha256:7be098ff53d87f23d798a7ce7ae5c31f094f3deb92ba18059b1aeb1ca9fec0a0", + "sha256:7d1ce610a87d26f53c087da61f06f9b7f7e552efad2a7f6d2322632b5f932ea2" ], - "version": "==1.30.0" + "version": "==1.30.1" }, "testfixtures": { "hashes": [ @@ -1300,10 +619,10 @@ }, "urllib3": { "hashes": [ - "sha256:2393a695cd12afedd0dcb26fe5d50d0cf248e5a66f75dbd89a3d4eb333a61af4", - "sha256:a637e5fae88995b256e3409dc4d52c2e2e0ba32c42a6365fee8bbd2238de3cfb" + "sha256:b246607a25ac80bedac05c6f282e3cdaf3afb65420fd024ac94435cabe6e18d1", + "sha256:dbe59173209418ae49d485b87d1681aefa36252ee85884c31346debd19463232" ], - "version": "==1.24.3" + "version": "==1.25.3" }, "wcwidth": { "hashes": [ @@ -1312,13 +631,6 @@ ], "version": "==0.1.7" }, - "websocket-client": { - "hashes": [ - "sha256:1151d5fb3a62dc129164292e1227655e4bbc5dd5340a5165dfae61128ec50aa9", - "sha256:1fd5520878b68b84b5748bb30e592b10d0a91529d5383f74f4964e72b297fd3a" - ], - "version": "==0.56.0" - }, "yapf": { "hashes": [ "sha256:02ace10a00fa2e36c7ebd1df2ead91dbfbd7989686dc4ccbdc549e95d19f5780", diff --git a/images/pegleg/Dockerfile.opensuse_15 b/images/pegleg/Dockerfile.opensuse_15 index c12cbff1..e432f266 100644 --- a/images/pegleg/Dockerfile.opensuse_15 +++ b/images/pegleg/Dockerfile.opensuse_15 @@ -11,6 +11,9 @@ LABEL org.opencontainers.image.licenses='Apache-2.0' ENV LANG=C.UTF-8 ENV LC_ALL=C.UTF-8 +ARG DECKHAND_VERSION=branch/master +ARG SHIPYARD_VERSION=branch/master +ARG PROMENADE_VERSION=branch/master RUN set -x \ && zypper up -y \ @@ -38,7 +41,10 @@ VOLUME /var/pegleg WORKDIR /var/pegleg COPY requirements.txt /opt/pegleg/requirements.txt -RUN pip3 install --no-cache-dir -r /opt/pegleg/requirements.txt +RUN pip3 install -r https://opendev.org/airship/deckhand/raw/${DECKHAND_VERSION}/requirements.txt \ + && pip3 install -r https://opendev.org/airship/promenade/raw/${PROMENADE_VERSION}/requirements.txt \ + && pip3 install -r https://opendev.org/airship/shipyard/raw/${SHIPYARD_VERSION}/src/bin/shipyard_client/requirements.txt \ + && pip3 install --no-cache-dir -r /opt/pegleg/requirements.txt COPY tools/install-cfssl.sh /opt/pegleg/tools/install-cfssl.sh RUN /opt/pegleg/tools/install-cfssl.sh ${CFSSLURL} diff --git a/images/pegleg/Dockerfile.ubuntu_bionic b/images/pegleg/Dockerfile.ubuntu_bionic index 1da7f626..590e231d 100644 --- a/images/pegleg/Dockerfile.ubuntu_bionic +++ b/images/pegleg/Dockerfile.ubuntu_bionic @@ -11,6 +11,9 @@ LABEL org.opencontainers.image.licenses='Apache-2.0' ENV LANG=C.UTF-8 ENV LC_ALL=C.UTF-8 +ARG DECKHAND_VERSION=branch/master +ARG SHIPYARD_VERSION=branch/master +ARG PROMENADE_VERSION=branch/master RUN set -ex \ && apt-get update -qq \ @@ -41,7 +44,10 @@ VOLUME /var/pegleg WORKDIR /var/pegleg COPY requirements.txt /opt/pegleg/requirements.txt -RUN pip3 install --no-cache-dir -r /opt/pegleg/requirements.txt +RUN pip3 install -r https://opendev.org/airship/deckhand/raw/${DECKHAND_VERSION}/requirements.txt \ + && pip3 install -r https://opendev.org/airship/promenade/raw/${PROMENADE_VERSION}/requirements.txt \ + && pip3 install -r https://opendev.org/airship/shipyard/raw/${SHIPYARD_VERSION}/src/bin/shipyard_client/requirements.txt \ + && pip3 install --no-cache-dir -r /opt/pegleg/requirements.txt COPY tools/install-cfssl.sh /opt/pegleg/tools/install-cfssl.sh RUN /opt/pegleg/tools/install-cfssl.sh ${CFSSLURL} diff --git a/images/pegleg/Dockerfile.ubuntu_xenial b/images/pegleg/Dockerfile.ubuntu_xenial index f90ab13c..fa7b9b0b 100644 --- a/images/pegleg/Dockerfile.ubuntu_xenial +++ b/images/pegleg/Dockerfile.ubuntu_xenial @@ -11,6 +11,9 @@ LABEL org.opencontainers.image.licenses='Apache-2.0' ENV LANG=C.UTF-8 ENV LC_ALL=C.UTF-8 +ARG DECKHAND_VERSION=branch/master +ARG SHIPYARD_VERSION=branch/master +ARG PROMENADE_VERSION=branch/master RUN set -ex \ && apt-get update -qq \ @@ -41,7 +44,10 @@ VOLUME /var/pegleg WORKDIR /var/pegleg COPY requirements.txt /opt/pegleg/requirements.txt -RUN pip3 install --no-cache-dir -r /opt/pegleg/requirements.txt +RUN pip3 install -r https://opendev.org/airship/deckhand/raw/${DECKHAND_VERSION}/requirements.txt \ + && pip3 install -r https://opendev.org/airship/promenade/raw/${PROMENADE_VERSION}/requirements.txt \ + && pip3 install -r https://opendev.org/airship/shipyard/raw/${SHIPYARD_VERSION}/src/bin/shipyard_client/requirements.txt \ + && pip3 install --no-cache-dir -r /opt/pegleg/requirements.txt COPY tools/install-cfssl.sh /opt/pegleg/tools/install-cfssl.sh RUN /opt/pegleg/tools/install-cfssl.sh ${CFSSLURL} diff --git a/requirements.txt b/requirements.txt index 01df81da..6390c626 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,118 +1,34 @@ -i https://pypi.org/simple --e git+https://opendev.org/airship/deckhand.git@a4850f8c4fc02dd1971282c6d9e4beb9cd5be320#egg=deckhand --e git+https://opendev.org/airship/promenade.git@89f9842b2ec428709a05fd0a8d4cd1796043375d#egg=promenade --e git+https://opendev.org/airship/shipyard.git@1472a22dce698ea77f15b007906b263eef470f52#egg=shipyard-client&subdirectory=src/bin/shipyard_client -alembic==1.0.1 -amqp==2.5.0 -argparse==1.4.0 -arrow==0.12.1 asn1crypto==0.24.0 -attrs==19.1.0 babel==2.7.0 -beaker==1.10.0 -cachetools==3.1.1 certifi==2019.6.16 cffi==1.12.3 chardet==3.0.4 -click-default-group==1.2 -click==6.7 -cliff==2.15.0 -cmd2==0.9.16 ; python_version >= '3.0' -colorama==0.4.1 +click==7.0 cryptography==2.3.1 debtcollector==1.21.0 -decorator==4.4.0 -deepdiff==3.3.0 -dnspython==1.16.0 -dogpile.cache==0.7.1 -eventlet==0.25.0 -extras==1.0.0 -falcon==1.4.1 -fasteners==0.15 -fixtures==3.0.0 -flake8==2.6.2 -futurist==1.8.1 +docker==4.0.2 +git+https://opendev.org/airship/deckhand.git@a4850f8c4fc02dd1971282c6d9e4beb9cd5be320#egg=deckhand +git+https://opendev.org/airship/promenade.git@89f9842b2ec428709a05fd0a8d4cd1796043375d#egg=promenade +git+https://opendev.org/airship/shipyard.git@1472a22dce698ea77f15b007906b263eef470f52#egg=shipyard-client&subdirectory=src/bin/shipyard_client gitdb2==2.0.5 -gitpython==2.1.13 -greenlet==0.4.15 -hacking==1.1.0 -idna==2.7 +gitpython==2.1.14 +idna==2.8 iso8601==0.1.12 -jinja2==2.10.1 -jsonpath-ng==1.4.3 -jsonpickle==1.2 jsonschema==2.6.0 -keystoneauth1==3.11.1 -keystonemiddleware==5.3.0 -kombu==4.6.3 -linecache2==1.0.0 -mako==1.1.0 -markupsafe==1.1.1 -mccabe==0.5.3 -monotonic==1.5 -msgpack==0.6.1 netaddr==0.7.19 netifaces==0.10.9 -networkx==2.2 -os-service-types==1.7.0 oslo-utils==3.41.0 -oslo.cache==1.31.1 -oslo.concurrency==3.28.1 -oslo.config==6.6.2 -oslo.context==2.22.1 -oslo.db==4.41.1 oslo.i18n==3.23.1 -oslo.log==3.40.1 -oslo.messaging==9.1.1 -oslo.middleware==3.36.0 -oslo.policy==1.40.1 -oslo.serialization==2.28.1 -oslo.service==1.40.0 -oslo.utils==3.40.2 -paste==3.0.1 -pastedeploy==1.5.2 -pbr==5.1.0 -ply==3.11 -prettytable==0.7.2 -psycopg2==2.7.5 -ptable==0.9.2 -pycadf==2.9.0 -pycodestyle==2.0.0 +pbr==5.4.2 pycparser==2.19 -pyflakes==1.2.3 -pyinotify==0.9.6 ; sys_platform != 'win32' and sys_platform != 'darwin' and sys_platform != 'sunos5' pyparsing==2.4.2 -pyperclip==1.7.0 -python-barbicanclient==4.7.0 python-dateutil==2.7.5 -python-editor==1.0.4 -python-keystoneclient==3.18.0 -python-memcached==1.59 -python-mimeparse==1.6.0 pytz==2019.2 -pyyaml==5.1 -repoze.lru==0.7 -requests==2.20.0 -rfc3986==1.3.2 -routes==2.4.1 -six==1.11.0 +pyyaml==5.1.2 +requests==2.22.0 +six==1.12.0 smmap2==2.0.5 -sqlalchemy-migrate==0.12.0 -sqlalchemy==1.3.6 -sqlparse==0.3.0 -statsd==3.3.0 -stevedore==1.30.0 -tempita==0.5.2 -testresources==2.0.1 -testscenarios==0.5.0 -testtools==2.3.0 -traceback2==1.4.0 -unittest2==1.1.0 -urllib3==1.24.3 -uwsgi==2.0.17.1 -vine==1.3.0 -wcwidth==0.1.7 -webob==1.8.5 -werkzeug==0.14.1 +urllib3==1.25.3 +websocket-client==0.56.0 wrapt==1.11.2 -yappi==1.0 diff --git a/vcs-requirements.env b/vcs-requirements.env new file mode 100644 index 00000000..98b49352 --- /dev/null +++ b/vcs-requirements.env @@ -0,0 +1,3 @@ +DECKHAND_VERSION=commit/a4850f8c4fc02dd1971282c6d9e4beb9cd5be320 +SHIPYARD_VERSION=commit/1472a22dce698ea77f15b007906b263eef470f52 +PROMENADE_VERSION=commit/89f9842b2ec428709a05fd0a8d4cd1796043375d \ No newline at end of file