From 654b95e1535881945ac0d978811e1992f8eabd16 Mon Sep 17 00:00:00 2001
From: ashrod98 <ashrod98@gmail.com>
Date: Wed, 14 Feb 2024 21:13:04 +0000
Subject: [PATCH] Fix cephfs-nfs test

Test failing in stable/2023.1 because of missing ceph-mon package.

Change-Id: Ib4bbe4e9ab43513d91ba8fc7ddff70ffb8ae9d8f
---
 .zuul.yaml                               | 36 ++++++++++++++----------
 devstack/files/debs/devstack-plugin-ceph |  1 +
 devstack/files/rpms/devstack-plugin-ceph |  1 +
 3 files changed, 23 insertions(+), 15 deletions(-)

diff --git a/.zuul.yaml b/.zuul.yaml
index 9fe196d..58ef21b 100644
--- a/.zuul.yaml
+++ b/.zuul.yaml
@@ -2,7 +2,6 @@
     name: devstack-plugin-ceph-tempest-py3-base
     abstract: true
     parent: tempest-full-py3
-    nodeset: openstack-single-node-jammy
     description: |
       Base integration tests that runs with the ceph devstack plugin and py3.
       Former names for this job where:
@@ -35,19 +34,30 @@
       tox_envlist: all
       tempest_test_regex: |
               (^tempest\.(api|scenario\.test_encrypted_cinder_volumes|scenario\.test_volume|scenario\.test_shelve_instance)|(^cinder_tempest_plugin))
-      tempest_test_blacklist: '{{ ansible_user_dir }}/{{ zuul.projects["opendev.org/openstack/devstack-plugin-ceph"].src_dir }}/tempest_skiplist.txt'
+      tempest_test_exclude_list: '{{ ansible_user_dir }}/{{ zuul.projects["opendev.org/openstack/devstack-plugin-ceph"].src_dir }}/tempest_skiplist.txt'
+
+- job:
+    name: devstack-plugin-ceph-tempest-ubuntu
+    parent: devstack-plugin-ceph-tempest-py3-base
+    description: |
+      Integration tests that runs with the ceph devstack plugin using ceph
+      packages from the distro.
+
+      This job enable the multiattach feature enable from stein on.
+    vars:
+      devstack_localrc:
+        ENABLE_VOLUME_MULTIATTACH: true
 
 - job:
     name: devstack-plugin-ceph-tempest-py3
     parent: devstack-plugin-ceph-tempest-py3-base
     description: |
-      Integration tests that runs with the ceph devstack plugin and py3.
-
-      This job enable the multiattach feature enable from stein on.
+      Integration tests that runs with the ceph devstack plugin using ceph
+      deployed using cephadm.
     vars:
       devstack_localrc:
         DISABLE_CEPHADM_POST_DEPLOY: True
-        CEPHADM_DEPLOY: True
+        CEPHADM_DEPLOY: true
 
 - job:
     name: devstack-plugin-ceph-compute-local-ephemeral
@@ -75,7 +85,7 @@
     description: |
       Runs manila tempest plugin tests with Native CephFS as a manila back
       end (DHSS=False)
-    parent: manila-tempest-plugin-cephfs-native
+    parent: manila-tempest-plugin-cephfs-native-cephadm
 
 - job:
     name: devstack-plugin-ceph-cephfs-nfs
@@ -83,6 +93,7 @@
       Runs manila tempest plugin tests with CephFS via NFS-Ganesha as a manila
       back end (DHSS=False)
     parent: manila-tempest-plugin-cephfs-nfs
+    # nodeset: openstack-single-node-jammy
 
 - job:
     name: devstack-plugin-ceph-multinode-tempest-py3
@@ -117,7 +128,7 @@
         - cinder-tempest-plugin
       tempest_test_regex: |
         (^tempest\.(api|scenario\.test_encrypted_cinder_volumes|scenario\.test_volume|scenario\.test_shelve_instance)|(^cinder_tempest_plugin))
-      tempest_test_blacklist: '{{ ansible_user_dir }}/{{ zuul.projects["opendev.org/openstack/devstack-plugin-ceph"].src_dir }}/tempest_skiplist_multinode.txt'
+      tempest_test_exclude_list: '{{ ansible_user_dir }}/{{ zuul.projects["opendev.org/openstack/devstack-plugin-ceph"].src_dir }}/tempest_skiplist_multinode.txt'
     group-vars:
       subnode:
         devstack_localrc:
@@ -142,9 +153,8 @@
       Runs devstack-plugin-ceph-tempest jobs.
     check:
       jobs:
-        - devstack-plugin-ceph-tempest-py3:
-            voting: false
-        - devstack-plugin-ceph-tempest-cephadm:
+        - devstack-plugin-ceph-tempest-py3
+        - devstack-plugin-ceph-tempest-ubuntu:
             voting: false
         - devstack-plugin-ceph-multinode-tempest-py3
         - devstack-plugin-ceph-cephfs-native:
@@ -153,10 +163,6 @@
         - devstack-plugin-ceph-cephfs-nfs:
             irrelevant-files: *irrelevant-files
             voting: false
-        # - devstack-plugin-ceph-tempest-fedora-latest
-        # - devstack-plugin-ceph-multinode-tempest-py3
-        # - devstack-plugin-ceph-multinode-tempest-cephadm:
-        #     voting: false
         # - devstack-plugin-ceph-master-tempest:
         #     voting: false
     gate:
diff --git a/devstack/files/debs/devstack-plugin-ceph b/devstack/files/debs/devstack-plugin-ceph
index 73bc9b9..32127ca 100644
--- a/devstack/files/debs/devstack-plugin-ceph
+++ b/devstack/files/debs/devstack-plugin-ceph
@@ -4,3 +4,4 @@ catatonit
 podman
 jq
 ceph-common
+ceph-mon
diff --git a/devstack/files/rpms/devstack-plugin-ceph b/devstack/files/rpms/devstack-plugin-ceph
index 1b806da..3069773 100644
--- a/devstack/files/rpms/devstack-plugin-ceph
+++ b/devstack/files/rpms/devstack-plugin-ceph
@@ -3,3 +3,4 @@ dbus-tools
 podman
 jq
 ceph-common
+ceph-mon