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)
Update .gitreview for unmaintained/yoga
2024-06-17 15:10:02 +02:00 · 2024-02-28 06:41:05 +00:00 · 2023-06-12 02:29:59 +00:00 · 2022-03-22 04:41:34 +00:00 · 2022-03-11 14:35:04 +00:00
5 changed files with 3 additions and 25 deletions
--- a/.gitreview
+++ b/.gitreview
@@ -2,4 +2,4 @@
 host=review.opendev.org
 port=29418
 project=openstack/devstack-plugin-container.git
-defaultbranch=stable/zed
+defaultbranch=unmaintained/yoga
--- a/.zuul.yaml
+++ b/.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:
--- a/devstack/lib/crio
+++ b/devstack/lib/crio
@@ -78,8 +78,6 @@ function configure_crio {

    # 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}\"
    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\"
--- a/devstack/lib/docker
+++ b/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
@@ -86,17 +83,6 @@ function install_docker {
            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 \
--- a/devstack/settings
+++ b/devstack/settings
@@ -29,7 +29,3 @@ 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"}
Author	SHA1	Message	Date
Dr. Jens Harbott	c1b19c850a	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`)	2024-06-17 15:10:02 +02:00
OpenStack Release Bot	c5f9f256fe	Update .gitreview for unmaintained/yoga Change-Id: I10785ace81e670839354f2ed0b1bf45b25c6ca57	2024-02-28 06:41:05 +00:00
Hongbin Lu	53e3388873	Support installing specific version of docker Change-Id: I12015c28f6f8ffc125097a14514a6a90a20cf35b (cherry picked from commit `f8e786f0d5`)	2023-06-12 02:29:59 +00:00
yangjianfeng	c377bde924	Support config image repository for kubeadm In some places of which network environment was limited, kubeadm can't pull images from k8s.gcr.io. This patch add a variable `KUBEADMIN_IMAGE_REPOSITORY` in order to the developer who located in these places can set the kubeadm to pull container images from repository that they can access. Change-Id: I14aed50077ef0760635e575770fd2274cb759c53 (cherry picked from commit `90b4089cda`)	2022-03-22 04:41:34 +00:00
OpenStack Release Bot	853ae2b390	Update .gitreview for stable/yoga Change-Id: Ib25bc42db1e404cd4b3328941dea24e4c70f9d80	2022-03-11 14:35:04 +00:00