From eb418c6c621534ae0947ce0a63d538c89de7fe92 Mon Sep 17 00:00:00 2001
From: Felix Fontein <felix@fontein.de>
Date: Fri, 18 Dec 2020 11:48:28 +0100
Subject: [PATCH] Fix AZP CI (#1508)

* Fix 2.9/2.10 cloud

* Fix splunk callback tests.

* ansible_virtualization_type on AZP can be one of container/containerd instead of docker for dockerized tests.

* Disable nomad tests.

* Work around AZP bugs.

(cherry picked from commit dd55c3c3bb159b43faab3330b0ad47a7152ca8e1)
---
 tests/integration/targets/filesystem/tasks/main.yml | 2 +-
 tests/integration/targets/nomad/aliases             | 1 +
 tests/utils/shippable/shippable.sh                  | 3 +++
 3 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/tests/integration/targets/filesystem/tasks/main.yml b/tests/integration/targets/filesystem/tasks/main.yml
index ba79b1e95f..81e5a6b380 100644
--- a/tests/integration/targets/filesystem/tasks/main.yml
+++ b/tests/integration/targets/filesystem/tasks/main.yml
@@ -33,7 +33,7 @@
     - 'not (item.0.key == "btrfs" and (ansible_distribution == "Ubuntu" and ansible_distribution_release == "trusty"))'
     - 'not (item.0.key == "btrfs" and (ansible_facts.os_family == "RedHat" and ansible_facts.distribution_major_version is version("8", ">=")))'
     - 'not (item.0.key == "lvm" and ansible_system == "FreeBSD")' # LVM not available on FreeBSD
-    - 'not (item.0.key == "lvm" and ansible_virtualization_type == "docker")' # Tests use losetup which can not be used inside unprivileged container
+    - 'not (item.0.key == "lvm" and ansible_virtualization_type in ["docker", "container", "containerd"])' # Tests use losetup which can not be used inside unprivileged container
     - 'not (item.0.key == "ocfs2" and ansible_os_family != "Debian")' # ocfs2 only available on Debian based distributions
     - 'not (item.0.key == "f2fs" and ansible_system == "FreeBSD")'
     # f2fs-tools package not available with RHEL/CentOS
diff --git a/tests/integration/targets/nomad/aliases b/tests/integration/targets/nomad/aliases
index 3141aee60b..82c6f51606 100644
--- a/tests/integration/targets/nomad/aliases
+++ b/tests/integration/targets/nomad/aliases
@@ -4,3 +4,4 @@ destructive
 skip/aix
 skip/centos6
 skip/freebsd
+disabled  # FIXME
diff --git a/tests/utils/shippable/shippable.sh b/tests/utils/shippable/shippable.sh
index 2bd05d1695..5547c0c73c 100755
--- a/tests/utils/shippable/shippable.sh
+++ b/tests/utils/shippable/shippable.sh
@@ -14,6 +14,9 @@ function join {
     echo "$*";
 }
 
+# Ensure we can write other collections to this dir
+sudo chown "$(whoami)" "${PWD}/../../"
+
 test="$(join / "${args[@]:1}")"
 
 docker images ansible/ansible