Browse Source

Fix some CI issues

- Drop references to devstack-gate, it is deprecated and no longer
  needed.
- Drop setting USE_PYTHON3, it is the default now and the variable no
  longer being used.
- Drop using IDENTITY_API_VERSION, there is only v3 now and devstack
  plans to remove that variable.
- python-keystoneclient still needs an admin endpoint in keystone, set a
  flag for devstack to create it. [0]

[0] https://review.opendev.org/c/openstack/openstacksdk/+/777343

Signed-off-by: Dr. Jens Harbott <harbott@osism.tech>
Change-Id: I35117f6d1b058d1f92e12d5be31bd85036adfccc
changes/14/816814/5
Dr. Jens Harbott 7 months ago
parent
commit
a92ff92f67
No known key found for this signature in database
GPG Key ID: E7862B245C3596B1
  1. 4
      .zuul.d/base.yaml
  2. 1
      .zuul.d/rally-task-barbican.yaml
  3. 1
      .zuul.d/rally-task-designate.yaml
  4. 4
      .zuul.d/rally-task-heat.yaml
  5. 1
      .zuul.d/rally-task-ironic.yaml
  6. 4
      .zuul.d/rally-task-magnum.yaml
  7. 5
      .zuul.d/rally-task-manila.yaml
  8. 6
      .zuul.d/rally-task-mistral.yaml
  9. 4
      .zuul.d/rally-task-murano.yaml
  10. 1
      .zuul.d/rally-task-neutron-with-extensions.yaml
  11. 1
      .zuul.d/rally-task-octavia.yaml
  12. 7
      .zuul.d/rally-task-telemetry.yaml
  13. 1
      .zuul.d/rally-task-watcher.yaml
  14. 1
      .zuul.d/rally-task-zaqar.yaml
  15. 6
      .zuul.d/rally-tox-functional.yaml
  16. 4
      .zuul.d/rally-verify-tempest.yaml
  17. 26
      devstack/lib/rally

4
.zuul.d/base.yaml

@ -4,7 +4,6 @@
description: Base job for launching Rally task at Devstack
required-projects:
- name: openstack/devstack
- name: openstack/devstack-gate
- name: openstack/rally-openstack
# NOTE(andreykurilin): it is a required project to fetch the latest
# version and test master of rally-openstack with master of rally
@ -13,6 +12,9 @@
roles:
- zuul: openstack/devstack
vars:
devstack_localrc:
# TODO(frickler): drop this once python-keystoneclient no longer needs it
KEYSTONE_ADMIN_ENDPOINT: true
devstack_plugins:
rally-openstack: https://opendev.org/openstack/rally-openstack
run: tests/ci/playbooks/run-rally-task.yaml

1
.zuul.d/rally-task-barbican.yaml

@ -3,7 +3,6 @@
parent: rally-task-at-devstack
required-projects:
- name: openstack/devstack
- name: openstack/devstack-gate
- name: openstack/rally
- name: openstack/rally-openstack
- name: openstack/barbican

1
.zuul.d/rally-task-designate.yaml

@ -9,7 +9,6 @@
rally_task: rally-jobs/designate.yaml
devstack_localrc:
DESIGNATE_SERVICE_PORT_DNS: 5322
USE_PYTHON3: true
devstack_plugins:
designate: https://opendev.org/openstack/designate
rally-openstack: https://opendev.org/openstack/rally-openstack

4
.zuul.d/rally-task-heat.yaml

@ -3,11 +3,13 @@
parent: rally-task-at-devstack
required-projects:
- name: openstack/devstack
- name: openstack/devstack-gate
- name: openstack/rally
- name: openstack/rally-openstack
- name: openstack/heat
vars:
devstack_localrc:
# TODO(frickler): drop this once heat no longer needs it
KEYSTONE_ADMIN_ENDPOINT: true
devstack_plugins:
rally-openstack: https://opendev.org/openstack/rally-openstack
heat: https://opendev.org/openstack/heat

1
.zuul.d/rally-task-ironic.yaml

@ -3,7 +3,6 @@
parent: rally-task-at-devstack
required-projects:
- name: openstack/devstack
- name: openstack/devstack-gate
- name: openstack/rally
- name: openstack/rally-openstack
- name: openstack/ironic

4
.zuul.d/rally-task-magnum.yaml

