Cleanup tobiko jobs

Removed devstack-tobiko-minimal, as it was just the same as
devstack-tobiko, but on setups with lower requirements, and this caused
some inestabilities recently.

Removed devstack-tobiko-heat which tested functional tests
(devstack-tobiko-functional already covers this) and create-resources
tests, which are covered in many other jobs.

Removed devstack-tobiko-storage job, which tested create-resources,
already covered in many other jobs.

Removed devstack-tobiko-sanity, because the sanity tests are run by many
other jobs (those running the faults workflow, for example).

Removed unused jobs devstack-tobiko-ovs-dvr,
devstack-tobiko-ovs-dvr-snat and devstack-tobiko-multinode-ovs.

Removed devstack-tobiko-designate and devstack-tobiko-designate-ovs
because their tests will be executed in devstack-tobiko and
devstack-tobiko-ovs respectively.

Depends-On: Id8ee0323ad09297c08685ce19a60df469ae16826
Depends-On: I7a658f7a965f54ff4337615d7107314b4faa44d4

Change-Id: I6015af347dba6b8a587fa3b3811ca4c8cdd41b7a

zuul.d/devstack-tobiko-designate.yaml

@@ -1,39 +0,0 @@
----
-
-- project-template:
-    name: devstack-tobiko-designate
-    description: |
-      DevStack jobs intended to gate Tobiko project changes with Designate
-    check: &CHECK
-      jobs:
-        - devstack-tobiko-designate
-        - devstack-tobiko-ovs-designate
-    gate: &GATE
-      jobs:
-        - devstack-tobiko-designate
-    periodic: *CHECK
-
-
-# --- STANDALONE -------------------------------------------------------------
-
-
-- job:
-    name: devstack-tobiko-designate
-    parent: devstack-tobiko
-    voting: false
-    required-projects: &REQUIRED_PROJECTS
-      - opendev.org/openstack/designate
-      - opendev.org/openstack/python-designateclient
-    vars: &VARS
-      devstack_plugins:
-        designate: https://opendev.org/openstack/designate.git
-      devstack_services:
-        designate: true
-
-
-- job:
-    name: devstack-tobiko-ovs-designate
-    parent: devstack-tobiko-ovs
-    voting: false
-    required-projects: *REQUIRED_PROJECTS
-    vars: *VARS

zuul.d/devstack-tobiko-functional.yaml

@@ -15,13 +15,14 @@
 - job:
     abstract: false
     name: devstack-tobiko-functional
-    parent: devstack-tobiko-designate
+    parent: devstack-tobiko
-    # TODO(eolivare): remove this when the fix is merged on tobiko project:
+    voting: true
-    # https://review.opendev.org/c/x/tobiko/+/894522
-    voting: false
     description: Run tobiko functional test cases
     vars:
       test_workflow: functional
+      # TODO(eolivare): investigate why this test fails with Fedora instances
+      pytest_addopts_global: >-
+        --skipregex='AdvancedServerStackTest.test_ipv4_subnet_nameservers'
     irrelevant-files: &IRRELEVANT_FILES
       - ^.*\.rst$
       - ^doc/

zuul.d/devstack-tobiko-heat.yaml

@@ -1,23 +0,0 @@
----
-
-- project-template:
-    name: devstack-tobiko-heat
-    description: |
-      DevStack jobs intended to gate heat project changes
-    check: &CHECK
-      jobs:
-        - devstack-tobiko-heat
-    periodic: *CHECK
-
-
-# --- STANDALONE -------------------------------------------------------------
-
-- job:
-    name: devstack-tobiko-heat
-    parent: devstack-tobiko-minimal
-    nodeset: devstack-tobiko-jammy
-    required-projects:
-      - openstack/heat
-    voting: true
-    vars:
-      test_workflow: create-resources-heat

zuul.d/devstack-tobiko-ovs.yaml

@@ -77,85 +77,7 @@
         s-object: false
         s-proxy: false
         tls-proxy: true
+        designate: true
       devstack_plugins:
         neutron: "https://opendev.org/openstack/neutron"
