diff --git a/.zuul.yaml b/.zuul.yaml index d272d8105..14f25780c 100644 --- a/.zuul.yaml +++ b/.zuul.yaml @@ -19,9 +19,6 @@ queue: murano jobs: - murano-tempest-api - experimental: - jobs: - - murano-functional - job: name: murano-congress-devstack @@ -96,7 +93,7 @@ s-proxy: false tls-proxy: false devstack_localrc: - TEMPEST_PLUGINS: "'{{ ansible_user_dir }}/src/git.openstack.org/openstack/murano-tempest-plugin'" + TEMPEST_PLUGINS: "/opt/stack/murano-tempest-plugin" tempest_test_regex: application_catalog tox_envlist: all @@ -112,17 +109,3 @@ devstack_services: murano-cfapi: true tempest_test_regex: service_broker - -- job: - name: murano-functional - parent: legacy-dsvm-base - run: playbooks/legacy/murano-dsvm-functional/run.yaml - post-run: playbooks/legacy/murano-dsvm-functional/post.yaml - timeout: 7800 - required-projects: - - openstack-infra/devstack-gate - - openstack/heat - - openstack/murano - - openstack/murano-dashboard - - openstack/python-heatclient - - openstack/python-muranoclient diff --git a/playbooks/legacy/murano-dsvm-functional/post.yaml b/playbooks/legacy/murano-dsvm-functional/post.yaml deleted file mode 100644 index dac875340..000000000 --- a/playbooks/legacy/murano-dsvm-functional/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/murano-dsvm-functional/run.yaml b/playbooks/legacy/murano-dsvm-functional/run.yaml deleted file mode 100644 index fcd00e25b..000000000 --- a/playbooks/legacy/murano-dsvm-functional/run.yaml +++ /dev/null @@ -1,69 +0,0 @@ -- hosts: all - name: Autoconverted job legacy-murano-dsvm-functional from old job gate-murano-dsvm-functional-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 murano git://git.openstack.org/openstack/murano - - EOF - executable: /bin/bash - chdir: '{{ ansible_user_dir }}/workspace' - environment: '{{ zuul | zuul_legacy_vars }}' - - - shell: - cmd: | - set -e - set -x - export PYTHONUNBUFFERED=true - export DEVSTACK_GATE_TEMPEST=0 - export DEVSTACK_GATE_TEMPEST_NOTESTS=1 - export DEVSTACK_GATE_NEUTRON=1 - - export PROJECTS="openstack/heat $PROJECTS" - export PROJECTS="openstack/python-heatclient $PROJECTS" - export PROJECTS="openstack/murano $PROJECTS" - export PROJECTS="openstack/murano-dashboard $PROJECTS" - export PROJECTS="openstack/python-muranoclient $PROJECTS" - - export BRANCH_OVERRIDE=default - if [ "$BRANCH_OVERRIDE" != "default" ] ; then - export OVERRIDE_ZUUL_BRANCH=$BRANCH_OVERRIDE - fi - - function post_test_hook { - source $BASE/new/murano/functionaltests/post_test_hook_experimental.sh - } - export -f post_test_hook - - 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 }}'