From a2bad0296804138c5be7af350ef5f69aa63c4ad8 Mon Sep 17 00:00:00 2001 From: Brian Haley Date: Sat, 19 Aug 2023 12:06:57 -0400 Subject: [PATCH] Change to use openstack instead of nova command One of the playbooks was using 'nova flavor-create', which was causing failures in the neutron gate. Change to use 'openstack flavor create' instead as nova has been deprecated for a while. Change-Id: I193396ecdff50748c8253287d3e9a273be843db4 Closes-bug: #2031971 --- .zuul.d/zuul.yaml | 141 +++++++++--------- .../prepare-for-rally-task/tasks/main.yaml | 2 +- 2 files changed, 71 insertions(+), 72 deletions(-) diff --git a/.zuul.d/zuul.yaml b/.zuul.d/zuul.yaml index 2bbb42d3..964fd0a2 100644 --- a/.zuul.d/zuul.yaml +++ b/.zuul.d/zuul.yaml @@ -9,32 +9,32 @@ - rally-tox-py39 - rally-tox-py310 #- rally-dsvm-tox-functional - #- rally-openstack-docker-build + - rally-openstack-docker-build #- rally-task-basic-with-existing-users - #- rally-task-simple-job - #- rally-task-barbican: - # files: - # - .zuul.d/zuul.yaml - # - rally-jobs/barbican.yaml - # - rally_openstack/common/osclients.py - # - rally_openstack/common/services/key_manager - # - rally_openstack/task/cleanup/resources.py - # - rally_openstack/task/scenarios/barbican - # - tests/ci/playbooks - #- rally-task-cinder - #- rally-task-designate: - # files: - # - .zuul.d/zuul.yaml - # - rally-jobs/designate.yaml - # - rally_openstack/common/osclients.py - # - rally_openstack/task/cleanup/resources.py - # - rally_openstack/task/contexts/designate - # - rally_openstack/task/scenarios/designate - # - tests/ci/playbooks + - rally-task-simple-job + - rally-task-barbican: + files: + - .zuul.d/zuul.yaml + - rally-jobs/barbican.yaml + - rally_openstack/common/osclients.py + - rally_openstack/common/services/key_manager + - rally_openstack/task/cleanup/resources.py + - rally_openstack/task/scenarios/barbican + - tests/ci/playbooks + - rally-task-cinder + - rally-task-designate: + files: + - .zuul.d/zuul.yaml + - rally-jobs/designate.yaml + - rally_openstack/common/osclients.py + - rally_openstack/task/cleanup/resources.py + - rally_openstack/task/contexts/designate + - rally_openstack/task/scenarios/designate + - tests/ci/playbooks #- rally-task-heat: # voting: false #- rally-task-ironic - #- rally-task-keystone-glance-swift + - rally-task-keystone-glance-swift #- rally-task-magnum: # voting: false # files: @@ -45,42 +45,41 @@ # - rally_openstack/task/contexts/magnum # - rally_openstack/task/scenarios/magnum # - tests/ci/playbooks - #- rally-task-manila-no-ss: - # voting: false - #- rally-task-manila-ss: - # voting: false + - rally-task-manila-no-ss: + voting: false + - rally-task-manila-ss: + voting: false #- rally-task-mistral # it did not work for a long time. try to re-configure it #- rally-task-monasca #- rally-task-murano: # voting: false - #- rally-task-neutron - #- rally-task-neutron-trunk: - # files: - # - .zuul.d/zuul.yaml - # - rally-jobs/neutron-trunk.yaml - # - rally_openstack/common/osclients.py - # - rally_openstack/common/services/network - # - rally_openstack/task/cleanup/resources.py - # - rally_openstack/task/contexts/network - # - rally_openstack/task/scenarios/neutron/trunk.py - # - rally_openstack/task/scenarios/neutron/network.py - # - tests/ci/playbooks - #- rally-task-neutron-with-extensions: - # voting: false + - rally-task-neutron + - rally-task-neutron-trunk: + files: + - .zuul.d/zuul.yaml + - rally-jobs/neutron-trunk.yaml + - rally_openstack/common/osclients.py + - rally_openstack/common/services/network + - rally_openstack/task/cleanup/resources.py + - rally_openstack/task/contexts/network + - rally_openstack/task/scenarios/neutron/trunk.py + - rally_openstack/task/scenarios/neutron/network.py + - tests/ci/playbooks + - rally-task-neutron-with-extensions: + voting: false #- rally-task-nova: # voting: false # it did not work for a long time #- rally-task-senlin #- rally-task-octavia: # voting: false - #- rally-task-telemetry: - # voting: false - #- rally-task-watcher: - # # watcher-api did not start last time - # voting: false - #- rally-task-zaqar: - # voting: false + - rally-task-telemetry: + voting: false + - rally-task-watcher: + voting: false + - rally-task-zaqar: + voting: false #- rally-verify-tempest gate: jobs: @@ -92,34 +91,34 @@ - rally-tox-py39 - rally-tox-py310 #- rally-dsvm-tox-functional - #- rally-openstack-docker-build + - rally-openstack-docker-build #- rally-task-basic-with-existing-users - #- rally-task-simple-job - #- rally-task-barbican: - # files: - # - .zuul.d/zuul.yaml - # - rally-jobs/barbican.yaml - # - rally_openstack/common/osclients.py - # - rally_openstack/common/services/key_manager - # - rally_openstack/task/cleanup/resources.py - # - rally_openstack/task/scenarios/barbican - # - tests/ci/playbooks - #- rally-task-cinder + - rally-task-simple-job + - rally-task-barbican: + files: + - .zuul.d/zuul.yaml + - rally-jobs/barbican.yaml + - rally_openstack/common/osclients.py + - rally_openstack/common/services/key_manager + - rally_openstack/task/cleanup/resources.py + - rally_openstack/task/scenarios/barbican + - tests/ci/playbooks + - rally-task-cinder #- rally-task-heat #- rally-task-ironic - #- rally-task-keystone-glance-swift + - rally-task-keystone-glance-swift #- rally-task-mistral - #- rally-task-neutron - #- rally-task-neutron-trunk: - # files: - # - rally-jobs/neutron-trunk.yaml - # - rally_openstack/common/osclients.py - # - rally_openstack/common/services/network - # - rally_openstack/task/cleanup/resources.py - # - rally_openstack/task/contexts/network - # - rally_openstack/task/scenarios/neutron/trunk.py - # - rally_openstack/task/scenarios/neutron/network.py - # - tests/ci/playbooks + - rally-task-neutron + - rally-task-neutron-trunk: + files: + - rally-jobs/neutron-trunk.yaml + - rally_openstack/common/osclients.py + - rally_openstack/common/services/network + - rally_openstack/task/cleanup/resources.py + - rally_openstack/task/contexts/network + - rally_openstack/task/scenarios/neutron/trunk.py + - rally_openstack/task/scenarios/neutron/network.py + - tests/ci/playbooks #- rally-verify-tempest post: jobs: diff --git a/tests/ci/playbooks/roles/prepare-for-rally-task/tasks/main.yaml b/tests/ci/playbooks/roles/prepare-for-rally-task/tasks/main.yaml index f0756825..1e027be8 100644 --- a/tests/ci/playbooks/roles/prepare-for-rally-task/tasks/main.yaml +++ b/tests/ci/playbooks/roles/prepare-for-rally-task/tasks/main.yaml @@ -140,7 +140,7 @@ if rally deployment check | grep 'nova' | grep 'Available' > /dev/null; then - nova flavor-create m1.nano 42 64 0 1 + openstack flavor create --id 42 --ram 64 --disk 0 --vcpus 1 m1.nano fi - name: Check the existence of rally_task