-
+        designate: https://opendev.org/openstack/designate.git
-
-- job:
-    name: devstack-tobiko-ovs-dvr
-    parent: devstack-tobiko-ovs
-    description: |
-      Base Tobiko devstack job to be used with ML2/OVS and DVR
-    voting: false
-    vars:
-      l3_agent_mode: dvr
-      devstack_local_conf:
-        post_config:
-          $NEUTRON_CONF:
-            DEFAULT:
-              router_distributed: true
-          $NEUTRON_DHCP_CONF:
-            DEFAULT:
-              dhcp_delete_namespaces: true
-          $NEUTRON_L3_CONF:
-            DEFAULT:
-              agent_mode: '{{ l3_agent_mode }}'
-              router_delete_namespaces: true
-          $NEUTRON_CORE_PLUGIN_CONF:
-            agent:
-              enable_distributed_routing: true
-              l2_population: true
-              tunnel_types: vxlan
-            ml2:
-              mechanism_drivers: openvswitch,l2population
-              type_drivers: flat,vlan,vxlan
-              tenant_network_types: vxlan
-            ml2_type_vxlan:
-              vni_ranges: '1000:1999'
-            ovs:
-              local_ip: '$HOST_IP'
-
-
-- job:
-    name: devstack-tobiko-ovs-dvr-snat
-    parent: devstack-tobiko-ovs-dvr
-    description: |
-      Base Tobiko devstack job to be used with ML2/OVS and dvr_snat L3
-      agent mode
-    voting: false
-    vars:
-      l3_agent_mode: dvr_snat
-
-
-# --- MULTINODE --------------------------------------------------------------
-
-- job:
-    name: devstack-tobiko-multinode-ovs
-    parent: devstack-tobiko-multinode
-    description: Base DevStack Tobiko job with multinode.
-    voting: false
-    vars:
-      <<: *OVS_VARS
-      extensions_to_txt:
-        db: true
-    group-vars:
-      subnode:
-        devstack_services:
-          c-vol: true
-          dstat: true
-          heat: false
-          h-api: false
-          h-api-cfn: false
-          h-eng: false
-          n-api-meta: true
-          placement-client: true
-          n-cpu: true
-          neutron-agent: true
-          # see bug #1860753 (https://bugs.launchpad.net/devstack/+bug/1860753)
-          memory_tracker: false
-          ovn-controller: false
-          q-agt: true
-          q-l3: true
-          q-meta: true
-          q-ovn-metadata-agent: false
-          tls-proxy: false

zuul.d/devstack-tobiko-sanity.yaml

@@ -14,7 +14,7 @@
 - job:
     abstract: false
     name: devstack-tobiko-sanity
-    parent: devstack-tobiko-minimal
+    parent: devstack-tobiko
     voting: true
     description: Run tobiko sanity test cases
     vars:

zuul.d/devstack-tobiko-storage.yaml

@@ -5,29 +5,18 @@
 - project-template:
     name: devstack-tobiko-storage
     description: |
-      DevStack jobs intended to gate Glance project changes
+      DevStack jobs intended to gate storage project changes
     check: &CHECK
       jobs:
-        - devstack-tobiko-storage
         - devstack-tobiko-storage-ceph
     periodic: *CHECK
 
 
 # --- JOBS -------------------------------------------------------------------
 
-- job:
-    name: devstack-tobiko-storage
-    parent: devstack-tobiko-minimal
-    required-projects:
-      - openstack/glance
-    voting: true
-    vars:
-      test_workflow: create-resources
-
-
 - job:
     name: devstack-tobiko-storage-ceph
-    parent: devstack-tobiko-storage
+    parent: devstack-tobiko
     description: |
       DevStack job intended to gate Ceph project changes
     required-projects:
@@ -44,6 +33,6 @@
         ENABLE_CEPH_NOVA: true       # allow nova to use ceph resources
         ENABLE_FILE_INJECTION: false
         ENABLE_VOLUME_MULTIATTACH: false
-        DISABLE_CEPHADM_POST_DEPLOY: True
+        DISABLE_CEPHADM_POST_DEPLOY: true
         CEPHADM_DEPLOY: true
       test_workflow: create-resources

zuul.d/devstack-tobiko.yaml

@@ -19,8 +19,12 @@
 - job:
     abstract: false
     name: devstack-tobiko
-    parent: devstack-tobiko-minimal
+    parent: devstack
+    nodeset: devstack-tobiko-jammy
     voting: true
+    branches:
+      regex: ^(unmaintained|stable/(wallaby|xena|yoga|zed|2023.1)).*$
+      negate: true
     description: |
       Base Devstack Tobiko Plugin job.
 
@@ -29,12 +33,18 @@
       job and set the nodeset to a multi-node one.
     required-projects:
       - openstack/neutron
+      - openstack/heat
+      - openstack/designate
+      - x/devstack-plugin-tobiko
+      - x/tobiko
     roles:
       - zuul: x/tobiko
     timeout: 10800
-    vars:
+    vars: &job_vars
       configure_swap_size: 8192
       devstack_localrc:
+        LOG_COLOR: false
+        MULTI_HOST: 0
         LIBVIRT_TYPE: kvm
         LIBVIRT_CPU_MODE: host-passthrough
         GLANCE_ENABLE_QUOTAS: false
@@ -60,12 +70,17 @@
           "{{ ipv6_dns_nameservers | join(',') }}"
       devstack_plugins:
         neutron: https://opendev.org/openstack/neutron.git