@ -3,13 +3,15 @@
parent: rally-task-at-devstack
required-projects:
- name: openstack/devstack
- name: openstack/devstack-gate
- name: openstack/rally
- name: openstack/rally-openstack
- name: openstack/magnum
- name: openstack/python-magnumclient
- name: openstack/heat
vars:
devstack_localrc:
# TODO(frickler): drop this once heat no longer needs it
KEYSTONE_ADMIN_ENDPOINT: true
devstack_plugins:
rally-openstack: https://opendev.org/openstack/rally-openstack
magnum: https://opendev.org/openstack/magnum

5
.zuul.d/rally-task-manila.yaml

@ -3,6 +3,9 @@
parent: rally-task-at-devstack
vars:
rally_task: rally-jobs/manila.yaml
devstack_localrc:
# TODO(frickler): drop this once heat no longer needs it
KEYSTONE_ADMIN_ENDPOINT: true
devstack_services:
# disable redundant services for the job
ceilometer-acentral: false
@ -27,7 +30,6 @@
vars:
rally_task: rally-jobs/manila-no-ss.yaml
devstack_localrc:
USE_PYTHON3: true
LIBS_FROM_GIT: python-manilaclient
SHARE_DRIVER: manila.tests.share.drivers.dummy.DummyDriver
MANILA_ENABLED_BACKENDS: alpha,beta,gamma
@ -59,7 +61,6 @@
vars:
rally_task: rally-jobs/manila.yaml
devstack_localrc:
USE_PYTHON3: true
LIBS_FROM_GIT: python-manilaclient
SHARE_DRIVER: manila.tests.share.drivers.dummy.DummyDriver
MANILA_ENABLED_BACKENDS: alpha,beta,gamma

6
.zuul.d/rally-task-mistral.yaml

@ -3,13 +3,15 @@
parent: rally-task-at-devstack
required-projects:
- name: openstack/devstack
- name: openstack/devstack-gate
- name: openstack/rally
- name: openstack/rally-openstack
- name: openstack/heat
- name: openstack/mistral
- name: openstack/python-mistralclient
vars:
devstack_localrc:
# TODO(frickler): drop this once heat no longer needs it
KEYSTONE_ADMIN_ENDPOINT: true
devstack_plugins:
rally-openstack: https://opendev.org/openstack/rally-openstack
mistral: https://opendev.org/openstack/mistral
@ -25,4 +27,4 @@
ceilometer-collector: false
horizon: false
tempest: false
rally_task: rally-jobs/mistral.yaml
rally_task: rally-jobs/mistral.yaml

4
.zuul.d/rally-task-murano.yaml

@ -3,12 +3,14 @@
parent: rally-task-at-devstack
required-projects:
- name: openstack/devstack
- name: openstack/devstack-gate
- name: openstack/rally
- name: openstack/rally-openstack
- name: openstack/heat
- name: openstack/murano
vars:
devstack_localrc:
# TODO(frickler): drop this once heat no longer needs it
KEYSTONE_ADMIN_ENDPOINT: true
devstack_plugins:
rally-openstack: https://opendev.org/openstack/rally-openstack
murano: https://opendev.org/openstack/murano

1
.zuul.d/rally-task-neutron-with-extensions.yaml

@ -3,7 +3,6 @@
parent: rally-task-at-devstack
required-projects:
- name: openstack/devstack
- name: openstack/devstack-gate
- name: openstack/rally
- name: openstack/rally-openstack
- name: openstack/networking-bgpvpn

1
.zuul.d/rally-task-octavia.yaml

@ -3,7 +3,6 @@
description: A Rally job for checking Octavia Plugin
parent: rally-task-at-devstack
required-projects:
- name: openstack/devstack-gate
- name: openstack/diskimage-builder
- name: openstack/octavia
- name: openstack/octavia-lib

7
.zuul.d/rally-task-telemetry.yaml

@ -3,12 +3,15 @@
parent: rally-task-at-devstack
required-projects:
- name: openstack/devstack
- name: openstack/devstack-gate
- name: openstack/rally
- name: openstack/rally-openstack
- name: openstack/heat
- name: openstack/ceilometer
vars:
devstack_localrc:
CEILOMETER_BACKEND: gnocchi
# TODO(frickler): drop this once heat no longer needs it
KEYSTONE_ADMIN_ENDPOINT: true
devstack_plugins:
rally-openstack: https://opendev.org/openstack/rally-openstack
ceilometer: https://opendev.org/openstack/ceilometer
@ -21,5 +24,3 @@
ceilometer-api: true
ceilometer-collector: true
rally_task: rally-jobs/telemetry.yaml
devstack_localrc:
CEILOMETER_BACKEND: gnocchi

