Remove extras job, put gentoo job in gate

The only job left in the "extras" functional test is for gentoo.  We
might as well just drop this and put the gentoo devstack test in the
gate -- in terms of resources it's a 1:1 swap now.

Cleanup the ordering of the check queue list

Change-Id: I2af8f9235131cd0cce33e67c8d0d05c3b357320d

.zuul.d/jobs.yaml

@@ -31,18 +31,6 @@
         - ubuntu/bionic-build-succeeds
         - ubuntu/focal-build-succeeds
 
-- job:
-    name: dib-functests-extras
-    description: |
-      These are tests which are not as widely supported as the
-      core platforms
-    abstract: true
-    voting: false
-    parent: dib-functests-base
-    vars:
-      dib_functests:
-        - gentoo/build-succeeds
-
 - job:
     name: dib-functests-arm64
     description: |
@@ -64,14 +52,6 @@
     parent: dib-functests-default
     nodeset: ubuntu-bionic
 
-- job:
-    name: dib-functests-bionic-python3-extras
-    description: |
-      The extras tests on a Bionic build host with Python 3
-    parent: dib-functests-extras
-    nodeset: ubuntu-bionic
-    voting: false
-
 
 # ARM64 tests
 - job:

.zuul.d/project.yaml

@@ -11,6 +11,7 @@
     check:
       jobs:
         - openstack-tox-pylint
+        - dib-functests-bionic-python3
         - opendev-buildset-registry
         - nodepool-build-image-siblings
         - dib-nodepool-functional-openstack-centos-7-src
@@ -26,11 +27,11 @@
             voting: false
         - dib-nodepool-functional-openstack-opensuse-tumbleweed-src:
             voting: false
-        - dib-functests-bionic-python3
+        - dib-nodepool-functional-openstack-gentoo-src:
-        - dib-functests-bionic-python3-extras
+            voting: false
-        - ironic-python-agent-check-image-dib-centos8
         - dib-nodepool-functional-openstack-debian-bullseye-src:
             voting: false
+        - ironic-python-agent-check-image-dib-centos8
         # IPA job that builds AND validates an image via deployment
         - ipa-tempest-bios-ipmi-direct-src:
             voting: false
@@ -55,6 +56,5 @@
       jobs:
         - opendev-buildset-registry
         - nodepool-build-image-siblings
-        - dib-nodepool-functional-openstack-gentoo-src
         - dib-nodepool-functional-openstack-debian-stretch-src
         - dib-nodepool-functional-openstack-debian-buster-src