From 21b4dc541662f08ef8dcc166c51c628aed32e85e Mon Sep 17 00:00:00 2001
From: Hongbin Lu <hongbin034@gmail.com>
Date: Tue, 7 Sep 2021 19:55:47 +0800
Subject: [PATCH] Zun: Temporarily skip capsule test for ubuntu

Related-Bug: #1941982
Change-Id: I0e03db1177931ee6d17b21f614573575c3493eef
---
 tests/run.yml     | 2 ++
 tests/test-zun.sh | 6 ++++++
 2 files changed, 8 insertions(+)

diff --git a/tests/run.yml b/tests/run.yml
index b365b3c41d..80b853ff44 100644
--- a/tests/run.yml
+++ b/tests/run.yml
@@ -391,6 +391,8 @@
             executable: /bin/bash
             chdir: "{{ kolla_ansible_src_dir }}"
           when: scenario == 'zun'
+          environment:
+            BASE_DISTRO: "{{ base_distro }}"
 
         - name: Run test-swift.sh script
           script:
diff --git a/tests/test-zun.sh b/tests/test-zun.sh
index cca4df4e31..334bdd6f9f 100755
--- a/tests/test-zun.sh
+++ b/tests/test-zun.sh
@@ -99,6 +99,12 @@ function test_zun_logged {
     openstack volume delete zun_test_volume
     echo "SUCCESS: Zun Cinder volume attachment"
 
+    # NOTE(hongbin): temporarily skip capsule test due to #1941982
+    # See https://bugs.launchpad.net/zun/+bug/1941982
+    if [[ $BASE_DISTRO =~ ^(debian|ubuntu)$ ]]; then
+        return 0
+    fi
+
     echo "TESTING: Zun capsule"
     cat >/tmp/capsule.yaml <<EOF
 capsuleVersion: beta