Make gates to use CRI-O on devstack by default.

Also, added gate job for docker backed version.

Change-Id: I6e22d5617038e5c20dcbbca2b110d2a312cedbd3

.zuul.d/base.yaml

@@ -25,7 +25,9 @@
       - openstack/kuryr-tempest-plugin
       - openstack/tempest
     timeout: 10800
-    post-run: playbooks/copy-k8s-logs.yaml
+    post-run:
+      - playbooks/copy-k8s-logs.yaml
+      - playbooks/copy-crio-logs.yaml
     host-vars:
       controller:
         devstack_plugins:
@@ -43,6 +45,8 @@
       tempest_plugins:
         - kuryr-tempest-plugin
       devstack_localrc:
+        CONTAINER_ENGINE: crio
+        CRIO_VERSION: "1.22"
         ENABLE_TLS: true
         ETCD_USE_RAMDISK: true
         KURYR_ENABLED_HANDLERS: vif,endpoints,service,namespace,pod_label,policy,kuryrnetworkpolicy,kuryrnetwork,kuryrport,kuryrloadbalancer
@@ -80,6 +84,7 @@
         tempest: true
       zuul_copy_output:
         '{{ devstack_log_dir }}/kubernetes': 'logs'
+        '{{ devstack_log_dir }}/crio': 'logs'
     irrelevant-files:
       - ^.*\.rst$
       - ^doc/.*$

.zuul.d/k8s-np-e2e.yaml

@@ -28,6 +28,7 @@
     post-run:
       - playbooks/run_k8s_e2e_tests.yaml
       - playbooks/copy-k8s-logs.yaml
+      - playbooks/copy-crio-logs.yaml
     post-timeout: 7200
     host-vars:
       controller:
@@ -41,6 +42,8 @@
       network_api_extensions_common:
         - tag-ports-during-bulk-creation
       devstack_localrc:
+        CONTAINER_ENGINE: crio
+        CRIO_VERSION: "1.22"
         ETCD_USE_RAMDISK: true
         KURYR_ENABLED_HANDLERS: vif,endpoints,service,namespace,pod_label,policy,kuryrnetworkpolicy,kuryrnetwork,kuryrport,kuryrloadbalancer
         KURYR_ENFORCE_SG_RULES: false
@@ -131,6 +134,7 @@
         '/home/zuul/np_kubetest.log': 'logs'
         '/home/zuul/np_sctp_kubetest.log': 'logs'
         '{{ devstack_log_dir }}/kubernetes': 'logs'
+        '{{ devstack_log_dir }}/crio': 'logs'
     irrelevant-files:
       - ^.*\.rst$
       - ^doc/.*$

.zuul.d/project.yaml

@@ -17,8 +17,8 @@
     check:
       jobs:
         - kuryr-kubernetes-tempest
+        - kuryr-kubernetes-tempest-docker
         - kuryr-kubernetes-tempest-defaults
-        - kuryr-kubernetes-tempest-crio
         - kuryr-kubernetes-tempest-systemd
         - kuryr-kubernetes-tempest-lower-constraints
         - kuryr-kubernetes-tempest-multinode

.zuul.d/tempest-jobs.yaml

@@ -182,16 +182,11 @@
         KURYR_CONFIGMAP_MODIFIABLE: true
 
 - job:
-    name: kuryr-kubernetes-tempest-crio
+    name: kuryr-kubernetes-tempest-docker
     parent: kuryr-kubernetes-octavia-base
     vars:
       devstack_localrc:
-        CONTAINER_ENGINE: crio
-        CRIO_VERSION: "1.22"
-      zuul_copy_output:
-        '{{ devstack_log_dir }}/crio': 'logs'
-    post-run:
-        - playbooks/copy-crio-logs.yaml
+        CONTAINER_ENGINE: docker
     voting: true
 
 - job:

.zuul.d/tempest-multinode-jobs.yaml

@@ -53,6 +53,8 @@
                 health_update_threads: 2
                 stats_update_threads: 2
         devstack_localrc:
