WIP: split integration and cloud_tests requirementsdeps

3 files changed, 33 insertions, 28 deletions

diff --git a/cloud-tests-requirements.txt b/cloud-tests-requirements.txt
new file mode 100644
index 00000000..b4cd18d5
--- /dev/null
+++ b/cloud-tests-requirements.txt
@@ -0,0 +1,28 @@
+# PyPI requirements for cloud-init cloud tests
+# https://cloudinit.readthedocs.io/en/latest/topics/cloud_tests.html
+#
+# Note: Changes to this requirements may require updates to
+# the packages/pkg-deps.json file as well.
+#
+
+# ec2 backend
+boto3==1.14.53
+
+# ssh communication
+paramiko==2.7.2
+cryptography==3.1
+
+# lxd backend
+pylxd==2.2.11
+
+# finds latest image information
+git+https://git.launchpad.net/simplestreams
+
+# azure backend
+azure-storage==0.36.0
+msrestazure==0.6.1
+azure-common==1.1.23
+azure-mgmt-compute==7.0.0
+azure-mgmt-network==5.0.0
+azure-mgmt-resource==4.0.0
+azure-mgmt-storage==6.0.0
diff --git a/integration-requirements.txt b/integration-requirements.txt
index 64455c79..a7fc603d 100644
--- a/integration-requirements.txt
+++ b/integration-requirements.txt
@@ -1,30 +1,5 @@
 # PyPI requirements for cloud-init integration testing
-# https://cloudinit.readthedocs.io/en/latest/topics/tests.html
-#
-# Note: Changes to this requirements may require updates to
-# the packages/pkg-deps.json file as well.
+# https://cloudinit.readthedocs.io/en/latest/topics/integration_tests.html
 #
 pytest
-git+https://github.com/canonical/pycloudlib.git
-
-# ec2 backend
-boto3==1.14.53
-
-# ssh communication
-paramiko==2.7.2
-cryptography==3.1
-
-# lxd backend
-pylxd==2.2.11
-
-# finds latest image information
-git+https://git.launchpad.net/simplestreams
-
-# azure backend
-azure-storage==0.36.0
-msrestazure==0.6.1
-azure-common==1.1.23
-azure-mgmt-compute==7.0.0
-azure-mgmt-network==5.0.0
-azure-mgmt-resource==4.0.0
-azure-mgmt-storage==6.0.0
+pycloudlib @ git+https://github.com/OddBloke/pycloudlib.git@e376a867765b88bf1ee3af323dda49acd2ea46c1
diff --git a/tox.ini b/tox.ini
index 816e6e8e..32174dee 100644
--- a/tox.ini
+++ b/tox.ini
@@ -26,6 +26,7 @@ deps =
     pylint==2.6.0
     # test-requirements because unit tests are now present in cloudinit tree
     -r{toxinidir}/test-requirements.txt
+    -r{toxinidir}/cloud-tests-requirements.txt
     -r{toxinidir}/integration-requirements.txt
 commands = {envpython} -m pylint {posargs:cloudinit tests tools}
 
@@ -128,6 +129,7 @@ deps =
     pylint
     # test-requirements
     -r{toxinidir}/test-requirements.txt
+    -r{toxinidir}/cloud-tests-requirements.txt
     -r{toxinidir}/integration-requirements.txt
 
 [testenv:citest]
@@ -135,7 +137,7 @@ basepython = python3
 commands = {envpython} -m tests.cloud_tests {posargs}
 passenv = HOME TRAVIS
 deps =
-    -r{toxinidir}/integration-requirements.txt
+    -r{toxinidir}/cloud-tests-requirements.txt
 
 [testenv:integration-tests]
 basepython = python3