From 0e124aa45ea066f1ad341842af06e22a078a6741 Mon Sep 17 00:00:00 2001 From: Adam Coldrick Date: Thu, 11 Dec 2014 10:33:59 +0000 Subject: Make the Zuul stratum depend on Ansible We need Ansible for configuration, so we may as well use the definition of Paramiko that is in the Ansible stratum. --- strata/zuul-ci.morph | 20 +------------------- 1 file changed, 1 insertion(+), 19 deletions(-) diff --git a/strata/zuul-ci.morph b/strata/zuul-ci.morph index a2eaacc2..82e6abda 100644 --- a/strata/zuul-ci.morph +++ b/strata/zuul-ci.morph @@ -2,6 +2,7 @@ name: zuul-ci kind: stratum description: Zuul, turbo-hipster and their dependencies. build-depends: +- morph: strata/ansible.morph - morph: strata/morph-utils.morph - morph: strata/openstack-clients.morph - morph: strata/python-tools.morph @@ -16,24 +17,6 @@ chunks: ref: 48f3cf1f3d9d194d3c6dc2afb1c890cf7cf5f075 unpetrify-ref: 1.2.3 build-depends: [] -- name: ecdsa - repo: upstream:python-packages/ecdsa - ref: 36e9cfa80fcf8b53119adc787e54a5892ec1eb2c - unpetrify-ref: python-ecdsa-0.11 - build-depends: [] -- name: pycrypto - morph: strata/zuul-ci/pycrypto.morph - repo: upstream:python-packages/pycrypto - ref: 7fd528d03b5eae58eef6fd219af5d9ac9c83fa50 - unpetrify-ref: v2.6.1 - build-depends: [] -- name: paramiko@zuul - repo: upstream:paramiko - ref: 951faed80b017e553a27c4cb98f210df44341f8f - unpetrify-ref: baserock/morph - build-depends: - - ecdsa - - pycrypto - name: smmap repo: upstream:python-packages/smmap ref: eb40b44ce4a6e646aabf7b7091d876738336c42f @@ -121,7 +104,6 @@ chunks: build-depends: - paste - webob - - paramiko@zuul - gitpython - lockfile - ordereddict -- cgit v1.2.1