tests: Combine integration configs and testcases

Combine the configs and testcases directories, so all files are
together in one place. Update the test config location as well.

1 files changed, 33 insertions, 0 deletions

diff --git a/tests/cloud_tests/testcases/modules/package_update_upgrade_install.yaml b/tests/cloud_tests/testcases/modules/package_update_upgrade_install.yaml
new file mode 100644
index 00000000..71d24b83
--- /dev/null
+++ b/tests/cloud_tests/testcases/modules/package_update_upgrade_install.yaml
@@ -0,0 +1,33 @@
+#
+# Update/upgrade via apt and then install a pair of packages
+#
+# NOTE: this should not require apt feature, use 'which' rather than 'dpkg -l'
+# NOTE: the testcase for this looks for the command in history.log as
+#       /usr/bin/apt-get..., which is not how it always appears. it should
+#       instead look for just apt-get...
+# NOTE: this testcase should not require 'apt_up_out', and should look for a
+#       call to 'apt-get upgrade' or 'apt-get dist-upgrade' in cloud-init.log
+#       rather than 'Calculating upgrade...' in output
+required_features:
+  - apt
+  - apt_hist_fmt
+  - apt_up_out
+cloud_config: |
+  #cloud-config
+  packages:
+    - htop
+    - tree
+  package_update: true
+  package_upgrade: true
+collect_scripts:
+  apt_history_cmdline: |
+    #!/bin/bash
+    grep ^Commandline: /var/log/apt/history.log
+  dpkg_htop: |
+    #!/bin/bash
+    dpkg -l | grep htop | wc -l
+  dpkg_tree: |
+    #!/bin/bash
+    dpkg -l | grep tree | wc -l
+
+# vi: ts=4 expandtab