Use Ceph Naitulus for Ubuntu

Mimmic already reached eol when Octopus was released, so we should use
the supported version instead.

Related-Bug: 1902670
Change-Id: If0c763a2d13470e394b127ec8ccf2e65211fc41e

run_tests.sh

@@ -17,7 +17,7 @@ export SCRIPT_DIR=$(cd `dirname $0` && pwd -P)
 source ${SCRIPT_DIR}/functions
 
 export WORKSPACE=${WORKSPACE:-/tmp}
-export CEPH_VERSION=${CEPH_VERSION:-mimic}
+export CEPH_VERSION=${CEPH_VERSION:-nautilus}
 export PUPPET_MAJ_VERSION=${PUPPET_MAJ_VERSION:-5}
 export SCENARIO=${SCENARIO:-scenario001}
 export MANAGE_PUPPET_MODULES=${MANAGE_PUPPET_MODULES:-true}

zuul.d/base.yaml

@@ -75,10 +75,8 @@
       - ^tox.ini$
     roles:
       - zuul: zuul/zuul-jobs
-    # NOTE(tobias-urdin): The ceph variable must be provided with a default here
-    # or zuul will complain when it tries to render the run-integration-tests template.
     vars:
-      ceph: luminous
+      ceph: nautilus
 
 - job:
     name: puppet-openstack-base

zuul.d/integration.yaml

@@ -12,27 +12,25 @@
     abstract: true
     vars:
       scenario: scenario001
-      ceph: luminous
+      ceph: nautilus
 
 - job:
-    name: puppet-openstack-integration-6-scenario001-tempest-ubuntu-bionic-mimic
+    name: puppet-openstack-integration-6-scenario001-tempest-ubuntu-bionic
     parent: puppet-openstack-integration-6-scenario001
     nodeset: ubuntu-bionic
     voting: false
-    vars:
-      ceph: mimic
 
 - job:
     name: puppet-openstack-integration-6-scenario001-tempest-centos-8
     parent: puppet-openstack-integration-6-scenario001
     nodeset: centos-8
-    vars:
-      ceph: nautilus
 
 - job:
     name: puppet-openstack-integration-6-scenario001-tempest-debian-stable-luminous
     parent: puppet-openstack-integration-6-scenario001
     nodeset: debian-stable
+    vars:
+      ceph: luminous
 
 - job:
     name: puppet-openstack-integration-6-scenario002
@@ -46,22 +44,18 @@
     parent: puppet-openstack-integration-6-scenario002
     nodeset: ubuntu-bionic
     voting: false
-    # NOTE(tobias-urdin): Should normally not really pass mimic ceph var here but since
-    # luminous is not packaged for Bionic repos.pp will fail otherwise.
-    vars:
-      ceph: mimic
 
 - job:
     name: puppet-openstack-integration-6-scenario002-tempest-centos-8
     parent: puppet-openstack-integration-6-scenario002
     nodeset: centos-8
-    vars:
-      ceph: nautilus
 
 - job:
     name: puppet-openstack-integration-6-scenario002-tempest-debian-stable
     parent: puppet-openstack-integration-6-scenario002
     nodeset: debian-stable
+    vars:
+      ceph: luminous
 
 - job:
     name: puppet-openstack-integration-6-scenario003
@@ -75,22 +69,18 @@
     parent: puppet-openstack-integration-6-scenario003
     nodeset: ubuntu-bionic
     voting: false
-    # NOTE(tobias-urdin): Should normally not really pass mimic ceph var here but since
-    # luminous is not packaged for Bionic repos.pp will fail otherwise.
-    vars:
-      ceph: mimic
 
 - job:
     name: puppet-openstack-integration-6-scenario003-tempest-centos-8
     parent: puppet-openstack-integration-6-scenario003
     nodeset: centos-8
-    vars:
-      ceph: nautilus
 
 - job:
     name: puppet-openstack-integration-6-scenario003-tempest-debian-stable
     parent: puppet-openstack-integration-6-scenario003
     nodeset: debian-stable
+    vars:
+      ceph: luminous
 
 - job:
     name: puppet-openstack-integration-6-scenario004
@@ -98,24 +88,18 @@
     abstract: true
     vars:
       scenario: scenario004
-      ceph: mimic
+      ceph: nautilus
 
 - job:
-    name: puppet-openstack-integration-6-scenario004-tempest-ubuntu-bionic-mimic
+    name: puppet-openstack-integration-6-scenario004-tempest-ubuntu-bionic
     parent: puppet-openstack-integration-6-scenario004
     nodeset: ubuntu-bionic
     voting: false
-    # NOTE(tobias-urdin): Should normally not really pass mimic ceph var here but since
-    # luminous is not packaged for Bionic repos.pp will fail otherwise.
-    vars:
-      ceph: mimic
 
 - job:
     name: puppet-openstack-integration-6-scenario004-tempest-centos-8
     parent: puppet-openstack-integration-6-scenario004
     nodeset: centos-8
-    vars:
-      ceph: nautilus
 
 - job:
     name: puppet-openstack-integration-6-scenario004-tempest-debian-stable-luminous

zuul.d/layout.yaml

@@ -46,10 +46,10 @@
     name: puppet-openstack-integration-jobs-all
     check:
       jobs:
-        - puppet-openstack-integration-6-scenario001-tempest-ubuntu-bionic-mimic
+        - puppet-openstack-integration-6-scenario001-tempest-ubuntu-bionic
         - puppet-openstack-integration-6-scenario002-tempest-ubuntu-bionic
         - puppet-openstack-integration-6-scenario003-tempest-ubuntu-bionic
-        - puppet-openstack-integration-6-scenario004-tempest-ubuntu-bionic-mimic
+        - puppet-openstack-integration-6-scenario004-tempest-ubuntu-bionic
         - puppet-openstack-integration-6-scenario001-tempest-centos-8
         - puppet-openstack-integration-6-scenario002-tempest-centos-8
         - puppet-openstack-integration-6-scenario003-tempest-centos-8
@@ -71,11 +71,11 @@
     name: puppet-openstack-integration-jobs-scenario001
     check:
       jobs:
-        - puppet-openstack-integration-6-scenario001-tempest-ubuntu-bionic-mimic
+        - puppet-openstack-integration-6-scenario001-tempest-ubuntu-bionic
         - puppet-openstack-integration-6-scenario001-tempest-centos-8
     gate:
       jobs:
-        - puppet-openstack-integration-6-scenario001-tempest-ubuntu-bionic-mimic
+        - puppet-openstack-integration-6-scenario001-tempest-ubuntu-bionic
         - puppet-openstack-integration-6-scenario001-tempest-centos-8
     experimental:
       jobs:
@@ -112,7 +112,7 @@
     name: puppet-openstack-integration-jobs-scenario004
     check:
       jobs:
-        - puppet-openstack-integration-6-scenario004-tempest-ubuntu-bionic-mimic
+        - puppet-openstack-integration-6-scenario004-tempest-ubuntu-bionic
         - puppet-openstack-integration-6-scenario004-tempest-centos-8
     gate:
       jobs: