diff --git a/zuul.d/base.yaml b/zuul.d/base.yaml index 91c6d22f5d..9c1899525d 100644 --- a/zuul.d/base.yaml +++ b/zuul.d/base.yaml @@ -240,7 +240,7 @@ timeout: 7200 vars: osh_params: - openstack_release: wallaby + openstack_release: "2023.1" container_distro_name: ubuntu container_distro_version: focal feature_gates: netpol @@ -271,7 +271,7 @@ timeout: 7200 vars: osh_params: - openstack_release: wallaby + openstack_release: "2023.1" container_distro_name: ubuntu container_distro_version: focal feature_gates: netpol diff --git a/zuul.d/project.yaml b/zuul.d/project.yaml index 18588a7501..d546b43309 100644 --- a/zuul.d/project.yaml +++ b/zuul.d/project.yaml @@ -62,16 +62,6 @@ - openstack-helm-tacker-2023-1-ubuntu_focal periodic-weekly: jobs: - # Victoria - - openstack-helm-cinder-victoria-ubuntu_focal - - openstack-helm-compute-kit-victoria-ubuntu_focal - # Wallaby - - openstack-helm-cinder-wallaby-ubuntu_focal - - openstack-helm-compute-kit-wallaby-ubuntu_focal - # Xena - - openstack-helm-cinder-xena-ubuntu_focal - - openstack-helm-compute-kit-xena-ubuntu_focal - - openstack-helm-horizon-xena-ubuntu_focal # Zed - openstack-helm-horizon-zed-ubuntu_focal - openstack-helm-horizon-zed-ubuntu_jammy diff --git a/zuul.d/victoria.yaml b/zuul.d/victoria.yaml deleted file mode 100644 index 7a29bb5e24..0000000000 --- a/zuul.d/victoria.yaml +++ /dev/null @@ -1,32 +0,0 @@ ---- -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -- job: - name: openstack-helm-cinder-victoria-ubuntu_focal - parent: openstack-helm-cinder - nodeset: openstack-helm-1node-ubuntu_focal - vars: - osh_params: - openstack_release: victoria - container_distro_name: ubuntu - container_distro_version: focal - -- job: - name: openstack-helm-compute-kit-victoria-ubuntu_focal - parent: openstack-helm-compute-kit - nodeset: openstack-helm-1node-ubuntu_focal - vars: - osh_params: - openstack_release: victoria - container_distro_name: ubuntu - container_distro_version: focal diff --git a/zuul.d/wallaby.yaml b/zuul.d/wallaby.yaml deleted file mode 100644 index b0778dd3c7..0000000000 --- a/zuul.d/wallaby.yaml +++ /dev/null @@ -1,42 +0,0 @@ ---- -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -- job: - name: openstack-helm-cinder-wallaby-ubuntu_focal - parent: openstack-helm-cinder - nodeset: openstack-helm-1node-ubuntu_focal - vars: - osh_params: - openstack_release: wallaby - container_distro_name: ubuntu - container_distro_version: focal - -- job: - name: openstack-helm-compute-kit-wallaby-ubuntu_focal - parent: openstack-helm-compute-kit - nodeset: openstack-helm-1node-ubuntu_focal - vars: - osh_params: - openstack_release: wallaby - container_distro_name: ubuntu - container_distro_version: focal - -- job: - name: openstack-helm-horizon-wallaby-ubuntu_focal - parent: openstack-helm-horizon - nodeset: openstack-helm-1node-ubuntu_focal - vars: - osh_params: - openstack_release: wallaby - container_distro_name: ubuntu - container_distro_version: focal diff --git a/zuul.d/xena.yaml b/zuul.d/xena.yaml deleted file mode 100644 index b9a1bbcebf..0000000000 --- a/zuul.d/xena.yaml +++ /dev/null @@ -1,42 +0,0 @@ ---- -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -- job: - name: openstack-helm-cinder-xena-ubuntu_focal - parent: openstack-helm-cinder - nodeset: openstack-helm-1node-ubuntu_focal - vars: - osh_params: - openstack_release: xena - container_distro_name: ubuntu - container_distro_version: focal - -- job: - name: openstack-helm-compute-kit-xena-ubuntu_focal - parent: openstack-helm-compute-kit - nodeset: openstack-helm-1node-32GB-ubuntu_focal - vars: - osh_params: - openstack_release: xena - container_distro_name: ubuntu - container_distro_version: focal - -- job: - name: openstack-helm-horizon-xena-ubuntu_focal - parent: openstack-helm-horizon - nodeset: openstack-helm-1node-ubuntu_focal - vars: - osh_params: - openstack_release: xena - container_distro_name: ubuntu - container_distro_version: focal