+          CONTAINER_ENGINE: crio
+          CRIO_VERSION: "1.22"
           KURYR_ENABLED_HANDLERS: vif,endpoints,service,namespace,pod_label,policy,kuryrnetworkpolicy,kuryrnetwork,kuryrport,kuryrloadbalancer
           KURYR_ENFORCE_SG_RULES: false
           KURYR_EP_DRIVER_OCTAVIA_PROVIDER: ovn
@@ -122,6 +124,8 @@
           q-ovn-metadata-agent: false
           q-svc: false
         devstack_localrc:
+          CONTAINER_ENGINE: crio
+          CRIO_VERSION: "1.22"
           KURYR_ENABLED_HANDLERS: vif,endpoints,service,namespace,pod_label,policy,kuryrnetworkpolicy,kuryrnetwork,kuryrport,kuryrloadbalancer
           KURYR_ENFORCE_SG_RULES: true
           KURYR_SG_DRIVER: policy

devstack/local.conf.ovs.sample

@@ -23,7 +23,7 @@ disable_service cinder
 disable_service dstat
 disable_service n-novnc
 disable_service horizon
-# If you plan to run tempest tests on devstack, you should comment out/remove 
+# If you plan to run tempest tests on devstack, you should comment out/remove
 # below line
 disable_service tempest
 
@@ -42,7 +42,7 @@ Q_AGENT="openvswitch"
 Q_ML2_PLUGIN_MECHANISM_DRIVERS="openvswitch"
 Q_ML2_TENANT_NETWORK_TYPE="vxlan"
 
-# Set workaround for 
+# Set workaround for
 FLOATING_RANGE="172.24.5.0/24"
 PUBLIC_NETWORK_GATEWAY="172.24.5.1"
 
@@ -78,15 +78,18 @@ enable_service o-hk
 # OCTAVIA_AMP_IMAGE_SIZE=3
 # OCTAVIA_AMP_IMAGE_NAME=test-only-amphora-x64-haproxy-ubuntu-xenial
 
-# Docker
-# ======
-# If you already have docker configured, running and with its socket writable
-# by the stack user, you can omit the following line.
+# CRI
+# ===
+# If you already have either CRI-O or Docker configured, running and with its
+# socket writable by the stack user, you can omit the following lines.
 enable_plugin devstack-plugin-container https://opendev.org/openstack/devstack-plugin-container
+# We are using CRI-O by default. The version should match K8s version:
+CONTAINER_ENGINE="crio"
+CRIO_VERSION="1.22"
 
 # Etcd
 # ====
-# The default is for devstack to run etcd for you. Remove comment to disable 
+# The default is for devstack to run etcd for you. Remove comment to disable
 # it, if you already have etcd running.
 #disable_service etcd3
 # If you already have an etcd cluster configured and running, you can just

devstack/local.conf.sample

@@ -23,7 +23,7 @@ disable_service cinder
 disable_service dstat
 disable_service n-novnc
 disable_service horizon
-# If you plan to run tempest tests on devstack, you should comment out/remove 
+# If you plan to run tempest tests on devstack, you should comment out/remove
 # below line
 disable_service tempest
 
@@ -73,15 +73,18 @@ enable_service o-da
 # OVN octavia provider plugin
 enable_plugin ovn-octavia-provider https://opendev.org/openstack/ovn-octavia-provider
 
-# Docker
-# ======
-# If you already have docker configured, running and with its socket writable
-# by the stack user, you can omit the following line.
+# CRI
+# ===
+# If you already have either CRI-O or Docker configured, running and with its
+# socket writable by the stack user, you can omit the following lines.
 enable_plugin devstack-plugin-container https://opendev.org/openstack/devstack-plugin-container
+# We are using CRI-O by default. The version should match K8s version:
+CONTAINER_ENGINE="crio"
+CRIO_VERSION="1.22"
 
 # Etcd
 # ====
-# The default is for devstack to run etcd for you. Remove comment to disable 
+# The default is for devstack to run etcd for you. Remove comment to disable
 # it, if you already have etcd running.
 #disable_service etcd3
 # If you already have an etcd cluster configured and running, you can just