From ab19f66f63e06992da9d15fd639adb18f6de5887 Mon Sep 17 00:00:00 2001 From: Eric K Date: Fri, 11 Jan 2019 17:02:30 -0800 Subject: [PATCH] migrate legacy dsvm jobs to non-legacy Jobs now inherit from non-legacy tempest-all job. Move ubuntu jobs from xenial to bionic. Renamed job names according to zuul v3 convention. Removed legacy playbooks. TODO: add separate z3 job for xenial because z3 git currently do not offer precompiled binary for bionic. TODO: enable monasca, which is currently causing some problems in bionic. Change-Id: Ied99ea945782f480c86535588552bbe68be7a23a --- .zuul.yaml | 214 ++++++++++-------- .../congress-devstack-api-base/post.yaml | 80 ------- .../congress-devstack-api-base/run.yaml | 105 --------- .../post.yaml | 80 ------- .../congress-devstack-py35-api-mysql/run.yaml | 89 -------- .../congress-pe-replicated-base/post.yaml | 80 ------- .../congress-pe-replicated-base/run.yaml | 90 -------- 7 files changed, 118 insertions(+), 620 deletions(-) delete mode 100644 playbooks/legacy/congress-devstack-api-base/post.yaml delete mode 100644 playbooks/legacy/congress-devstack-api-base/run.yaml delete mode 100644 playbooks/legacy/congress-devstack-py35-api-mysql/post.yaml delete mode 100644 playbooks/legacy/congress-devstack-py35-api-mysql/run.yaml delete mode 100644 playbooks/legacy/congress-pe-replicated-base/post.yaml delete mode 100644 playbooks/legacy/congress-pe-replicated-base/run.yaml diff --git a/.zuul.yaml b/.zuul.yaml index 375b45cc3..e11445f79 100644 --- a/.zuul.yaml +++ b/.zuul.yaml @@ -1,119 +1,136 @@ - job: - name: congress-devstack-api-base - parent: legacy-dsvm-base + name: congress-tempest-base + parent: devstack-tempest + description: | + Congress devstack tempest tests job irrelevant-files: - ^.*\.rst$ - ^doc/.*$ - ^congress/tests/.*$ - ^releasenotes/.*$ required-projects: - - openstack-infra/devstack-gate - - openstack/aodh - - openstack/python-aodhclient - - openstack/congress - - openstack/congress-dashboard - - openstack/congress-tempest-plugin - - openstack/python-congressclient - - openstack/murano - - openstack/murano-dashboard - - openstack/python-muranoclient - - openstack/mistral - - openstack/python-mistralclient - - openstack/mistral-tempest-plugin - - openstack/murano-tempest-plugin - - openstack/telemetry-tempest-plugin - - openstack/heat-tempest-plugin - - openstack/monasca-agent - - openstack/monasca-api - - openstack/monasca-common - - openstack/monasca-grafana-datasource - - openstack/monasca-notification - - openstack/monasca-persister - - openstack/monasca-statsd - - openstack/monasca-thresh - - openstack/monasca-ui - - openstack/python-monascaclient - - openstack/monasca-tempest-plugin - run: playbooks/legacy/congress-devstack-api-base/run.yaml - post-run: playbooks/legacy/congress-devstack-api-base/post.yaml + - name: openstack-infra/devstack-gate + - name: openstack/aodh + - name: openstack/python-aodhclient + - name: openstack/congress + - name: openstack/congress-dashboard + - name: openstack/congress-tempest-plugin + - name: openstack/python-congressclient + - name: openstack/murano + - name: openstack/murano-dashboard + - name: openstack/python-muranoclient + - name: openstack/mistral + - name: openstack/python-mistralclient + - name: openstack/mistral-tempest-plugin + - name: openstack/murano-tempest-plugin + - name: openstack/telemetry-tempest-plugin + - name: openstack/heat + - name: openstack/python-heatclient + - name: openstack/heat-tempest-plugin + - name: openstack/monasca-agent + - name: openstack/monasca-api + - name: openstack/monasca-common + - name: openstack/monasca-grafana-datasource + - name: openstack/monasca-notification + - name: openstack/monasca-persister + - name: openstack/monasca-statsd + - name: openstack/monasca-thresh + - name: openstack/monasca-ui + - name: openstack/python-monascaclient + - name: openstack/monasca-tempest-plugin timeout: 6000 - -- job: - name: congress-pe-replicated-base - parent: legacy-dsvm-base vars: - database: mysql - irrelevant-files: - - ^.*\.rst$ - - ^doc/.*$ - - ^congress/tests/.*$ - - ^releasenotes/.*$ - required-projects: - - openstack-infra/devstack-gate - - openstack/aodh - - openstack/python-aodhclient - - openstack/congress - - openstack/congress-dashboard - - openstack/congress-tempest-plugin - - openstack/python-congressclient - - openstack/murano - - openstack/murano-dashboard - - openstack/python-muranoclient - - openstack/mistral - - openstack/python-mistralclient - - openstack/mistral-tempest-plugin - - openstack/murano-tempest-plugin - - openstack/telemetry-tempest-plugin - - openstack/heat-tempest-plugin - run: playbooks/legacy/congress-pe-replicated-base/run.yaml - post-run: playbooks/legacy/congress-pe-replicated-base/post.yaml - timeout: 6000 + devstack_plugins: + congress: https://git.openstack.org/openstack/congress + heat: git://git.openstack.org/openstack/heat + murano: git://git.openstack.org/openstack/murano + neutron: https://git.openstack.org/openstack/neutron + devstack_services: + tempest: true + neutron-qos: true + horizon: false + # swift disabled for py3 + s-proxy: false + s-object: false + s-container: false + s-account: false + c-bak: false # requires swift + tempest_concurrency: 1 + tox_envlist: all + tempest_test_regex: congress_tempest_plugin.* + devstack_localrc: + LIBS_FROM_GIT: python-congressclient + SERVICE_TIMEOUT: 120 # default too short for this job + TEMPEST_PLUGINS: '"/opt/stack/congress-tempest-plugin /opt/stack/telemetry-tempest-plugin /opt/stack/murano-tempest-plugin /opt/stack/heat-tempest-plugin /opt/stack/mistral-tempest-plugin /opt/stack/monasca-tempest-plugin"' + CONGRESS_MULTIPROCESS_DEPLOYMENT: true + CONGRESS_EXPOSE_ENCRYPTION_KEY_FOR_TEST: true + ENABLE_CONGRESS_Z3: false + USE_Z3_RELEASE: 4.7.1 - job: - name: congress-devstack-api-mysql - parent: congress-devstack-api-base + name: congress-tempest-py2 + parent: congress-tempest-base + vars: + devstack_plugins: + aodh: git://git.openstack.org/openstack/aodh + mistral: git://git.openstack.org/openstack/mistral + devstack_services: + s-proxy: true + s-object: true + s-container: true + s-account: true + c-bak: true + +- job: + name: congress-tempest-py3 + parent: congress-tempest-base + vars: + devstack_localrc: + USE_PYTHON3: true + +- job: + name: congress-tempest-replicated + parent: congress-tempest-base + voting: false + vars: + devstack_localrc: + CONGRESS_REPLICATED: true + +- job: + name: congress-tempest-replicated-mysql + parent: congress-tempest-replicated vars: database: mysql - job: - name: congress-devstack-api-postgresql - parent: congress-devstack-api-base + name: congress-tempest-replicated-postgresql + parent: congress-tempest-replicated voting: false vars: database: postgresql - job: - name: congress-devstack-py35-api-mysql - parent: legacy-dsvm-base - irrelevant-files: - - ^.*\.rst$ - - ^doc/.*$ - - ^congress/tests/.*$ - - ^releasenotes/.*$ - required-projects: - - openstack-infra/devstack-gate - - openstack/congress - - openstack/congress-tempest-plugin - - openstack/congress-dashboard - - openstack/python-congressclient - - openstack/murano - - openstack/murano-dashboard - - openstack/python-muranoclient - - openstack/murano-tempest-plugin - - openstack/heat-tempest-plugin - run: playbooks/legacy/congress-devstack-py35-api-mysql/run.yaml - post-run: playbooks/legacy/congress-devstack-py35-api-mysql/post.yaml - timeout: 6000 + name: congress-tempest-py2-mysql + parent: congress-tempest-py2 + vars: + database: mysql - job: - name: congress-pe-replicated-mysql - parent: congress-pe-replicated-base + name: congress-tempest-py3-mysql + parent: congress-tempest-py3 + vars: + database: mysql + +- job: + name: congress-tempest-py2-postgresql + parent: congress-tempest-py2 voting: false - + vars: + database: postgresql - job: - name: congress-pe-replicated-postgresql - parent: congress-pe-replicated-base + name: congress-tempest-py3-postgresql + parent: congress-tempest-py3 voting: false vars: database: postgresql @@ -131,9 +148,14 @@ - periodic-stable-jobs check: jobs: - - congress-devstack-api-mysql - - congress-devstack-py35-api-mysql - - congress-pe-replicated-postgresql + - congress-tempest-py2-mysql + - congress-tempest-py3-mysql + - congress-tempest-replicated-postgresql + # Note: the above jobs most likely provides sufficient coverage + # - congress-tempest-py2-postgresql + # - congress-tempest-py3-postgresql + # - congress-tempest-replicated-mysql + # TripleO jobs that deploy Congress. # Note we don't use a project-template here, so it's easier # to disable voting on one specific job if things go wrong. @@ -148,5 +170,5 @@ gate: queue: congress jobs: - - congress-devstack-api-mysql - - congress-devstack-py35-api-mysql + - congress-tempest-py2-mysql + - congress-tempest-py3-mysql diff --git a/playbooks/legacy/congress-devstack-api-base/post.yaml b/playbooks/legacy/congress-devstack-api-base/post.yaml deleted file mode 100644 index dac875340..000000000 --- a/playbooks/legacy/congress-devstack-api-base/post.yaml +++ /dev/null @@ -1,80 +0,0 @@ -- hosts: primary - tasks: - - - name: Copy files from {{ ansible_user_dir }}/workspace/ on node - synchronize: - src: '{{ ansible_user_dir }}/workspace/' - dest: '{{ zuul.executor.log_root }}' - mode: pull - copy_links: true - verify_host: true - rsync_opts: - - --include=**/*nose_results.html - - --include=*/ - - --exclude=* - - --prune-empty-dirs - - - name: Copy files from {{ ansible_user_dir }}/workspace/ on node - synchronize: - src: '{{ ansible_user_dir }}/workspace/' - dest: '{{ zuul.executor.log_root }}' - mode: pull - copy_links: true - verify_host: true - rsync_opts: - - --include=**/*testr_results.html.gz - - --include=*/ - - --exclude=* - - --prune-empty-dirs - - - name: Copy files from {{ ansible_user_dir }}/workspace/ on node - synchronize: - src: '{{ ansible_user_dir }}/workspace/' - dest: '{{ zuul.executor.log_root }}' - mode: pull - copy_links: true - verify_host: true - rsync_opts: - - --include=/.testrepository/tmp* - - --include=*/ - - --exclude=* - - --prune-empty-dirs - - - name: Copy files from {{ ansible_user_dir }}/workspace/ on node - synchronize: - src: '{{ ansible_user_dir }}/workspace/' - dest: '{{ zuul.executor.log_root }}' - mode: pull - copy_links: true - verify_host: true - rsync_opts: - - --include=**/*testrepository.subunit.gz - - --include=*/ - - --exclude=* - - --prune-empty-dirs - - - name: Copy files from {{ ansible_user_dir }}/workspace/ on node - synchronize: - src: '{{ ansible_user_dir }}/workspace/' - dest: '{{ zuul.executor.log_root }}/tox' - mode: pull - copy_links: true - verify_host: true - rsync_opts: - - --include=/.tox/*/log/* - - --include=*/ - - --exclude=* - - --prune-empty-dirs - - - name: Copy files from {{ ansible_user_dir }}/workspace/ on node - synchronize: - src: '{{ ansible_user_dir }}/workspace/' - dest: '{{ zuul.executor.log_root }}' - mode: pull - copy_links: true - verify_host: true - rsync_opts: - - --include=/logs/** - - --include=*/ - - --exclude=* - - --prune-empty-dirs diff --git a/playbooks/legacy/congress-devstack-api-base/run.yaml b/playbooks/legacy/congress-devstack-api-base/run.yaml deleted file mode 100644 index 44ee3fd66..000000000 --- a/playbooks/legacy/congress-devstack-api-base/run.yaml +++ /dev/null @@ -1,105 +0,0 @@ -- hosts: all - name: Autoconverted job legacy-congress-dsvm-api-mysql from old job gate-congress-dsvm-api-mysql-ubuntu-xenial - tasks: - - - name: Ensure legacy workspace directory - file: - path: '{{ ansible_user_dir }}/workspace' - state: directory - - - shell: - cmd: | - set -e - set -x - cat > clonemap.yaml << EOF - clonemap: - - name: openstack-infra/devstack-gate - dest: devstack-gate - EOF - /usr/zuul-env/bin/zuul-cloner -m clonemap.yaml --cache-dir /opt/git \ - git://git.openstack.org \ - openstack-infra/devstack-gate - executable: /bin/bash - 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 heat git://git.openstack.org/openstack/heat - enable_plugin congress git://git.openstack.org/openstack/congress - enable_plugin murano git://git.openstack.org/openstack/murano - enable_plugin aodh git://git.openstack.org/openstack/aodh - enable_plugin mistral git://git.openstack.org/openstack/mistral - enable_plugin monasca-api git://git.openstack.org/openstack/monasca-api - enable_plugin neutron https://git.openstack.org/openstack/neutron - # To deploy congress as multi-process (api, pe, datasources) - CONGRESS_MULTIPROCESS_DEPLOYMENT=True - CONGRESS_EXPOSE_ENCRYPTION_KEY_FOR_TEST=True - LIBS_FROM_GIT=python-congressclient - ENABLE_CONGRESS_Z3=True - USE_Z3_RELEASE=4.7.1 - TEMPEST_PLUGINS='/opt/stack/new/congress-tempest-plugin /opt/stack/new/telemetry-tempest-plugin /opt/stack/new/murano-tempest-plugin /opt/stack/new/heat-tempest-plugin /opt/stack/new/mistral-tempest-plugin /opt/stack/new/monasca-tempest-plugin' - - EOF - executable: /bin/bash - chdir: '{{ ansible_user_dir }}/workspace' - environment: '{{ zuul | zuul_legacy_vars }}' - - - shell: - cmd: | - set -e - set -x - ENABLED_SERVICES=s-proxy,s-object,s-container,s-account, - ENABLED_SERVICES+=neutron-qos - - export SERVICE_TIMEOUT=120 # default too short for this job - export PYTHONUNBUFFERED=true - export DEVSTACK_GATE_TEMPEST=1 - export DEVSTACK_GATE_TEMPEST_REGEX="congress_tempest_plugin" - export DEVSTACK_GATE_NEUTRON=1 - export PROJECTS="openstack/congress $PROJECTS" - export PROJECTS="openstack/congress-dashboard $PROJECTS" - export PROJECTS="openstack/python-congressclient $PROJECTS" - export PROJECTS="openstack/congress-tempest-plugin $PROJECTS" - export PROJECTS="openstack/murano $PROJECTS" - export PROJECTS="openstack/aodh $PROJECTS" - export PROJECTS="openstack/mistral $PROJECTS" - export PROJECTS="openstack/python-mistralclient $PROJECTS" - export PROJECTS="openstack/mistral-tempest-plugin $PROJECTS" - export PROJECTS="openstack/murano-dashboard $PROJECTS" - export PROJECTS="openstack/python-muranoclient $PROJECTS" - export PROJECTS="openstack/python-aodhclient $PROJECTS" - export PROJECTS="openstack/telemetry-tempest-plugin $PROJECTS" - export PROJECTS="openstack/murano-tempest-plugin $PROJECTS" - export PROJECTS="openstack/heat-tempest-plugin $PROJECTS" - export PROJECTS="openstack/monasca-api $PROJECTS" - export PROJECTS="openstack/monasca-persister $PROJECTS" - export PROJECTS="openstack/monasca-common $PROJECTS" - export PROJECTS="openstack/monasca-agent $PROJECTS" - export PROJECTS="openstack/monasca-notification $PROJECTS" - export PROJECTS="openstack/monasca-thresh $PROJECTS" - export PROJECTS="openstack/monasca-statsd $PROJECTS" - export PROJECTS="openstack/python-monascaclient $PROJECTS" - export PROJECTS="openstack/monasca-grafana-datasource $PROJECTS" - export PROJECTS="openstack/monasca-ui $PROJECTS" - export PROJECTS="openstack/monasca-tempest-plugin $PROJECTS" - - export ENABLED_SERVICES - export BRANCH_OVERRIDE=default - if [ "$BRANCH_OVERRIDE" != "default" ] ; then - export OVERRIDE_ZUUL_BRANCH=$BRANCH_OVERRIDE - fi - - if [ "{{ database }}" == "postgresql" ] ; then - export DEVSTACK_GATE_POSTGRES=1 - fi - - cp devstack-gate/devstack-vm-gate-wrap.sh ./safe-devstack-vm-gate-wrap.sh - ./safe-devstack-vm-gate-wrap.sh - executable: /bin/bash - chdir: '{{ ansible_user_dir }}/workspace' - environment: '{{ zuul | zuul_legacy_vars }}' diff --git a/playbooks/legacy/congress-devstack-py35-api-mysql/post.yaml b/playbooks/legacy/congress-devstack-py35-api-mysql/post.yaml deleted file mode 100644 index dac875340..000000000 --- a/playbooks/legacy/congress-devstack-py35-api-mysql/post.yaml +++ /dev/null @@ -1,80 +0,0 @@ -- hosts: primary - tasks: - - - name: Copy files from {{ ansible_user_dir }}/workspace/ on node - synchronize: - src: '{{ ansible_user_dir }}/workspace/' - dest: '{{ zuul.executor.log_root }}' - mode: pull - copy_links: true - verify_host: true - rsync_opts: - - --include=**/*nose_results.html - - --include=*/ - - --exclude=* - - --prune-empty-dirs - - - name: Copy files from {{ ansible_user_dir }}/workspace/ on node - synchronize: - src: '{{ ansible_user_dir }}/workspace/' - dest: '{{ zuul.executor.log_root }}' - mode: pull - copy_links: true - verify_host: true - rsync_opts: - - --include=**/*testr_results.html.gz - - --include=*/ - - --exclude=* - - --prune-empty-dirs - - - name: Copy files from {{ ansible_user_dir }}/workspace/ on node - synchronize: - src: '{{ ansible_user_dir }}/workspace/' - dest: '{{ zuul.executor.log_root }}' - mode: pull - copy_links: true - verify_host: true - rsync_opts: - - --include=/.testrepository/tmp* - - --include=*/ - - --exclude=* - - --prune-empty-dirs - - - name: Copy files from {{ ansible_user_dir }}/workspace/ on node - synchronize: - src: '{{ ansible_user_dir }}/workspace/' - dest: '{{ zuul.executor.log_root }}' - mode: pull - copy_links: true - verify_host: true - rsync_opts: - - --include=**/*testrepository.subunit.gz - - --include=*/ - - --exclude=* - - --prune-empty-dirs - - - name: Copy files from {{ ansible_user_dir }}/workspace/ on node - synchronize: - src: '{{ ansible_user_dir }}/workspace/' - dest: '{{ zuul.executor.log_root }}/tox' - mode: pull - copy_links: true - verify_host: true - rsync_opts: - - --include=/.tox/*/log/* - - --include=*/ - - --exclude=* - - --prune-empty-dirs - - - name: Copy files from {{ ansible_user_dir }}/workspace/ on node - synchronize: - src: '{{ ansible_user_dir }}/workspace/' - dest: '{{ zuul.executor.log_root }}' - mode: pull - copy_links: true - verify_host: true - rsync_opts: - - --include=/logs/** - - --include=*/ - - --exclude=* - - --prune-empty-dirs diff --git a/playbooks/legacy/congress-devstack-py35-api-mysql/run.yaml b/playbooks/legacy/congress-devstack-py35-api-mysql/run.yaml deleted file mode 100644 index 14134d1b7..000000000 --- a/playbooks/legacy/congress-devstack-py35-api-mysql/run.yaml +++ /dev/null @@ -1,89 +0,0 @@ -- hosts: all - name: Autoconverted job legacy-congress-dsvm-py35-api-mysql from old job gate-congress-dsvm-py35-api-mysql-ubuntu-xenial-nv - tasks: - - - name: Ensure legacy workspace directory - file: - path: '{{ ansible_user_dir }}/workspace' - state: directory - - - shell: - cmd: | - set -e - set -x - cat > clonemap.yaml << EOF - clonemap: - - name: openstack-infra/devstack-gate - dest: devstack-gate - EOF - /usr/zuul-env/bin/zuul-cloner -m clonemap.yaml --cache-dir /opt/git \ - git://git.openstack.org \ - openstack-infra/devstack-gate - executable: /bin/bash - chdir: '{{ ansible_user_dir }}/workspace' - environment: '{{ zuul | zuul_legacy_vars }}' - - - shell: - cmd: | - set -e - set -x - cat << 'EOF' >>"/tmp/dg-local.conf" - [[local|localrc]] - # swift is not ready for python3 yet - disable_service s-account - disable_service s-container - disable_service s-object - disable_service s-proxy - # without Swift, c-bak cannot run (in the Gate at least) - disable_service c-bak - # aodh not ready for python3 yet - # enable_plugin aodh git://git.openstack.org/openstack/aodh - enable_plugin heat git://git.openstack.org/openstack/heat - enable_plugin congress git://git.openstack.org/openstack/congress - enable_plugin murano git://git.openstack.org/openstack/murano - enable_plugin neutron https://git.openstack.org/openstack/neutron - # To deploy congress as multi-process (api, pe, datasources) - CONGRESS_MULTIPROCESS_DEPLOYMENT=True - CONGRESS_EXPOSE_ENCRYPTION_KEY_FOR_TEST=True - LIBS_FROM_GIT=python-congressclient - ENABLE_CONGRESS_Z3=True - USE_Z3_RELEASE=4.7.1 - TEMPEST_PLUGINS='/opt/stack/new/congress-tempest-plugin /opt/stack/new/murano-tempest-plugin /opt/stack/new/heat-tempest-plugin' - EOF - executable: /bin/bash - chdir: '{{ ansible_user_dir }}/workspace' - environment: '{{ zuul | zuul_legacy_vars }}' - - - shell: - cmd: | - set -e - set -x - export DEVSTACK_GATE_USE_PYTHON3=True - # swift is not ready for python3 yet - # ENABLED_SERVICES=s-proxy,s-object,s-container,s-account, - ENABLED_SERVICES+=neutron-qos - export PYTHONUNBUFFERED=true - export DEVSTACK_GATE_TEMPEST=1 - export DEVSTACK_GATE_TEMPEST_REGEX="congress_tempest_plugin" - export DEVSTACK_GATE_NEUTRON=1 - export PROJECTS="openstack/congress $PROJECTS" - export PROJECTS="openstack/congress-dashboard $PROJECTS" - export PROJECTS="openstack/python-congressclient $PROJECTS" - export PROJECTS="openstack/congress-tempest-plugin $PROJECTS" - export PROJECTS="openstack/murano $PROJECTS" - export PROJECTS="openstack/murano-dashboard $PROJECTS" - export PROJECTS="openstack/python-muranoclient $PROJECTS" - export PROJECTS="openstack/murano-tempest-plugin $PROJECTS" - export PROJECTS="openstack/heat-tempest-plugin $PROJECTS" - - export ENABLED_SERVICES - export BRANCH_OVERRIDE=default - if [ "$BRANCH_OVERRIDE" != "default" ] ; then - export OVERRIDE_ZUUL_BRANCH=$BRANCH_OVERRIDE - fi - - cp devstack-gate/devstack-vm-gate-wrap.sh ./safe-devstack-vm-gate-wrap.sh - ./safe-devstack-vm-gate-wrap.sh - executable: /bin/bash - chdir: '{{ ansible_user_dir }}/workspace' - environment: '{{ zuul | zuul_legacy_vars }}' diff --git a/playbooks/legacy/congress-pe-replicated-base/post.yaml b/playbooks/legacy/congress-pe-replicated-base/post.yaml deleted file mode 100644 index dac875340..000000000 --- a/playbooks/legacy/congress-pe-replicated-base/post.yaml +++ /dev/null @@ -1,80 +0,0 @@ -- hosts: primary - tasks: - - - name: Copy files from {{ ansible_user_dir }}/workspace/ on node - synchronize: - src: '{{ ansible_user_dir }}/workspace/' - dest: '{{ zuul.executor.log_root }}' - mode: pull - copy_links: true - verify_host: true - rsync_opts: - - --include=**/*nose_results.html - - --include=*/ - - --exclude=* - - --prune-empty-dirs - - - name: Copy files from {{ ansible_user_dir }}/workspace/ on node - synchronize: - src: '{{ ansible_user_dir }}/workspace/' - dest: '{{ zuul.executor.log_root }}' - mode: pull - copy_links: true - verify_host: true - rsync_opts: - - --include=**/*testr_results.html.gz - - --include=*/ - - --exclude=* - - --prune-empty-dirs - - - name: Copy files from {{ ansible_user_dir }}/workspace/ on node - synchronize: - src: '{{ ansible_user_dir }}/workspace/' - dest: '{{ zuul.executor.log_root }}' - mode: pull - copy_links: true - verify_host: true - rsync_opts: - - --include=/.testrepository/tmp* - - --include=*/ - - --exclude=* - - --prune-empty-dirs - - - name: Copy files from {{ ansible_user_dir }}/workspace/ on node - synchronize: - src: '{{ ansible_user_dir }}/workspace/' - dest: '{{ zuul.executor.log_root }}' - mode: pull - copy_links: true - verify_host: true - rsync_opts: - - --include=**/*testrepository.subunit.gz - - --include=*/ - - --exclude=* - - --prune-empty-dirs - - - name: Copy files from {{ ansible_user_dir }}/workspace/ on node - synchronize: - src: '{{ ansible_user_dir }}/workspace/' - dest: '{{ zuul.executor.log_root }}/tox' - mode: pull - copy_links: true - verify_host: true - rsync_opts: - - --include=/.tox/*/log/* - - --include=*/ - - --exclude=* - - --prune-empty-dirs - - - name: Copy files from {{ ansible_user_dir }}/workspace/ on node - synchronize: - src: '{{ ansible_user_dir }}/workspace/' - dest: '{{ zuul.executor.log_root }}' - mode: pull - copy_links: true - verify_host: true - rsync_opts: - - --include=/logs/** - - --include=*/ - - --exclude=* - - --prune-empty-dirs diff --git a/playbooks/legacy/congress-pe-replicated-base/run.yaml b/playbooks/legacy/congress-pe-replicated-base/run.yaml deleted file mode 100644 index 6ef8bdebc..000000000 --- a/playbooks/legacy/congress-pe-replicated-base/run.yaml +++ /dev/null @@ -1,90 +0,0 @@ -- hosts: all - name: Congress pe-replicated base - tasks: - - - name: Ensure legacy workspace directory - file: - path: '{{ ansible_user_dir }}/workspace' - state: directory - - - shell: - cmd: | - set -e - set -x - cat > clonemap.yaml << EOF - clonemap: - - name: openstack-infra/devstack-gate - dest: devstack-gate - EOF - /usr/zuul-env/bin/zuul-cloner -m clonemap.yaml --cache-dir /opt/git \ - git://git.openstack.org \ - openstack-infra/devstack-gate - executable: /bin/bash - 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 heat git://git.openstack.org/openstack/heat - enable_plugin congress git://git.openstack.org/openstack/congress - enable_plugin murano git://git.openstack.org/openstack/murano - enable_plugin aodh git://git.openstack.org/openstack/aodh - enable_plugin mistral git://git.openstack.org/openstack/mistral - enable_plugin neutron https://git.openstack.org/openstack/neutron - CONGRESS_REPLICATED=True - # To deploy congress as multi-process (api, pe, datasources) - CONGRESS_MULTIPROCESS_DEPLOYMENT=True - CONGRESS_EXPOSE_ENCRYPTION_KEY_FOR_TEST=True - LIBS_FROM_GIT=python-congressclient - TEMPEST_PLUGINS='/opt/stack/new/congress-tempest-plugin /opt/stack/new/telemetry-tempest-plugin /opt/stack/new/murano-tempest-plugin /opt/stack/new/heat-tempest-plugin /opt/stack/new/mistral-tempest-plugin' - - EOF - executable: /bin/bash - chdir: '{{ ansible_user_dir }}/workspace' - environment: '{{ zuul | zuul_legacy_vars }}' - - - shell: - cmd: | - set -e - set -x - ENABLED_SERVICES=s-proxy,s-object,s-container,s-account, - ENABLED_SERVICES+=neutron-qos - - export PYTHONUNBUFFERED=true - export DEVSTACK_GATE_TEMPEST=1 - export DEVSTACK_GATE_TEMPEST_REGEX="congress_tempest_plugin" - export DEVSTACK_GATE_NEUTRON=1 - export PROJECTS="openstack/congress $PROJECTS" - export PROJECTS="openstack/congress-dashboard $PROJECTS" - export PROJECTS="openstack/python-congressclient $PROJECTS" - export PROJECTS="openstack/congress-tempest-plugin $PROJECTS" - export PROJECTS="openstack/murano $PROJECTS" - export PROJECTS="openstack/mistral $PROJECTS" - export PROJECTS="openstack/python-mistralclient $PROJECTS" - export PROJECTS="openstack/mistral-tempest-plugin $PROJECTS" - export PROJECTS="openstack/murano-dashboard $PROJECTS" - export PROJECTS="openstack/python-muranoclient $PROJECTS" - export PROJECTS="openstack/aodh $PROJECTS" - export PROJECTS="openstack/python-aodhclient $PROJECTS" - export PROJECTS="openstack/telemetry-tempest-plugin $PROJECTS" - export PROJECTS="openstack/murano-tempest-plugin $PROJECTS" - export PROJECTS="openstack/heat-tempest-plugin $PROJECTS" - - export ENABLED_SERVICES - export BRANCH_OVERRIDE=default - if [ "$BRANCH_OVERRIDE" != "default" ] ; then - export OVERRIDE_ZUUL_BRANCH=$BRANCH_OVERRIDE - fi - if [ "{{ database }}" == "postgresql" ] ; then - export DEVSTACK_GATE_POSTGRES=1 - fi - - cp devstack-gate/devstack-vm-gate-wrap.sh ./safe-devstack-vm-gate-wrap.sh - ./safe-devstack-vm-gate-wrap.sh - executable: /bin/bash - chdir: '{{ ansible_user_dir }}/workspace' - environment: '{{ zuul | zuul_legacy_vars }}'