+        heat: https://opendev.org/openstack/heat.git
+        designate: https://opendev.org/openstack/designate.git
+        devstack-plugin-tobiko: https://opendev.org/x/devstack-plugin-tobiko.git
       devstack_services:
         heat: true
         h-api: true
         h-api-cfn: true
         h-eng: true
         n-cpu: true
+        tempest: false
+        tls-proxy: false
         # NOTE(slaweq): we need to enable it as "legacy" service because for
         # Fedora job it has to be disabled. If it would be disabled as
         # "neutron-dns: false" then it devstack would consider that
@@ -83,12 +98,29 @@
         s-proxy: false
         # NOTE(slaweq): without Swift, c-bak cannot run (in the Gate at least)
         c-bak: false
+        designate: true
       ipv4_dns_nameservers:
         - 1.0.0.1
         - 8.8.8.8
       ipv6_dns_nameservers: []
+      zuul_copy_output:
+        '{{ stage_dir }}/stackviz': logs
+        "{{ devstack_base_dir }}/data/ovn": "logs"
+        "{{ devstack_base_dir }}/data/ovs": "logs"
+        "{{ devstack_log_dir }}/ovsdb-server-nb.log": "logs"
+        "{{ devstack_log_dir }}/ovsdb-server-sb.log": "logs"
+      extensions_to_txt:
+        conf: true
+        log: true
+        yaml: true
+        yml: true
+      test_log_debug: true
+      test_case_timeout: 1800
       test_workflow: faults
-    irrelevant-files:
+    pre-run: playbooks/devstack/pre.yaml
+    run: playbooks/devstack/run.yaml
+    post-run: playbooks/devstack/post.yaml
+    irrelevant-files: &irrelevant-files
       - ^.*\.rst$
       - ^doc/
       - ^infrared_plugin/
@@ -99,6 +131,32 @@
       - ^tobiko/tests/unit/
       - ^Vagrantfile
 
+- job:
+    abstract: false
+    name: devstack-tobiko
+    parent: devstack
+    nodeset: devstack-tobiko-focal
+    voting: true
+    branches: ^(unmaintained|stable/(wallaby|xena|yoga|zed|2023.1)).*$
+    description: |
+      Base Devstack Tobiko Plugin job.
+
+      This job provides the base for both the single and multi-node
+      test setup. To run a multi-node test inherit from devstack-tobiko
+      job and set the nodeset to a multi-node one.
+    required-projects:
+      - openstack/neutron
+      - openstack/heat
+      - x/devstack-plugin-tobiko
+      - x/tobiko
+    roles:
+      - zuul: x/tobiko
+    timeout: 10800
+    vars: *job_vars
+    pre-run: playbooks/devstack/pre.yaml
+    run: playbooks/devstack/run.yaml
+    post-run: playbooks/devstack/post.yaml
+    irrelevant-files: *irrelevant-files
 
 # --- MULTINODE --------------------------------------------------------------
 
@@ -122,13 +180,24 @@
       devstack_local_conf:
         post-config:
           $NOVA_CONF:
+            # these workarounds are needed to make migration tests pass with
+            # nested-virt nodes, otherwise:
+            # https://bugs.launchpad.net/nova-lxd/+bug/2049231
             workarounds:
               skip_cpu_compare_at_startup: true
               skip_cpu_compare_on_dest: true
+      devstack_plugins:
+        # remove designate from multinode
+        neutron: https://opendev.org/openstack/neutron.git
+        heat: https://opendev.org/openstack/heat.git
+        devstack-plugin-tobiko: https://opendev.org/x/devstack-plugin-tobiko.git
+      devstack_services:
+        designate: false
     group-vars:
       subnode:
         devstack_services:
           tls-proxy: false
+          designate: false
         devstack_localrc:
           LIBVIRT_TYPE: kvm
           LIBVIRT_CPU_MODE: host-passthrough
@@ -138,6 +207,9 @@
         devstack_local_conf:
           post-config:
             $NOVA_CONF:
+              # these workarounds are needed to make migration tests pass with
+              # nested-virt nodes, otherwise:
+              # https://bugs.launchpad.net/nova-lxd/+bug/2049231
               workarounds:
                 skip_cpu_compare_at_startup: true
                 skip_cpu_compare_on_dest: true

zuul.d/project.yaml

@@ -4,13 +4,9 @@
     templates:
       - ansible-role-jobs
       - devstack-tobiko
-      - devstack-tobiko-designate
       - devstack-tobiko-functional
-      - devstack-tobiko-heat
-      - devstack-tobiko-minimal
       - devstack-tobiko-neutron
       - devstack-tobiko-nova
       - devstack-tobiko-octavia
       - devstack-tobiko-ovs
-      - devstack-tobiko-sanity
       - devstack-tobiko-storage