From 61d3428c5caf1f01cabaae6c3f2cab4e1907b0f1 Mon Sep 17 00:00:00 2001 From: Eyal Date: Mon, 12 Feb 2018 11:39:01 +0200 Subject: [PATCH] tempest cleanup make sure vitrage installed last remove duplication Change-Id: I3d09206b6467f86ad49eed692043364185378a84 --- devstack/gate_hook.sh | 5 +++++ devstack/post_test_hook.sh | 6 ------ .../legacy/vitrage-dsvm-api-py27/run.yaml | 21 ------------------- .../legacy/vitrage-dsvm-api-py35/run.yaml | 21 ------------------- .../vitrage-dsvm-datasources-py27/run.yaml | 21 ------------------- .../vitrage-dsvm-datasources-py35/run.yaml | 21 ------------------- 6 files changed, 5 insertions(+), 90 deletions(-) diff --git a/devstack/gate_hook.sh b/devstack/gate_hook.sh index 96628ab02..2d2b85d9d 100644 --- a/devstack/gate_hook.sh +++ b/devstack/gate_hook.sh @@ -24,6 +24,11 @@ DEVSTACK_LOCAL_CONFIG+=$'\nenable_plugin heat git://git.openstack.org/openstack/ DEVSTACK_LOCAL_CONFIG+=$'\nenable_plugin ceilometer git://git.openstack.org/openstack/ceilometer' DEVSTACK_LOCAL_CONFIG+=$'\nenable_plugin aodh git://git.openstack.org/openstack/aodh' DEVSTACK_LOCAL_CONFIG+=$'\nenable_plugin mistral git://git.openstack.org/openstack/mistral' +DEVSTACK_LOCAL_CONFIG+=$'\nenable_plugin vitrage git://git.openstack.org/openstack/vitrage' +DEVSTACK_LOCAL_CONFIG+=$'\nenable_plugin vitrage-tempest-plugin git://git.openstack.org/openstack/vitrage-tempest-plugin' + +# we don't want swift +DEVSTACK_LOCAL_CONFIG+=$'\ndisable_service s-account s-container s-object s-proxy' DEVSTACK_LOCAL_CONFIG+="$(cat <>"/tmp/dg-local.conf" - [[local|localrc]] - enable_plugin vitrage git://git.openstack.org/openstack/vitrage - enable_plugin vitrage-tempest-plugin git://git.openstack.org/openstack/vitrage-tempest-plugin - - # swift is not ready for python3 yet - disable_service s-account - disable_service s-container - disable_service s-object - disable_service s-proxy - - EOF - executable: /bin/bash - chdir: '{{ ansible_user_dir }}/workspace' - environment: '{{ zuul | zuul_legacy_vars }}' - - shell: cmd: | set -e @@ -53,7 +33,6 @@ export PROJECTS="openstack/mistral $PROJECTS" export PROJECTS="openstack/vitrage $PROJECTS" export PROJECTS="openstack/vitrage-tempest-plugin $PROJECTS" - export ENABLED_SERVICES=tempest export DEVSTACK_GATE_USE_PYTHON3=False diff --git a/playbooks/legacy/vitrage-dsvm-api-py35/run.yaml b/playbooks/legacy/vitrage-dsvm-api-py35/run.yaml index c84a86e4a..dc2eb6c2d 100644 --- a/playbooks/legacy/vitrage-dsvm-api-py35/run.yaml +++ b/playbooks/legacy/vitrage-dsvm-api-py35/run.yaml @@ -23,26 +23,6 @@ chdir: '{{ ansible_user_dir }}/workspace' environment: '{{ zuul | zuul_legacy_vars }}' - - shell: - cmd: | - set -e - set -x - cat << 'EOF' >>"/tmp/dg-local.conf" - [[local|localrc]] - enable_plugin vitrage git://git.openstack.org/openstack/vitrage - enable_plugin vitrage-tempest-plugin git://git.openstack.org/openstack/vitrage-tempest-plugin - - # swift is not ready for python3 yet - disable_service s-account - disable_service s-container - disable_service s-object - disable_service s-proxy - - EOF - executable: /bin/bash - chdir: '{{ ansible_user_dir }}/workspace' - environment: '{{ zuul | zuul_legacy_vars }}' - - shell: cmd: | set -e @@ -53,7 +33,6 @@ export PROJECTS="openstack/mistral $PROJECTS" export PROJECTS="openstack/vitrage $PROJECTS" export PROJECTS="openstack/vitrage-tempest-plugin $PROJECTS" - export ENABLED_SERVICES=tempest export DEVSTACK_GATE_USE_PYTHON3=True diff --git a/playbooks/legacy/vitrage-dsvm-datasources-py27/run.yaml b/playbooks/legacy/vitrage-dsvm-datasources-py27/run.yaml index b6dedf4e7..b5ca857e3 100644 --- a/playbooks/legacy/vitrage-dsvm-datasources-py27/run.yaml +++ b/playbooks/legacy/vitrage-dsvm-datasources-py27/run.yaml @@ -23,26 +23,6 @@ chdir: '{{ ansible_user_dir }}/workspace' environment: '{{ zuul | zuul_legacy_vars }}' - - shell: - cmd: | - set -e - set -x - cat << 'EOF' >>"/tmp/dg-local.conf" - [[local|localrc]] - enable_plugin vitrage git://git.openstack.org/openstack/vitrage - enable_plugin vitrage-tempest-plugin git://git.openstack.org/openstack/vitrage-tempest-plugin - - # swift is not ready for python3 yet - disable_service s-account - disable_service s-container - disable_service s-object - disable_service s-proxy - - EOF - executable: /bin/bash - chdir: '{{ ansible_user_dir }}/workspace' - environment: '{{ zuul | zuul_legacy_vars }}' - - shell: cmd: | set -e @@ -53,7 +33,6 @@ export PROJECTS="openstack/mistral $PROJECTS" export PROJECTS="openstack/vitrage $PROJECTS" export PROJECTS="openstack/vitrage-tempest-plugin $PROJECTS" - export ENABLED_SERVICES=tempest export DEVSTACK_GATE_USE_PYTHON3=False diff --git a/playbooks/legacy/vitrage-dsvm-datasources-py35/run.yaml b/playbooks/legacy/vitrage-dsvm-datasources-py35/run.yaml index 0296e838b..a41774b33 100644 --- a/playbooks/legacy/vitrage-dsvm-datasources-py35/run.yaml +++ b/playbooks/legacy/vitrage-dsvm-datasources-py35/run.yaml @@ -23,26 +23,6 @@ chdir: '{{ ansible_user_dir }}/workspace' environment: '{{ zuul | zuul_legacy_vars }}' - - shell: - cmd: | - set -e - set -x - cat << 'EOF' >>"/tmp/dg-local.conf" - [[local|localrc]] - enable_plugin vitrage git://git.openstack.org/openstack/vitrage - enable_plugin vitrage-tempest-plugin git://git.openstack.org/openstack/vitrage-tempest-plugin - - # swift is not ready for python3 yet - disable_service s-account - disable_service s-container - disable_service s-object - disable_service s-proxy - - EOF - executable: /bin/bash - chdir: '{{ ansible_user_dir }}/workspace' - environment: '{{ zuul | zuul_legacy_vars }}' - - shell: cmd: | set -e @@ -53,7 +33,6 @@ export PROJECTS="openstack/mistral $PROJECTS" export PROJECTS="openstack/vitrage $PROJECTS" export PROJECTS="openstack/vitrage-tempest-plugin $PROJECTS" - export ENABLED_SERVICES=tempest export DEVSTACK_GATE_USE_PYTHON3=True