diff --git a/zuul.d/legacy-bifrost-jobs.yaml b/zuul.d/legacy-bifrost-jobs.yaml index 87f695d66..f4d5d66e9 100644 --- a/zuul.d/legacy-bifrost-jobs.yaml +++ b/zuul.d/legacy-bifrost-jobs.yaml @@ -45,14 +45,7 @@ nodeset: centos-7 - job: - name: bifrost-integration-dhcp-opensuse-423 - parent: bifrost-integration-dhcp - nodeset: opensuse-423 - vars: - use_venv: true - -- job: - name: bifrost-integration-dhcp-opensuse-150 + name: bifrost-integration-dhcp-opensuse-15 parent: bifrost-integration-dhcp nodeset: opensuse-150 vars: @@ -76,14 +69,7 @@ nodeset: centos-7 - job: - name: bifrost-integration-dibipa-debian-opensuse-423 - parent: bifrost-integration-dibipa-debian - nodeset: opensuse-423 - vars: - use_venv: true - -- job: - name: bifrost-integration-dibipa-debian-opensuse-150 + name: bifrost-integration-dibipa-debian-opensuse-15 parent: bifrost-integration-dibipa-debian nodeset: opensuse-150 vars: @@ -114,14 +100,7 @@ nodeset: centos-7 - job: - name: bifrost-integration-tinyipa-opensuse-423 - parent: bifrost-integration-tinyipa - nodeset: opensuse-423 - vars: - use_venv: true - -- job: - name: bifrost-integration-tinyipa-opensuse-150 + name: bifrost-integration-tinyipa-opensuse-15 parent: bifrost-integration-tinyipa nodeset: opensuse-150 vars: diff --git a/zuul.d/project.yaml b/zuul.d/project.yaml index 5af7222d9..83ffcd548 100644 --- a/zuul.d/project.yaml +++ b/zuul.d/project.yaml @@ -9,14 +9,11 @@ jobs: - bifrost-integration-tinyipa-ubuntu-xenial - bifrost-integration-tinyipa-keystone-ubuntu-xenial - - bifrost-integration-tinyipa-opensuse-423 - - bifrost-integration-tinyipa-opensuse-150 + - bifrost-integration-tinyipa-opensuse-15 # Non-voting jobs - bifrost-integration-dhcp-ubuntu-xenial: voting: false - - bifrost-integration-dhcp-opensuse-423: - voting: false - - bifrost-integration-dhcp-opensuse-150: + - bifrost-integration-dhcp-opensuse-15: voting: false - bifrost-integration-dhcp-centos-7: voting: false @@ -24,9 +21,7 @@ voting: false - bifrost-integration-dibipa-debian-ubuntu-xenial: voting: false - - bifrost-integration-dibipa-debian-opensuse-423: - voting: false - - bifrost-integration-dibipa-debian-opensuse-150: + - bifrost-integration-dibipa-debian-opensuse-15: voting: false - bifrost-integration-tinyipa-centos-7: voting: false @@ -35,6 +30,5 @@ jobs: - bifrost-integration-tinyipa-ubuntu-xenial - bifrost-integration-tinyipa-keystone-ubuntu-xenial - - bifrost-integration-tinyipa-opensuse-423 - - bifrost-integration-tinyipa-opensuse-150 + - bifrost-integration-tinyipa-opensuse-15 - openstack-tox-lower-constraints