Drop zun and kuryr

Zun is broken in 2026.1, it has been released broken and there are
no reviews on the patch to fix it [1].

[1]: https://review.opendev.org/c/openstack/zun/+/982362

Depends-On: https://review.opendev.org/c/openstack/ansible-collection-kolla/+/986150

Change-Id: I8ced621754d03c44b7672dd94fc3d7d2173ac734
Signed-off-by: Michal Nasiadka <mnasiadka@gmail.com>

6 files changed, 4 insertions, 216 deletions

diff --git a/tests/check-logs.sh b/tests/check-logs.sh
index 2bc3ccee1..bb2420cf4 100755
--- a/tests/check-logs.sh
+++ b/tests/check-logs.sh
@@ -103,9 +103,6 @@ function check_fluentd_missing_logs {
         /var/log/kolla/tenks/*)
             continue
             ;;
-        /var/log/kolla/zun/*)
-            continue
-            ;;
         *)
             if ! sudo grep -q "following tail of $file" $fluentd_log_file; then
                 echo "no match for $file"
diff --git a/tests/pre.yml b/tests/pre.yml
index 1480609b3..59d105210 100644
--- a/tests/pre.yml
+++ b/tests/pre.yml
@@ -79,7 +79,7 @@
       become: true
       package:
         name: lvm2
-      when: scenario in ['cephadm', 'zun']
+      when: scenario in ['cephadm']
 
     - name: Ensure /tmp/logs/ dir
       file:
diff --git a/tests/run.yml b/tests/run.yml
index efa817e24..f6b781971 100644
--- a/tests/run.yml
+++ b/tests/run.yml
@@ -22,7 +22,7 @@
         need_build_image: "{{ kolla_build_images | default(false) }}"
         build_image_tag: "change_{{ zuul.change | default('none') }}"
         openstack_core_enabled: "{{ openstack_core_enabled }}"
-        openstack_core_tested: "{{ scenario in ['core', 'cephadm', 'zun', 'cells', 'ovn', 'lets-encrypt', 'container-engine-migration'] }}"
+        openstack_core_tested: "{{ scenario in ['core', 'cephadm', 'cells', 'ovn', 'lets-encrypt', 'container-engine-migration'] }}"
         dashboard_enabled: "{{ openstack_core_enabled }}"
         upper_constraints_file: "{{ ansible_env.HOME }}/src/opendev.org/openstack/requirements/upper-constraints.txt"
         docker_image_tag_suffix: "{{ '-aarch64' if ansible_architecture == 'aarch64' else '' }}"
@@ -38,7 +38,7 @@
 
     - import_role:
         name: kolla-ansible-setup-disks
-      when: scenario in ['cephadm', 'zun']
+      when: scenario in ['cephadm']
 
     - name: Update /etc/hosts with internal API FQDN
       blockinfile:
@@ -427,7 +427,7 @@
             EXT_NET_GATEWAY: "{{ neutron_external_network_prefix }}1"
             EXT_NET_DEMO_ROUTER_ADDR: "{{ neutron_external_network_prefix }}10"
             SCENARIO: "{{ scenario }}"
-          when: openstack_core_tested or scenario in ['ironic', 'multi-compute-ironic' ,'magnum', 'nfv', 'zun', 'octavia']
+          when: openstack_core_tested or scenario in ['ironic', 'multi-compute-ironic' ,'magnum', 'nfv', 'octavia']
 
         - name: Test OVN VPNaaS
           import_role:
@@ -456,16 +456,6 @@
               - "{{ tempest_src_dir if (zuul.branch == 'master' and not is_upgrade) else 'tempest' }}"
           when: openstack_core_tested
 
-        - name: Run test-zun.sh script
-          script:
-            cmd: test-zun.sh
-            executable: /bin/bash
-            chdir: "{{ kolla_ansible_src_dir }}"
-          when: scenario == 'zun'
-          environment:
-            BASE_DISTRO: "{{ base_distro }}"
-            CONTAINER_ENGINE: "{{ container_engine }}"
-
         - name: Run test-scenario-nfv.sh script
           script:
             cmd: test-scenario-nfv.sh
diff --git a/tests/templates/globals-default.j2 b/tests/templates/globals-default.j2
index ca2ad562e..0f6da316a 100644
--- a/tests/templates/globals-default.j2
+++ b/tests/templates/globals-default.j2
@@ -88,20 +88,6 @@ openstack_tag_suffix: "{{ docker_image_tag_suffix }}"
 {%     endif %}
 {% endif %}
 
-{% if scenario == "zun" %}
-enable_zun: "yes"
-enable_kuryr: "yes"
-enable_etcd: "yes"
-etcd_remove_deleted_members: "yes"
-docker_configure_for_zun: "yes"
-containerd_configure_for_zun: "yes"
-enable_cinder: "yes"
-cinder_cluster_skip_precheck: "yes"
-# lvm backup driver for cinder-backup does not exist
-enable_cinder_backup: "no"
-enable_cinder_backend_lvm: "yes"
-{% endif %}
-
 {% if scenario == "ipv6" %}
 enable_prometheus: "yes"
 enable_prometheus_openstack_exporter: "no"
diff --git a/tests/templates/inventory.j2 b/tests/templates/inventory.j2
index a3bea7213..e2c5ff338 100644
--- a/tests/templates/inventory.j2
+++ b/tests/templates/inventory.j2
@@ -218,9 +218,6 @@ control
 [bifrost:children]
 deployment
 
-[zun:children]
-control
-
 # TODO(gkoper): Remove redis group after G/2026.1 release
 [redis:children]
 control
@@ -601,19 +598,6 @@ designate
 [placement-api:children]
 placement
 
-# Zun
-[zun-api:children]
-zun
-
-[zun-wsproxy:children]
-zun
-
-[zun-compute:children]
-compute
-
-[zun-cni-daemon:children]
-compute
-
 # Tacker
 [tacker-server:children]
 tacker
diff --git a/tests/test-zun.sh b/tests/test-zun.sh
deleted file mode 100755
index 984bb03f6..000000000
--- a/tests/test-zun.sh
+++ /dev/null
@@ -1,169 +0,0 @@
-#!/bin/bash
-
-set -o xtrace
-set -o errexit
-
-export PYTHONUNBUFFERED=1
-
-function test_zun_logged {
-    . /etc/kolla/admin-openrc.sh
-    . ~/openstackclient-venv/bin/activate
-
-    container_engine="${1:-docker}"
-
-    echo "TESTING: Zun"
-    openstack appcontainer service list
-    openstack appcontainer host list
-    openstack subnet set --no-dhcp demo-subnet
-    sudo ${container_engine} pull quay.io/openstack.kolla/alpine
-    sudo ${container_engine} save quay.io/openstack.kolla/alpine | openstack image create alpine --public --container-format docker --disk-format raw
-    openstack appcontainer run --net network=demo-net --name test alpine sleep 1000
-    attempt=1
-    while [[ $(openstack appcontainer show test -f value -c status) != "Running" ]]; do
-        echo "Container not running yet"
-        attempt=$((attempt+1))
-        if [[ $attempt -eq 10 ]]; then
-            echo "Container failed to start"
-            openstack appcontainer show test
-            return 1
-        fi
-        sleep 10
-    done
-    openstack appcontainer list
-    openstack appcontainer show test
-    openstack appcontainer delete --force --stop test
-
-    # NOTE(yoctozepto): We have to wait for the container to be deleted due to
-    # check-failure.sh checking stopped containers and failing.
-    # It is also nice to test that deleting actually works.
-    attempt=1
-    while openstack appcontainer show test; do
-        echo "Container not deleted yet"
-        attempt=$((attempt+1))
-        if [[ $attempt -eq 10 ]]; then
-            echo "Zun failed to delete the container"
-            openstack appcontainer show test
-            return 1
-        fi
-        sleep 10
-    done
-
-    echo "SUCCESS: Zun"
-
-    echo "TESTING: Zun Cinder volume attachment"
-    openstack volume create --size 2 zun_test_volume
-    attempt=1
-    while [[ $(openstack volume show zun_test_volume -f value -c status) != "available" ]]; do
-        echo "Volume not available yet"
-        attempt=$((attempt+1))
-        if [[ $attempt -eq 10 ]]; then
-            echo "Volume failed to become available"
-            openstack volume show zun_test_volume
-            return 1
-        fi
-        sleep 10
-    done
-    openstack appcontainer run --net network=demo-net --name test2 --mount source=zun_test_volume,destination=/data alpine sleep 1000
-    attempt=1
-    while [[ $(openstack volume show zun_test_volume -f value -c status) != "in-use" ]]; do
-        echo "Volume not attached yet"
-        attempt=$((attempt+1))
-        if [[ $attempt -eq 10 ]]; then
-            echo "Volume failed to attach"
-            openstack volume show zun_test_volume
-            return 1
-        fi
-        sleep 10
-    done
-    attempt=1
-    while [[ $(openstack appcontainer show test2 -f value -c status) != "Running" ]]; do
-        echo "Container not running yet"
-        attempt=$((attempt+1))
-        if [[ $attempt -eq 10 ]]; then
-            echo "Container failed to start"
-            openstack appcontainer show test2
-            return 1
-        fi
-        sleep 10
-    done
-    openstack appcontainer delete --stop test2
-    attempt=1
-    while [[ $(openstack volume show zun_test_volume -f value -c status) != "available" ]]; do
-        echo "Volume not detached yet"
-        attempt=$((attempt+1))
-        if [[ $attempt -eq 10 ]]; then
-            echo "Volume failed to detach"
-            openstack volume show zun_test_volume
-            return 1
-        fi
-        sleep 10
-    done
-    openstack volume delete zun_test_volume
-    echo "SUCCESS: Zun Cinder volume attachment"
-
-    echo "TESTING: Zun capsule"
-    cat >/tmp/capsule.yaml <<EOF
-capsuleVersion: beta
-kind: capsule
-metadata:
-  name: capsule-test
-# NOTE(yoctozepto): Capsules do not support nets in Ussuri.
-# See https://bugs.launchpad.net/zun/+bug/1895263
-# The choice for CI is worked around by ensuring the networks are created
-# in the desired order in init-runonce.
-#nets:
-#  - network: demo-net
-spec:
-  containers:
-  - image: alpine
-    command:
-    - sleep
-    - "1000"
-EOF
-    zun capsule-create -f /tmp/capsule.yaml
-    attempt=1
-    while [[ $(zun capsule-describe capsule-test | awk '/ status /{print $4}') != "Running" ]]; do
-        echo "Capsule not running yet"
-        attempt=$((attempt+1))
-        if [[ $attempt -eq 10 ]]; then
-            echo "Capsule failed to start"
-            zun capsule-describe capsule-test
-            return 1
-        fi
-        sleep 10
-    done
-    zun capsule-list
-    zun capsule-describe capsule-test
-    zun capsule-delete capsule-test
-
-    attempt=1
-    while zun capsule-describe capsule-test; do
-        echo "Capsule not deleted yet"
-        attempt=$((attempt+1))
-        if [[ $attempt -eq 10 ]]; then
-            echo "Zun failed to delete the capsule"
-            zun capsule-describe capsule-test
-            return 1
-        fi
-        sleep 10
-    done
-    echo "SUCCESS: Zun capsule"
-}
-
-function test_zun {
-    echo "Testing Zun"
-    log_file=/tmp/logs/ansible/test-zun
-    if [[ -f $log_file ]]; then
-        log_file=${log_file}-upgrade
-    fi
-    test_zun_logged $1 > $log_file 2>&1
-    result=$?
-    if [[ $result != 0 ]]; then
-        echo "Testing Zun failed. See ansible/test-zun for details"
-    else
-        echo "Successfully tested Zun. See ansible/test-zun for details"
-    fi
-    return $result
-}
-
-test_zun $1