diff --git a/zuul.d/jobs-openstack-helm.yaml b/zuul.d/jobs-openstack-helm.yaml index c7ed0595c9..fe049491b1 100644 --- a/zuul.d/jobs-openstack-helm.yaml +++ b/zuul.d/jobs-openstack-helm.yaml @@ -37,7 +37,7 @@ timeout: 7200 vars: zuul_osh_infra_relative_path: ../openstack-helm-infra/ - osh_openstack_release: stein + osh_openstack_release: train gate_scripts: [] pre-run: - tools/gate/playbooks/osh-infra-upgrade-host.yaml @@ -53,7 +53,7 @@ parent: openstack-helm-chart-deploy vars: osh_params: - openstack_release: stein + openstack_release: train container_distro_name: ubuntu container_distro_version: bionic feature_gates: ldap @@ -75,7 +75,7 @@ parent: openstack-helm-chart-deploy vars: osh_params: - openstack_release: stein + openstack_release: train container_distro_name: ubuntu container_distro_version: bionic gate_scripts_relative_path: ../openstack-helm @@ -93,64 +93,6 @@ - ./tools/deployment/component/cinder/cinder.sh - ./tools/deployment/common/force-cronjob-run.sh -- job: - name: openstack-helm-cinder-pike-ubuntu_xenial - parent: openstack-helm-cinder - vars: - osh_params: - openstack_release: pike - container_distro_name: ubuntu - container_distro_version: xenial -- job: - name: openstack-helm-cinder-queens-ubuntu_xenial - parent: openstack-helm-cinder - vars: - osh_params: - openstack_release: queens - container_distro_name: ubuntu - container_distro_version: xenial -- job: - name: openstack-helm-cinder-rocky-ubuntu_xenial - parent: openstack-helm-cinder - vars: - osh_params: - openstack_release: rocky - container_distro_name: ubuntu - container_distro_version: xenial -- job: - name: openstack-helm-cinder-rocky-ubuntu_bionic - parent: openstack-helm-cinder - vars: - osh_params: - openstack_release: rocky - container_distro_name: ubuntu - container_distro_version: bionic -- job: - name: openstack-helm-cinder-rocky-opensuse_15 - parent: openstack-helm-cinder - vars: - osh_params: - openstack_release: rocky - container_distro_name: opensuse - container_distro_version: '15' -- job: - name: openstack-helm-cinder-ocata-ubuntu_xenial - parent: openstack-helm-cinder - vars: - osh_params: - openstack_release: ocata - container_distro_name: ubuntu - container_distro_version: xenial - -- job: - name: openstack-helm-cinder-stein-ubuntu_bionic - parent: openstack-helm-cinder - vars: - osh_params: - openstack_release: stein - container_distro_name: ubuntu - container_distro_version: bionic - - job: name: openstack-helm-cinder-train-ubuntu_bionic parent: openstack-helm-cinder @@ -174,7 +116,7 @@ parent: openstack-helm-chart-deploy vars: osh_params: - openstack_release: stein + openstack_release: train container_distro_name: ubuntu container_distro_version: bionic run_helm_tests: "no" @@ -202,64 +144,6 @@ - - ./tools/deployment/developer/common/900-use-it.sh - ./tools/deployment/common/force-cronjob-run.sh -- job: - name: openstack-helm-compute-kit-pike-ubuntu_xenial - parent: openstack-helm-compute-kit - vars: - osh_params: - openstack_release: pike - container_distro_name: ubuntu - container_distro_version: xenial -- job: - name: openstack-helm-compute-kit-queens-ubuntu_xenial - parent: openstack-helm-compute-kit - vars: - osh_params: - openstack_release: queens - container_distro_name: ubuntu - container_distro_version: xenial -- job: - name: openstack-helm-compute-kit-rocky-ubuntu_xenial - parent: openstack-helm-compute-kit - vars: - osh_params: - openstack_release: rocky - container_distro_name: ubuntu - container_distro_version: xenial -- job: - name: openstack-helm-compute-kit-rocky-ubuntu_bionic - parent: openstack-helm-compute-kit - vars: - osh_params: - openstack_release: rocky - container_distro_name: ubuntu - container_distro_version: bionic -- job: - name: openstack-helm-compute-kit-rocky-opensuse_15 - parent: openstack-helm-compute-kit - vars: - osh_params: - openstack_release: rocky - container_distro_name: opensuse - container_distro_version: '15' -- job: - name: openstack-helm-compute-kit-ocata-ubuntu_xenial - parent: openstack-helm-compute-kit - vars: - osh_params: - openstack_release: ocata - container_distro_name: ubuntu - container_distro_version: xenial - -- job: - name: openstack-helm-compute-kit-stein-ubuntu_bionic - parent: openstack-helm-compute-kit - vars: - osh_params: - openstack_release: stein - container_distro_name: ubuntu - container_distro_version: bionic - - job: name: openstack-helm-compute-kit-train-ubuntu_bionic parent: openstack-helm-compute-kit @@ -347,7 +231,7 @@ timeout: 9600 vars: osh_params: - openstack_release: stein + openstack_release: train container_distro_name: ubuntu container_distro_version: bionic feature_gates: apparmor @@ -378,7 +262,7 @@ timeout: 9600 vars: osh_params: - openstack_release: stein + openstack_release: train container_distro_name: ubuntu container_distro_version: bionic feature_gates: apparmor @@ -539,7 +423,7 @@ timeout: 7200 vars: osh_params: - openstack_release: stein + openstack_release: train container_distro_name: ubuntu container_distro_version: bionic feature_gates: netpol @@ -572,7 +456,7 @@ timeout: 7200 vars: osh_params: - openstack_release: stein + openstack_release: train container_distro_name: ubuntu container_distro_version: bionic feature_gates: netpol @@ -600,7 +484,7 @@ roles: - zuul: openstack/openstack-helm-infra vars: - osh_openstack_release: stein + osh_openstack_release: train zuul_osh_infra_relative_path: ../openstack-helm-infra/ timeout: 7200 pre-run: diff --git a/zuul.d/project.yaml b/zuul.d/project.yaml index 6de16c139c..1c62a7181d 100644 --- a/zuul.d/project.yaml +++ b/zuul.d/project.yaml @@ -46,16 +46,6 @@ periodic: jobs: - openstack-helm-keystone-ldap - - openstack-helm-cinder-ocata-ubuntu_xenial - - openstack-helm-cinder-pike-ubuntu_xenial - - openstack-helm-cinder-queens-ubuntu_xenial - - openstack-helm-cinder-rocky-ubuntu_bionic - - openstack-helm-cinder-stein-ubuntu_bionic - - openstack-helm-compute-kit-ocata-ubuntu_xenial - - openstack-helm-compute-kit-pike-ubuntu_xenial - - openstack-helm-compute-kit-queens-ubuntu_xenial - - openstack-helm-compute-kit-rocky-ubuntu_bionic - - openstack-helm-compute-kit-stein-ubuntu_bionic - openstack-helm-tungsten-fabric-train - openstack-helm-tungsten-fabric-ussuri experimental: