From 2a03fd65bf0ab33fdc7ceffd9a4c331b25629b23 Mon Sep 17 00:00:00 2001 From: Jaesang Lee Date: Wed, 19 Dec 2018 08:52:02 +0000 Subject: [PATCH] Upgrade rally to 1.3.0 Since rally 1.0, rally has been a platform for testing, and rally for openstack has been separated by rally-openstack. The current version of rally in openstack-helm is version 0.8 which corresponds to ocata. This patch tests with the latest version of rally-openstack, version 1.3.0, and removes scenarios that are no longer in use. Change-Id: I380a976c0f48c4af0796c9d866fc8787025ce548 --- ceilometer/values.yaml | 2 +- cinder/values.yaml | 2 +- glance/values.yaml | 2 +- heat/values.yaml | 2 +- keystone/values.yaml | 2 +- mistral/values.yaml | 2 +- neutron/values.yaml | 2 +- nova/values.yaml | 42 +------ rally/templates/bin/_manage-db.sh.tpl | 6 +- rally/values.yaml | 137 +-------------------- tools/overrides/releases/newton/kolla.yaml | 2 +- tools/overrides/releases/newton/loci.yaml | 2 +- tools/overrides/releases/ocata/kolla.yaml | 2 +- tools/overrides/releases/ocata/loci.yaml | 2 +- tools/overrides/releases/pike/kolla.yaml | 2 +- tools/overrides/releases/pike/loci.yaml | 2 +- 16 files changed, 21 insertions(+), 190 deletions(-) diff --git a/ceilometer/values.yaml b/ceilometer/values.yaml index 502196793f..cb8863e031 100644 --- a/ceilometer/values.yaml +++ b/ceilometer/values.yaml @@ -44,7 +44,7 @@ labels: images: tags: - test: docker.io/kolla/ubuntu-binary-rally:4.0.0 + test: docker.io/xrally/xrally-openstack:1.3.0 db_init_mongodb: docker.io/mongo:3.4.9-jessie db_init: docker.io/kolla/ubuntu-source-ceilometer-api:3.0.3 ceilometer_db_sync: docker.io/kolla/ubuntu-source-ceilometer-api:3.0.3 diff --git a/cinder/values.yaml b/cinder/values.yaml index 63689c5881..7a62905a04 100644 --- a/cinder/values.yaml +++ b/cinder/values.yaml @@ -43,7 +43,7 @@ release_group: null images: tags: - test: docker.io/kolla/ubuntu-source-rally:4.0.0 + test: docker.io/xrally/xrally-openstack:1.3.0 db_init: docker.io/openstackhelm/heat:ocata cinder_db_sync: docker.io/openstackhelm/cinder:ocata db_drop: docker.io/openstackhelm/heat:ocata diff --git a/glance/values.yaml b/glance/values.yaml index ac64f09fae..ca1bfa9ad0 100644 --- a/glance/values.yaml +++ b/glance/values.yaml @@ -38,7 +38,7 @@ release_group: null images: tags: - test: docker.io/kolla/ubuntu-source-rally:4.0.0 + test: docker.io/xrally/xrally-openstack:1.3.0 glance_storage_init: docker.io/port/ceph-config-helper:v1.10.3 db_init: docker.io/openstackhelm/heat:ocata glance_db_sync: docker.io/openstackhelm/glance:ocata diff --git a/heat/values.yaml b/heat/values.yaml index a3c257235f..fc1fa6de0e 100644 --- a/heat/values.yaml +++ b/heat/values.yaml @@ -41,7 +41,7 @@ labels: images: tags: - test: docker.io/kolla/ubuntu-source-rally:4.0.0 + test: docker.io/xrally/xrally-openstack:1.3.0 bootstrap: docker.io/openstackhelm/heat:ocata db_init: docker.io/openstackhelm/heat:ocata heat_db_sync: docker.io/openstackhelm/heat:ocata diff --git a/keystone/values.yaml b/keystone/values.yaml index 338cd4365e..cb853ab7df 100644 --- a/keystone/values.yaml +++ b/keystone/values.yaml @@ -30,7 +30,7 @@ release_group: null images: tags: bootstrap: docker.io/openstackhelm/heat:ocata - test: docker.io/kolla/ubuntu-source-rally:4.0.0 + test: docker.io/xrally/xrally-openstack:1.3.0 db_init: docker.io/openstackhelm/heat:ocata keystone_db_sync: docker.io/openstackhelm/keystone:ocata db_drop: docker.io/openstackhelm/heat:ocata diff --git a/mistral/values.yaml b/mistral/values.yaml index 9e28adb612..afaba51513 100644 --- a/mistral/values.yaml +++ b/mistral/values.yaml @@ -41,7 +41,7 @@ release_group: null images: tags: - test: docker.io/kolla/ubuntu-source-rally:4.0.0 + test: docker.io/xrally/xrally-openstack:1.3.0 bootstrap: docker.io/openstackhelm/heat:ocata dep_check: quay.io/stackanetes/kubernetes-entrypoint:v0.3.1 db_init: docker.io/openstackhelm/heat:ocata diff --git a/neutron/values.yaml b/neutron/values.yaml index 5c16c51629..4cfc04ea27 100644 --- a/neutron/values.yaml +++ b/neutron/values.yaml @@ -22,7 +22,7 @@ release_group: null images: tags: bootstrap: docker.io/openstackhelm/heat:ocata - test: docker.io/kolla/ubuntu-source-rally:4.0.0 + test: docker.io/xrally/xrally-openstack:1.3.0 db_init: docker.io/openstackhelm/heat:ocata neutron_db_sync: docker.io/openstackhelm/neutron:ocata db_drop: docker.io/openstackhelm/heat:ocata diff --git a/nova/values.yaml b/nova/values.yaml index 8abe711f47..aaee5e35ee 100644 --- a/nova/values.yaml +++ b/nova/values.yaml @@ -87,7 +87,7 @@ images: nova_service_cleaner: 'docker.io/port/ceph-config-helper:v1.10.3' nova_spiceproxy: docker.io/openstackhelm/nova:ocata nova_spiceproxy_assets: 'docker.io/kolla/ubuntu-source-nova-spicehtml5proxy:ocata' - test: 'docker.io/kolla/ubuntu-source-rally:4.0.0' + test: docker.io/xrally/xrally-openstack:1.3.0 image_repo_sync: docker.io/docker:17.07.0 local_registry: active: false @@ -581,14 +581,6 @@ conf: sla: failure_rate: max: 0 - NovaHosts.list_hosts: - - runner: - concurrency: 1 - times: 1 - type: constant - sla: - failure_rate: - max: 0 NovaHypervisors.list_and_get_hypervisors: - args: detailed: true @@ -664,38 +656,6 @@ conf: sla: failure_rate: max: 0 - NovaSecGroup.create_and_delete_secgroups: - - args: - rules_per_security_group: 1 - security_group_count: 1 - runner: - concurrency: 1 - times: 1 - type: constant - sla: - failure_rate: - max: 0 - NovaSecGroup.create_and_list_secgroups: - - args: - rules_per_security_group: 1 - security_group_count: 1 - runner: - concurrency: 1 - times: 1 - type: constant - sla: - failure_rate: - max: 0 - NovaSecGroup.create_and_update_secgroups: - - args: - security_group_count: 1 - runner: - concurrency: 1 - times: 1 - type: constant - sla: - failure_rate: - max: 0 NovaServerGroups.create_and_list_server_groups: - args: all_projects: false diff --git a/rally/templates/bin/_manage-db.sh.tpl b/rally/templates/bin/_manage-db.sh.tpl index d3011f3ff4..5681c39105 100644 --- a/rally/templates/bin/_manage-db.sh.tpl +++ b/rally/templates/bin/_manage-db.sh.tpl @@ -19,12 +19,12 @@ limitations under the License. set -ex function create_or_update_db () { - revisionResults=$(rally-manage db revision) + revisionResults=$(rally db revision) if [ $revisionResults = "None" ] then - rally-manage db create + rally db create else - rally-manage db upgrade + rally db upgrade fi } diff --git a/rally/values.yaml b/rally/values.yaml index bd1ebb71c2..bb7e87ad8b 100644 --- a/rally/values.yaml +++ b/rally/values.yaml @@ -26,11 +26,11 @@ labels: images: tags: - bootstrap: docker.io/kolla/ubuntu-source-rally:ocata + bootstrap: docker.io/xrally/xrally-openstack:1.3.0 dep_check: quay.io/stackanetes/kubernetes-entrypoint:v0.3.1 - db_init: docker.io/kolla/ubuntu-source-rally:ocata - rally_db_sync: docker.io/kolla/ubuntu-source-rally:ocata - run_task: docker.io/kolla/ubuntu-source-rally:ocata + db_init: docker.io/xrally/xrally-openstack:1.3.0 + rally_db_sync: docker.io/xrally/xrally-openstack:1.3.0 + run_task: docker.io/xrally/xrally-openstack:1.3.0 ks_user: docker.io/openstackhelm/heat:ocata ks_service: docker.io/openstackhelm/heat:ocata ks_endpoints: docker.io/openstackhelm/heat:ocata @@ -11855,26 +11855,6 @@ conf: concurrency: 2 times: 10 type: constant - NovaHosts.list_and_get_hosts: - - - args: {} - context: - users: - tenants: 2 - users_per_tenant: 2 - runner: - concurrency: 2 - times: 10 - type: constant - sla: - failure_rate: - max: 0 - NovaHosts.list_hosts: - - - runner: - concurrency: 2 - times: 10 - type: constant NovaHypervisors.list_and_get_hypervisors: - args: @@ -11998,115 +11978,6 @@ conf: concurrency: 2 times: 10 type: constant - NovaSecGroup.boot_and_delete_server_with_secgroups: - - - args: - flavor: - name: m1.tiny - image: - name: cirros-0.3.5-x86_64-disk.img - rules_per_security_group: 10 - security_group_count: 10 - context: - network: - start_cidr: 100.1.0.0/26 - users: - tenants: 3 - users_per_tenant: 2 - images: - image_url: "http://download.cirros-cloud.net/0.3.5/cirros-0.3.5-x86_64-disk.img" - image_name: cirros-0.3.5-x86_64-disk.img - image_type: qcow2 - image_container: bare - images_per_tenant: 1 - runner: - concurrency: 2 - times: 10 - type: constant - NovaSecGroup.boot_server_and_add_secgroups: - - - args: - flavor: - name: m1.tiny - image: - name: cirros-0.3.5-x86_64-disk.img - rules_per_security_group: 10 - security_group_count: 10 - context: - network: - start_cidr: 100.1.0.0/26 - users: - tenants: 3 - users_per_tenant: 2 - images: - image_url: "http://download.cirros-cloud.net/0.3.5/cirros-0.3.5-x86_64-disk.img" - image_name: cirros-0.3.5-x86_64-disk.img - image_type: qcow2 - image_container: bare - images_per_tenant: 1 - runner: - concurrency: 2 - times: 5 - type: constant - sla: - failure_rate: - max: 0 - NovaSecGroup.create_and_delete_secgroups: - - - args: - rules_per_security_group: 10 - security_group_count: 10 - context: - users: - tenants: 3 - users_per_tenant: 2 - runner: - concurrency: 2 - times: 10 - type: constant - NovaSecGroup.create_and_list_secgroups: - - - args: - rules_per_security_group: 10 - security_group_count: 10 - context: - users: - tenants: 3 - users_per_tenant: 2 - runner: - concurrency: 2 - times: 10 - type: constant - NovaSecGroup.create_and_update_secgroups: - - - args: - security_group_count: 10 - context: - users: - tenants: 3 - users_per_tenant: 2 - runner: - concurrency: 2 - times: 10 - type: constant - NovaServerGroups.create_and_list_server_groups: - - - args: - all_projects: false - kwargs: - policies: - - affinity - context: - users: - tenants: 2 - users_per_tenant: 2 - runner: - concurrency: 2 - times: 4 - type: constant - sla: - failure_rate: - max: 0 NovaServers.boot_and_associate_floating_ip: - args: diff --git a/tools/overrides/releases/newton/kolla.yaml b/tools/overrides/releases/newton/kolla.yaml index 1859c08698..bb4a188555 100644 --- a/tools/overrides/releases/newton/kolla.yaml +++ b/tools/overrides/releases/newton/kolla.yaml @@ -83,7 +83,7 @@ images: senlin_engine: 'docker.io/kolla/ubuntu-source-senlin-engine:3.0.3' senlin_engine_cleaner: 'docker.io/kolla/ubuntu-source-senlin-engine:3.0.3' tempest: 'docker.io/kolla/ubuntu-source-tempest:3.0.3' - test: 'docker.io/kolla/ubuntu-source-rally:4.0.0' + test: 'docker.io/xrally/xrally-openstack:1.3.0' pod: user: keystone: diff --git a/tools/overrides/releases/newton/loci.yaml b/tools/overrides/releases/newton/loci.yaml index a8ba19be3e..f9d87a6b3d 100644 --- a/tools/overrides/releases/newton/loci.yaml +++ b/tools/overrides/releases/newton/loci.yaml @@ -79,4 +79,4 @@ images: senlin_engine: 'docker.io/openstackhelm/senlin:newton' senlin_engine_cleaner: 'docker.io/openstackhelm/senlin:newton' tempest: 'docker.io/kolla/ubuntu-source-tempest:3.0.3' - test: 'docker.io/kolla/ubuntu-source-rally:4.0.0' + test: 'docker.io/xrally/xrally-openstack:1.3.0' diff --git a/tools/overrides/releases/ocata/kolla.yaml b/tools/overrides/releases/ocata/kolla.yaml index 1e643e1587..951805b21c 100644 --- a/tools/overrides/releases/ocata/kolla.yaml +++ b/tools/overrides/releases/ocata/kolla.yaml @@ -81,7 +81,7 @@ images: senlin_engine: 'docker.io/kolla/ubuntu-source-senlin-engine:ocata' senlin_engine_cleaner: 'docker.io/kolla/ubuntu-source-senlin-engine:ocata' tempest: 'docker.io/kolla/ubuntu-source-tempest:4.0.3' - test: 'docker.io/kolla/ubuntu-source-rally:4.0.0' + test: 'docker.io/xrally/xrally-openstack:1.3.0' pod: #NOTE(portdirect): see https://github.com/openstack/kolla/blob/f62f5ae2fa5e7808722f9b37b48a50b39c20b46d/kolla/common/config.py#L695-L998 user: diff --git a/tools/overrides/releases/ocata/loci.yaml b/tools/overrides/releases/ocata/loci.yaml index b5a641be41..7b3d6feec8 100644 --- a/tools/overrides/releases/ocata/loci.yaml +++ b/tools/overrides/releases/ocata/loci.yaml @@ -79,4 +79,4 @@ images: senlin_engine: 'docker.io/openstackhelm/senlin:ocata' senlin_engine_cleaner: 'docker.io/openstackhelm/senlin:ocata' tempest: 'docker.io/kolla/ubuntu-source-tempest:4.0.3' - test: 'docker.io/kolla/ubuntu-source-rally:4.0.0' + test: 'docker.io/xrally/xrally-openstack:1.3.0' diff --git a/tools/overrides/releases/pike/kolla.yaml b/tools/overrides/releases/pike/kolla.yaml index b628f75299..6eeaabe3c2 100644 --- a/tools/overrides/releases/pike/kolla.yaml +++ b/tools/overrides/releases/pike/kolla.yaml @@ -81,7 +81,7 @@ images: senlin_engine: 'docker.io/kolla/ubuntu-source-senlin-engine:pike' senlin_engine_cleaner: 'docker.io/kolla/ubuntu-source-senlin-engine:pike' tempest: 'docker.io/kolla/ubuntu-source-tempest:pike' - test: 'docker.io/kolla/ubuntu-source-rally:pike' + test: 'docker.io/xrally/xrally-openstack:1.3.0' pod: #NOTE(portdirect): see https://github.com/openstack/kolla/blob/f62f5ae2fa5e7808722f9b37b48a50b39c20b46d/kolla/common/config.py#L695-L998 user: diff --git a/tools/overrides/releases/pike/loci.yaml b/tools/overrides/releases/pike/loci.yaml index f32e974b4c..e3e94aff70 100644 --- a/tools/overrides/releases/pike/loci.yaml +++ b/tools/overrides/releases/pike/loci.yaml @@ -79,4 +79,4 @@ images: senlin_engine: 'docker.io/openstackhelm/senlin:pike' senlin_engine_cleaner: 'docker.io/openstackhelm/senlin:pike' tempest: 'docker.io/kolla/ubuntu-source-tempest:pike' - test: 'docker.io/kolla/ubuntu-source-rally:pike' + test: 'docker.io/xrally/xrally-openstack:1.3.0'