zuul: drop devstack-gate reference

Devstack jobs no longer depend on the devstack-gate project, which has
been retired

Change-Id: Id4721d419b22b6d6498d192e3f313629ad33ef69
(cherry picked from commit 3e2a0ffe4f)
(cherry picked from commit 70f7bba359)
(cherry picked from commit db4b92fce4)
(cherry picked from commit c1b19c850a)
(cherry picked from commit ac44a0e105)
(cherry picked from commit 5a6502673a)

.gitreview

@@ -2,4 +2,4 @@
 host=review.opendev.org
 port=29418
 project=openstack/devstack-plugin-container.git
-defaultbranch=stable/zed
+defaultbranch=unmaintained/victoria

.zuul.yaml

@@ -7,7 +7,6 @@
     timeout: 4200
     required-projects:
       - openstack/devstack
-      - openstack/devstack-gate
       - openstack/devstack-plugin-container
     vars:
       devstack_localrc:
@@ -25,7 +24,6 @@
     timeout: 7200
     required-projects:
       - openstack/devstack
-      - openstack/devstack-gate
       - openstack/devstack-plugin-container
     vars:
       devstack_services:

devstack/lib/crio

@@ -20,7 +20,6 @@ set +o xtrace
 # --------
 
 CRIO_ENGINE_SOCKET_FILE=${CRIO_ENGINE_SOCKET_FILE:-/var/run/crio/crio.sock}
-CRIO_ALLOW_ICMP=$(trueorfalse True CRIO_ALLOW_ICMP)
 
 # Functions
 # ---------
