From 0408ccdde5ca95033a3372d2d597067433d9d19a Mon Sep 17 00:00:00 2001
From: Vladimir Kozhukalov <kozhukalov@gmail.com>
Date: Fri, 16 Jan 2026 16:54:53 -0600
Subject: [PATCH] [neutron] Remove outdated purge container

The rally test pod used to utilize ospurge
for resetting the end. The ospurge is outdated
and we've not been using this option recently

.conf.rally_tests.force_project_purge

Signed-off-by: Vladimir Kozhukalov <kozhukalov@gmail.com>
Change-Id: Ie5f4a46c7908608231f21eeda56fadd62bc002ba
---
 neutron/templates/pod-rally-test.yaml | 35 ---------------------------
 neutron/values.yaml                   |  8 ------
 2 files changed, 43 deletions(-)

diff --git a/neutron/templates/pod-rally-test.yaml b/neutron/templates/pod-rally-test.yaml
index 15165cf006..68d11434fb 100644
--- a/neutron/templates/pod-rally-test.yaml
+++ b/neutron/templates/pod-rally-test.yaml
@@ -73,41 +73,6 @@ spec:
 {{- end }}
         - name: SERVICE_OS_ROLE
           value: {{ .Values.endpoints.identity.auth.test.role | quote }}
-{{ if $envAll.Values.conf.rally_tests.force_project_purge }}
-    - name: {{ .deployment_name }}-reset
-{{ tuple $envAll "purge_test" | include "helm-toolkit.snippets.image" | indent 6 }}
-      env:
-{{- with $env := dict "ksUserSecret" .Values.secrets.identity.admin "useCA" .Values.manifests.certificates }}
-{{- include "helm-toolkit.snippets.keystone_openrc_env_vars" $env | indent 8 }}
-{{- end }}
-{{- with $env := dict "ksUserSecret" .Values.secrets.identity.test }}
-{{- include "helm-toolkit.snippets.keystone_user_create_env_vars" $env | indent 8 }}
-{{- end }}
-        - name: OS_TEST_PROJECT_NAME
-          value: {{ .Values.endpoints.identity.auth.test.project_name }}
-        - name: OS_TEST_PROJECT_DOMAIN_NAME
-          value: {{ .Values.endpoints.identity.auth.test.domain_name }}
-        - name: NETWORK_QUOTA
-          value: {{ (first (index .Values.conf.rally_tests.tests "NeutronNetworks.create_and_delete_networks")).context.quotas.neutron.network | quote }}
-        - name: PORT_QUOTA
-          value: {{ (first (index .Values.conf.rally_tests.tests "NeutronNetworks.create_and_delete_ports")).context.quotas.neutron.port | quote }}
-        - name: ROUTER_QUOTA
-          value: {{ (first (index .Values.conf.rally_tests.tests "NeutronNetworks.create_and_delete_routers")).context.quotas.neutron.router | quote }}
-        - name: SUBNET_QUOTA
-          value: {{ (first (index .Values.conf.rally_tests.tests "NeutronNetworks.create_and_delete_subnets")).context.quotas.neutron.subnet | quote }}
-        - name: SEC_GROUP_QUOTA
-          value: {{ (first (index .Values.conf.rally_tests.tests "NeutronSecurityGroup.create_and_list_security_groups")).context.quotas.neutron.security_group | quote }}
-      command:
-        - /tmp/neutron-test-force-cleanup.sh
-      volumeMounts:
-        - name: neutron-bin
-          mountPath: /tmp/neutron-test-force-cleanup.sh
-          subPath: neutron-test-force-cleanup.sh
-          readOnly: true
-        - name: pod-tmp
-          mountPath: /tmp/pod-tmp
-{{- dict "enabled" .Values.manifests.certificates "name" .Values.secrets.tls.network.server.internal | include "helm-toolkit.snippets.tls_volume_mount" | indent 8 }}
-{{ end }}
   containers:
     - name: neutron-test
 {{ tuple $envAll "test" | include "helm-toolkit.snippets.image" | indent 6 }}
diff --git a/neutron/values.yaml b/neutron/values.yaml
index 29e3420290..884d24fd4b 100644
--- a/neutron/values.yaml
+++ b/neutron/values.yaml
@@ -22,7 +22,6 @@ images:
   tags:
     bootstrap: quay.io/airshipit/openstack-client:2025.1-ubuntu_noble
     test: docker.io/xrally/xrally-openstack:2.0.0
-    purge_test: docker.io/openstackhelm/ospurge:latest
     db_init: quay.io/airshipit/openstack-client:2025.1-ubuntu_noble
     neutron_db_sync: quay.io/airshipit/neutron:2025.1-ubuntu_noble
     db_drop: quay.io/airshipit/openstack-client:2025.1-ubuntu_noble
@@ -1072,7 +1071,6 @@ pod:
 
 conf:
   rally_tests:
-    force_project_purge: false
     run_tempest: false
     clean_up: |
       # NOTE: We will make the best effort to clean up rally generated networks and routers,
@@ -2549,12 +2547,6 @@ endpoints:
         region_name: RegionOne
         username: neutron-test
         password: password
-        # NOTE: this project will be purged and reset if
-        # conf.rally_tests.force_project_purge is set to true
-        # which may be required upon test failure, but be aware that this will
-        # expunge all openstack objects, so if this is used a seperate project
-        # should be used for each helm test, and also it should be ensured
-        # that this project is not in use by other tenants
         project_name: test
         user_domain_name: service
         project_domain_name: service