From 1847b3ead7cd1ca9c97c4d535e0014147e3b9c10 Mon Sep 17 00:00:00 2001
From: Felix Fontein <felix@fontein.de>
Date: Mon, 27 Jul 2020 16:43:43 +0200
Subject: [PATCH] Tests (#94)

* Fix CI test groups.

* Make files more similar.

* Run most tests in both cloud and OS-specific environments.

* Run ACME tests in both cloud and OS-specific environments.

* Use different Python version for 2.9 cloud test.

* Revert "Run ACME tests in both cloud and OS-specific environments."

This reverts commit 967bda9438972a58f23a8fbae7e56bd6f3f9d112.

* Revert "Run most tests in both cloud and OS-specific environments."

This reverts commit 6e9f090afdf8e177df80713d8673acc451611419.
---
 shippable.yml                                      | 2 +-
 tests/integration/targets/luks_device/aliases      | 2 +-
 tests/integration/targets/openssl_pkcs12/aliases   | 3 +--
 tests/integration/targets/x509_certificate/aliases | 2 +-
 tests/integration/targets/x509_crl/aliases         | 2 +-
 5 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/shippable.yml b/shippable.yml
index 67e36f60..dd0d8f30 100644
--- a/shippable.yml
+++ b/shippable.yml
@@ -57,7 +57,7 @@ matrix:
     - env: T=2.9/units/3.8/1
     - env: T=2.9/rhel/7.8/1
     - env: T=2.9/linux/ubuntu1804/1
-    - env: T=2.9/cloud/3.6/1
+    - env: T=2.9/cloud/3.5/1
 
 branches:
   except:
diff --git a/tests/integration/targets/luks_device/aliases b/tests/integration/targets/luks_device/aliases
index bb57dda8..edcc4120 100644
--- a/tests/integration/targets/luks_device/aliases
+++ b/tests/integration/targets/luks_device/aliases
@@ -1,4 +1,4 @@
-shippable/posix/group4
+shippable/posix/group1
 skip/osx
 skip/freebsd
 skip/docker
diff --git a/tests/integration/targets/openssl_pkcs12/aliases b/tests/integration/targets/openssl_pkcs12/aliases
index 196e7236..6eae8bd8 100644
--- a/tests/integration/targets/openssl_pkcs12/aliases
+++ b/tests/integration/targets/openssl_pkcs12/aliases
@@ -1,3 +1,2 @@
-destructive
-needs/root
 shippable/posix/group1
+destructive
diff --git a/tests/integration/targets/x509_certificate/aliases b/tests/integration/targets/x509_certificate/aliases
index 6e8edef7..6eae8bd8 100644
--- a/tests/integration/targets/x509_certificate/aliases
+++ b/tests/integration/targets/x509_certificate/aliases
@@ -1,2 +1,2 @@
-shippable/posix/group5
+shippable/posix/group1
 destructive
diff --git a/tests/integration/targets/x509_crl/aliases b/tests/integration/targets/x509_crl/aliases
index d1c6e38d..96537bac 100644
--- a/tests/integration/targets/x509_crl/aliases
+++ b/tests/integration/targets/x509_crl/aliases
@@ -1,3 +1,3 @@
-x509_crl_info
 shippable/posix/group1
+x509_crl_info
 destructive