1
.zuul.d/rally-task-watcher.yaml

@ -3,7 +3,6 @@
parent: rally-task-at-devstack
required-projects:
- name: openstack/devstack
- name: openstack/devstack-gate
- name: openstack/rally
- name: openstack/rally-openstack
- name: openstack/watcher

1
.zuul.d/rally-task-zaqar.yaml

@ -3,7 +3,6 @@
parent: rally-task-at-devstack
required-projects:
- name: openstack/devstack
- name: openstack/devstack-gate
- name: openstack/rally
- name: openstack/rally-openstack
- name: openstack/zaqar

6
.zuul.d/rally-tox-functional.yaml

@ -6,7 +6,6 @@
Uses tox with the ``functional`` environment.
required-projects:
- name: openstack/devstack
- name: openstack/devstack-gate
- name: openstack/rally-openstack
# NOTE(andreykurilin): it is a required project to fetch the latest
# version and test master of rally-openstack with master of rally
@ -15,9 +14,10 @@
roles:
- zuul: openstack/devstack
vars:
devstack_localrc:
# TODO(frickler): drop this once python-keystoneclient no longer needs it
KEYSTONE_ADMIN_ENDPOINT: true
devstack_plugins:
rally-openstack: https://opendev.org/openstack/rally-openstack
devstack_localrc:
USE_PYTHON3: true
tox_env: "functional"
run: tests/ci/playbooks/tox-functional-env-run.yaml

4
.zuul.d/rally-verify-tempest.yaml

@ -3,7 +3,6 @@
parent: devstack
required-projects:
- name: openstack/devstack
- name: openstack/devstack-gate
- name: openstack/rally-openstack
- name: openstack/rally
timeout: 7200
@ -11,7 +10,8 @@
- zuul: openstack/devstack
vars:
devstack_localrc:
USE_PYTHON3: true
# TODO(frickler): drop this once python-keystoneclient no longer needs it
KEYSTONE_ADMIN_ENDPOINT: true
devstack_plugins:
rally-openstack: https://opendev.org/openstack/rally-openstack
run: tests/ci/playbooks/run-rally-verify.yaml

26
devstack/lib/rally

@ -43,36 +43,19 @@ OSPROFILER_CONNECTION_STRING=${OSPROFILER_CONNECTION_STRING:-""}
# Creates a configuration file for the current deployment
# Uses the following variables:
#
# - ``ADMIN_PASSWORD``, ``KEYSTONE_SERVICE_PROTOCOL``,
# ``KEYSTONE_SERVICE_HOST``, ``KEYSTONE_SERVICE_PORT``,
# ``IDENTITY_API_VERSION`` - must be defined
# - ``ADMIN_PASSWORD``, ``REGION_NAME``
# ``OS_AUTH_URL``
# ``OSPROFILER_HMAC_KEYS`` - optional, for integration with osprofiler
# ``OSPROFILER_CONNECTION_STRING`` - optional, if this is set together with
# OSPROFILER_HMAC_KEYS rally html report will use osprofiler api to
# generate html report for each trace and embed it as iframe to our
# native html repor
# native html report
# ``RALLY_OSPROFILER_CHART`` - optional, a path to store osprofiler's reports
#
# _create_deployment_config filename
function _create_deployment_config() {
if [[ "$IDENTITY_API_VERSION" == 2.0 ]]
then
cat >$1 <<EOF
{
"openstack": {
"auth_url": "$OS_AUTH_URL",
"region_name": "$REGION_NAME",
"admin": {
"username": "admin",
"password": "$ADMIN_PASSWORD",
"tenant_name": "admin",
}
EOF
fi
if [[ "$IDENTITY_API_VERSION" == 3 ]]
then
cat >$1 <<EOF
cat >$1 <<EOF
{
"openstack": {
"auth_url": "$OS_AUTH_URL",
@ -85,7 +68,6 @@ then
"project_domain_name": "Default"
},
EOF
fi
# Now add osprofiler config if necessary
if [[ ! -z "$OSPROFILER_HMAC_KEYS" ]]; then

Loading…
Cancel
Save