From 3cfd3fc38549de58075e6b5ce55bfe12f5b27485 Mon Sep 17 00:00:00 2001 From: zhurong Date: Mon, 30 Jul 2018 16:50:57 +0800 Subject: [PATCH] Using native Zuulv3 jobs Change-Id: I3dac2be8108c305128f4807693da7eb2db568902 --- .zuul.yaml | 51 ++++++------ .../legacy/tempest-dsvm-murano-api/post.yaml | 80 ------------------- .../legacy/tempest-dsvm-murano-api/run.yaml | 72 ----------------- .../tempest-dsvm-murano-cfapi/post.yaml | 80 ------------------- .../legacy/tempest-dsvm-murano-cfapi/run.yaml | 72 ----------------- 5 files changed, 26 insertions(+), 329 deletions(-) delete mode 100644 playbooks/legacy/tempest-dsvm-murano-api/post.yaml delete mode 100644 playbooks/legacy/tempest-dsvm-murano-api/run.yaml delete mode 100644 playbooks/legacy/tempest-dsvm-murano-cfapi/post.yaml delete mode 100644 playbooks/legacy/tempest-dsvm-murano-cfapi/run.yaml diff --git a/.zuul.yaml b/.zuul.yaml index 0745a1e9a..660b48109 100644 --- a/.zuul.yaml +++ b/.zuul.yaml @@ -48,10 +48,8 @@ - openstack/rally-openstack - job: - name: murano-tempest-api - parent: legacy-dsvm-base - run: playbooks/legacy/tempest-dsvm-murano-api/run.yaml - post-run: playbooks/legacy/tempest-dsvm-murano-api/post.yaml + name: murano-tempest-base + parent: devstack-tempest irrelevant-files: - ^(test-|)requirements.txt$ - ^setup.cfg$ @@ -61,7 +59,6 @@ - ^murano/tests/.*$ timeout: 7800 required-projects: - - openstack-infra/devstack-gate - openstack/heat - openstack/murano - openstack/murano-dashboard @@ -69,30 +66,34 @@ - openstack/python-muranoclient - openstack/tempest - openstack/murano-tempest-plugin + vars: + devstack_plugins: + murano: https://git.openstack.org/openstack/murano + heat: https://git.openstack.org/openstack/heat + devstack_services: + tempest: true + s-account: False + s-container: False + s-object: False + s-proxy: False + tls-proxy: false + devstack_localrc: + TEMPEST_PLUGINS: "'{{ ansible_user_dir }}/src/git.openstack.org/openstack/murano-tempest-plugin'" + tempest_test_regex: application_catalog + tox_envlist: all + +- job: + name: murano-tempest-api + parent: murano-tempest-base - job: name: murano-tempest-cfapi - parent: legacy-dsvm-base - run: playbooks/legacy/tempest-dsvm-murano-cfapi/run.yaml - post-run: playbooks/legacy/tempest-dsvm-murano-cfapi/post.yaml + parent: murano-tempest-base voting: false - irrelevant-files: - - ^(test-|)requirements.txt$ - - ^setup.cfg$ - - ^doc/.*$ - - ^.*\.rst$ - - ^releasenotes/.*$ - - ^murano/tests/.*$ - timeout: 7800 - required-projects: - - openstack-infra/devstack-gate - - openstack/heat - - openstack/murano - - openstack/murano-dashboard - - openstack/python-heatclient - - openstack/python-muranoclient - - openstack/tempest - - openstack/murano-tempest-plugin + vars: + devstack_services: + murano-cfapi: true + tempest_test_regex: service_broker - job: name: murano-functional diff --git a/playbooks/legacy/tempest-dsvm-murano-api/post.yaml b/playbooks/legacy/tempest-dsvm-murano-api/post.yaml deleted file mode 100644 index dac875340..000000000 --- a/playbooks/legacy/tempest-dsvm-murano-api/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/tempest-dsvm-murano-api/run.yaml b/playbooks/legacy/tempest-dsvm-murano-api/run.yaml deleted file mode 100644 index a6c351243..000000000 --- a/playbooks/legacy/tempest-dsvm-murano-api/run.yaml +++ /dev/null @@ -1,72 +0,0 @@ -- hosts: all - name: Autoconverted job legacy-tempest-dsvm-murano-api from old job gate-tempest-dsvm-murano-api-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]] - TEMPEST_PLUGINS='/opt/stack/new/murano-tempest-plugin' - 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=1 - export DEVSTACK_GATE_NEUTRON=1 - export ENABLED_SERVICES=tempest - 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 PROJECTS="openstack/murano-tempest-plugin $PROJECTS" - export BRANCH_OVERRIDE=default - if [ "$BRANCH_OVERRIDE" != "default" ] ; then - export OVERRIDE_ZUUL_BRANCH=$BRANCH_OVERRIDE - fi - if [ "api" = "cfapi" ]; then - export ENABLED_SERVICES+=,murano-cfapi - export DEVSTACK_GATE_TEMPEST_REGEX="service_broker" - elif [ "api" = "api" ]; then - export DEVSTACK_GATE_TEMPEST_REGEX="application_catalog" - elif [ "api" = "glare-backend" ]; then - export DEVSTACK_GATE_TEMPEST_REGEX="application_catalog" - export DEVSTACK_LOCAL_CONFIG+=$'\n'"enable_service g-glare" - export DEVSTACK_LOCAL_CONFIG+=$'\n'"MURANO_USE_GLARE=True" - 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/tempest-dsvm-murano-cfapi/post.yaml b/playbooks/legacy/tempest-dsvm-murano-cfapi/post.yaml deleted file mode 100644 index dac875340..000000000 --- a/playbooks/legacy/tempest-dsvm-murano-cfapi/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/tempest-dsvm-murano-cfapi/run.yaml b/playbooks/legacy/tempest-dsvm-murano-cfapi/run.yaml deleted file mode 100644 index 2718de073..000000000 --- a/playbooks/legacy/tempest-dsvm-murano-cfapi/run.yaml +++ /dev/null @@ -1,72 +0,0 @@ -- hosts: all - name: Autoconverted job legacy-tempest-dsvm-murano-cfapi from old job gate-tempest-dsvm-murano-cfapi-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]] - TEMPEST_PLUGINS='/opt/stack/new/murano-tempest-plugin' - 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=1 - export DEVSTACK_GATE_NEUTRON=1 - export ENABLED_SERVICES=tempest - 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 PROJECTS="openstack/murano-tempest-plugin $PROJECTS" - export BRANCH_OVERRIDE=default - if [ "$BRANCH_OVERRIDE" != "default" ] ; then - export OVERRIDE_ZUUL_BRANCH=$BRANCH_OVERRIDE - fi - if [ "cfapi" = "cfapi" ]; then - export ENABLED_SERVICES+=,murano-cfapi - export DEVSTACK_GATE_TEMPEST_REGEX="service_broker" - elif [ "cfapi" = "api" ]; then - export DEVSTACK_GATE_TEMPEST_REGEX="application_catalog" - elif [ "cfapi" = "glare-backend" ]; then - export DEVSTACK_GATE_TEMPEST_REGEX="application_catalog" - export DEVSTACK_LOCAL_CONFIG+=$'\n'"enable_service g-glare" - export DEVSTACK_LOCAL_CONFIG+=$'\n'"MURANO_USE_GLARE=True" - 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 }}'