cloud-init-dev team mailing list archive

[Joshua Powers <josh.powers@xxxxxxxxxxxxx>]

Joshua Powers has proposed merging ~powersj/cloud-init:cii-requirements into cloud-init:master.

Commit message:
tests: add integration requirements text file

This adds the specific requirements for integration testing to
a single file that can be referenced in other areas. It also enables
the read-dependencies script to install those packages.


Requested reviews:
  cloud-init commiters (cloud-init-dev)

For more details, see:
https://code.launchpad.net/~powersj/cloud-init/+git/cloud-init/+merge/335774
-- 
Your team cloud-init commiters is requested to review the proposed merge of ~powersj/cloud-init:cii-requirements into cloud-init:master.

diff --git a/integration-requirements.txt b/integration-requirements.txt
new file mode 100644
index 0000000..0509d5f
--- /dev/null
+++ b/integration-requirements.txt
@@ -0,0 +1,15 @@
+# PyPI requirements for cloud-init integration testing
+# https://cloudinit.readthedocs.io/en/latest/topics/tests.html
+#
+
+# ec2 backend
+awscli==1.14.18
+
+# ssh communication
+paramiko==2.4.0
+
+# lxd backend
+pylxd==2.2.4
+
+# finds latest image information
+bzr+lp:simplestreams
diff --git a/packages/pkg-deps.json b/packages/pkg-deps.json
index 72409dd..4a35a0c 100644
--- a/packages/pkg-deps.json
+++ b/packages/pkg-deps.json
@@ -6,6 +6,10 @@
          "dh-systemd"
       ],
       "renames" : {
+         "awscli": {
+             "2": "awscli",
+             "3": "awscli"
+         },
          "pyyaml" : {
             "2" : "python-yaml",
             "3" : "python3-yaml"
@@ -28,6 +32,10 @@
          "python-setuptools"
       ],
       "renames" : {
+         "awscli": {
+            "2": "awscli",
+            "3": "awscli"
+         },
          "jinja2" : {
             "3" : "python34-jinja2"
          },
@@ -64,6 +72,10 @@
    },
    "suse" : {
       "renames" : {
+        "awscli": {
+            "2": "aws-cli",
+            "3": "aws-cli"
+         },
          "pyyaml" : {
             "2" : "python-yaml"
          }
diff --git a/tools/read-dependencies b/tools/read-dependencies
index 421f470..432fa84 100755
--- a/tools/read-dependencies
+++ b/tools/read-dependencies
@@ -196,7 +196,9 @@ def main(distro):
                 "one or the other.\n")
             sys.exit(1)
         args.req_files = [os.path.join(topd, DEFAULT_REQUIREMENTS),
-                          os.path.join(topd, 'test-' + DEFAULT_REQUIREMENTS)]
+                          os.path.join(topd, 'test-' + DEFAULT_REQUIREMENTS),
+                          os.path.join(topd,
+                                       'integration-' + DEFAULT_REQUIREMENTS)]
         args.install = True
     if args.req_files is None:
         args.req_files = [os.path.join(topd, DEFAULT_REQUIREMENTS)]
diff --git a/tox.ini b/tox.ini
index fdc8a66..bb74853 100644
--- a/tox.ini
+++ b/tox.ini
@@ -132,6 +132,4 @@ basepython = python3
 commands = {envpython} -m tests.cloud_tests {posargs}
 passenv = HOME
 deps =
-    pylxd==2.2.4
-    paramiko==2.3.1
-    bzr+lp:simplestreams
+    -r{toxinidir}/integration-requirements.txt