@@ -41,22 +40,14 @@ function install_crio {
 
     local lsb_dist=${os_VENDOR,,}
     local dist_version=${os_CODENAME}
-    local kubic_obs_project_key="2472d6d0d2f66af87aba8da34d64390375060aa4"
-    local os="x${os_VENDOR}_${os_RELEASE}"
+    local arch
+    arch=$(dpkg --print-architecture)
     if is_ubuntu; then
-        apt_get install apt-transport-https ca-certificates \
-            software-properties-common
-        sudo apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 \
-            --recv ${kubic_obs_project_key}
-        sudo apt-add-repository "deb https://download.opensuse.org/"`
-            `"repositories/devel:/kubic:/libcontainers:/stable/${os}/ /"
-        sudo apt-add-repository "deb http://download.opensuse.org/"`
-            `"repositories/devel:/kubic:/libcontainers:/stable:/cri-o:/"`
-            `"${CRIO_VERSION}/${os}/ /"
-
+        apt_get install apt-transport-https ca-certificates software-properties-common
+        sudo add-apt-repository -y ppa:projectatomic/ppa
         # Installing podman and containerd will get us compatible versions of
         # cri-o and runc. And we need podman to manage container images anyway.
-        apt_get install podman buildah cri-o-runc cri-o
+        apt_get install podman buildah
     elif is_fedora; then
         if [[ "$lsb_dist" = "centos" ]]; then
             sudo yum-config-manager \
@@ -74,17 +65,26 @@ function configure_crio {
     # After an ./unstack it will be stopped. So it is ok if it returns exit-code == 1
     sudo systemctl stop crio.service || true
 
-    export CRIO_CONF="/etc/crio/crio.conf"
+    local crio_conf
+    crio_conf=/etc/crio/crio.conf
 
     # We're wrapping values in \"<val>\" because that's the format cri-o wants.
-    iniset -sudo ${CRIO_CONF} crio.api listen \"${CRIO_ENGINE_SOCKET_FILE}\"
-    iniset -sudo ${CRIO_CONF} crio.image pause_image \"${CRIO_PAUSE_IMAGE}\"
-    iniset -sudo ${CRIO_CONF} crio.image pause_command \"${CRIO_PAUSE_COMMAND}\"
+    iniset -sudo ${crio_conf} crio.api listen \"${CRIO_ENGINE_SOCKET_FILE}\"
     if [[ "$ENABLE_DEBUG_LOG_LEVEL" == "True" ]]; then
         # debug is way too verbose, info will be enough
-        iniset -sudo ${CRIO_CONF} crio.runtime log_level \"info\"
+        iniset -sudo ${crio_conf} crio.runtime log_level \"info\"
     fi
     if is_ubuntu; then
+        # In Ubuntu's a special vendored version of runc is installed with
+        # cri-o. This means that it'll not work with the system's version of
+        # runc. Moreover vendored runc is not placed into /usr/bin, where
+        # crio.conf states that it will be. We fix that by linking the vendored
+        # binary to /usr/bin.
+        if [[ ! -e /usr/bin/runc ]]; then
+            sudo ln -s /usr/lib/cri-o-runc/sbin/runc /usr/bin/runc
+            sudo chmod +x /usr/bin/runc
+        fi
+
         # At least for 18.04 we need to set up /etc/containers/registries.conf
         # with some initial content. That's another bug with that PPA.
         local registries_conf
@@ -96,41 +96,15 @@ function configure_crio {
 registries = ['docker.io']
 EOF
         fi
-        # CRI-O from kubic repo have placed runc in different place, not even
-        # in path, just to not conflict with runc package from official repo.
-        # We need to change it.
-        iniset -sudo ${CRIO_CONF} crio.runtime.runtimes.runc runtime_path \
-            \"/usr/lib/cri-o-runc/sbin/runc\"
-
-        if [ -n "${CNI_CONF_DIR}" ]; then
-            iniset -sudo ${CRIO_CONF} crio.network network_dir \
-                \"${CNI_CONF_DIR}\"
-        fi
-        if [ -n "${CNI_PLUGIN_DIR}" ]; then
-            iniset -sudo ${CRIO_CONF} crio.network plugin_dir \
-                \"${CNI_PLUGIN_DIR}\"
-        fi
-        # By default CRI-O doesn't allow ICMP between containers, although it
-        # is ususally expected for testing purposes.
-        if [ "${CRIO_ALLOW_ICMP}" == "True" ]; then
-            if grep -q 'default_sysctls =' ${CRIO_CONF}; then
-                export CRIO_KEY="default_sysctls"
-                export CRIO_VAL='[ "net.ipv4.ping_group_range=0 2147483647", ]'
-                _update_config
-            else
-                iniset -sudo ${CRIO_CONF} crio.runtime default_sysctls \
-                    '[ "net.ipv4.ping_group_range=0 2147483647", ]'
-            fi
-        fi
     elif is_fedora; then
         local lsb_dist=${os_VENDOR,,}
 
         if [[ "$lsb_dist" = "centos" ]]; then
             # CentOS packages are putting runc binary in different place...
-            iniset -sudo ${CRIO_CONF} crio.runtime runtime \"/usr/sbin/runc\"
+            iniset -sudo ${crio_conf} crio.runtime runtime \"/usr/sbin/runc\"
 
             # CentOS version seems to only work with cgroupfs...
-            iniset -sudo ${CRIO_CONF} crio.runtime cgroup_manager \"cgroupfs\"
+            iniset -sudo ${crio_conf} crio.runtime cgroup_manager \"cgroupfs\"
         fi
     fi
 
@@ -141,46 +115,5 @@ function stop_crio {
     sudo systemctl stop crio.service || true
 }
 
-function _update_config {
-sudo -E python3 - <<EOF
-"""
-Update provided by CRIO_KEY key list in crio configuration in a form of:
-
-  some_key = [ some,
-      value
-  ]
-
-or just an empty list:
-
-  some_key = [
-  ]
-
-with the CRIO_VAL value.
-
-Note, CRIO_VAL must include square brackets.
-
-"""
-import os
-import re
-
-crio_key = os.environ.get('CRIO_KEY')
-crio_val = os.environ.get('CRIO_VAL')
-crio_conf = os.environ.get('CRIO_CONF')
-
-pat = re.compile(rf'{crio_key}\s*=\s*\[[^\]]*\]', flags=re.S | re.M)
-
-with open(crio_conf) as fobj:
-    conf = fobj.read()
-
-with open(crio_conf, 'w') as fobj:
-    search = pat.search(conf)
-    if search:
-        start, end = search.span()
-        conf = conf[:start] + f'{crio_key} = {crio_val}' + conf[end:]
-        fobj.write(conf)
-
-EOF
-}
-
 # Restore xtrace
 $_XTRACE_DOCKER

devstack/lib/docker

@@ -56,12 +56,9 @@ function install_docker {
 
     local lsb_dist=${os_VENDOR,,}
     local dist_version=${os_CODENAME}
-    if [[ "$lsb_dist" != "centosstream" ]]; then
-        local arch
-        arch=$(dpkg --print-architecture)
-    fi
+    local arch
+    arch=$(dpkg --print-architecture)
     if is_ubuntu; then
-        apt_get install apparmor
         if [[ ${dist_version} == 'trusty' ]]; then
             if uname -r | grep -q -- '-generic' && dpkg -l 'linux-image-*-generic' | grep -qE '^ii|^hi' 2>/dev/null; then
                 apt_get install linux-image-extra-$(uname -r) linux-image-extra-virtual
@@ -76,27 +73,12 @@ function install_docker {
             ${dist_version} \
             stable"
         REPOS_UPDATED=False apt_get_update
-        if [ -n "${UBUNTU_DOCKER_VERSION}" ]; then
-            apt_get install docker-ce=$UBUNTU_DOCKER_VERSION
-        else
-            apt_get install docker-ce
-        fi
+        apt_get install docker-ce
     elif is_fedora; then
         if [[ "$lsb_dist" = "centos" ]]; then
             sudo yum-config-manager \
                 --add-repo \
                 https://download.docker.com/linux/centos/docker-ce.repo
-        elif  [[ "$lsb_dist" = "centosstream" ]]; then
-            sudo yum-config-manager \
-                --add-repo \
-                https://download.docker.com/linux/centos/docker-ce.repo
-            sudo yum-config-manager \
-                --add-repo \
-                https://packages.cloud.google.com/yum/repos/kubernetes-el7-x86_64 #noqa
-            sudo yum-config-manager \
-                --enable \
-                packages.cloud.google.com_yum_repos_kubernetes-el7-x86_64
-            sudo dnf -y install kubeadm --nogpgcheck
         elif [[ "$lsb_dist" = "fedora" ]]; then
             sudo dnf config-manager \
                 --add-repo \

devstack/lib/k8s

@@ -63,7 +63,6 @@ function kubeadm_init {
     cat <<EOF | tee $kubeadm_config_file >/dev/null
 apiVersion: kubeadm.k8s.io/v1beta1
 kind: ClusterConfiguration
-imageRepository: "${KUBEADMIN_IMAGE_REPOSITORY}"
 etcd:
   external:
     endpoints:
@@ -85,7 +84,6 @@ apiVersion: kubelet.config.k8s.io/v1beta1
 kind: KubeletConfiguration
 failSwapOn: false
 EOF
-    sudo kubeadm config images pull --image-repository=${KUBEADMIN_IMAGE_REPOSITORY}
     sudo kubeadm init --config $kubeadm_config_file --ignore-preflight-errors Swap
 
     local kube_config_file=$HOME/.kube/config

devstack/settings

@@ -9,12 +9,6 @@ ENABLE_LIVE_RESTORE=${ENABLE_LIVE_RESTORE:-false}
 ENABLE_IPV6=${ENABLE_IPV6:-false}
 K8S_NETWORK_ADDON=${K8S_NETWORK_ADDON:-flannel}
 ENABLE_CONTAINERD_CRI=${ENABLE_CONTAINERD_CRI:-false}
-CRIO_VERSION=${CRIO_VERSION:-"1.18:/1.18.0"}
-CRIO_ALLOW_ICMP=${CRIO_ALLOW_ICMP:-true}
-CNI_CONF_DIR=${CNI_CONF_DIR:-}
-CNI_PLUGIN_DIR=${CNI_PLUGIN_DIR:-}
-
-UBUNTU_DOCKER_VERSION=${UBUNTU_DOCKER_VERSION:-}
 
 # Enable container services
 enable_service container
@@ -26,10 +20,3 @@ if [[ ,${ENABLED_SERVICES} =~ ,"k8s-master" ]]; then
     enable_service kube-scheduler
     enable_service kube-proxy
 fi
-
-# Customize kubeadm container images repository
-KUBEADMIN_IMAGE_REPOSITORY=${KUBEADMIN_IMAGE_REPOSITORY:-"k8s.gcr.io"}
-
-# Configure crio pause image
-CRIO_PAUSE_IMAGE=${CRIO_PAUSE_IMAGE:-"k8s.gcr.io/pause:3.6"}
-CRIO_PAUSE_COMMAND=${CRIO_PAUSE_COMMAND:-"/pause"}

tox.ini

@@ -1,5 +1,5 @@
 [tox]
-minversion = 3.18.0
+minversion = 1.6
 skipsdist = True
 envlist = bashate
 
@@ -14,7 +14,7 @@ basepython = python3
 # modified bashate tree
 deps =
    {env:BASHATE_INSTALL_PATH:bashate==0.5.1}
-allowlist_externals = bash
+whitelist_externals = bash
 commands = bash -c "find {toxinidir}             \
          -not \( -type d -name .?\* -prune \)    \
          -not \( -type d -name doc -prune \)     \