From 579c98ad0a320e9030d5e3866fbae6ac473db063 Mon Sep 17 00:00:00 2001 From: zhurong Date: Sat, 28 Jul 2018 13:56:36 +0800 Subject: [PATCH] Remove legacy-muranoclient-dsvm-functional-mysql-backend for muranoclient We move legacy-muranoclient-dsvm-functional-mysql-backend job to muranoclient, so remove this job from here. Depends-On: https://review.openstack.org/586748/ Change-Id: Id8a69b17f4b97b845e941f223513b19a9e862c0d --- .../post.yaml | 80 ------------------- .../run.yaml | 74 ----------------- zuul.d/zuul-legacy-jobs.yaml | 14 ---- 3 files changed, 168 deletions(-) delete mode 100644 playbooks/legacy/muranoclient-dsvm-functional-mysql-backend/post.yaml delete mode 100644 playbooks/legacy/muranoclient-dsvm-functional-mysql-backend/run.yaml diff --git a/playbooks/legacy/muranoclient-dsvm-functional-mysql-backend/post.yaml b/playbooks/legacy/muranoclient-dsvm-functional-mysql-backend/post.yaml deleted file mode 100644 index dac87534..00000000 --- a/playbooks/legacy/muranoclient-dsvm-functional-mysql-backend/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/muranoclient-dsvm-functional-mysql-backend/run.yaml b/playbooks/legacy/muranoclient-dsvm-functional-mysql-backend/run.yaml deleted file mode 100644 index 6e0934ee..00000000 --- a/playbooks/legacy/muranoclient-dsvm-functional-mysql-backend/run.yaml +++ /dev/null @@ -1,74 +0,0 @@ -- hosts: all - name: Autoconverted job legacy-muranoclient-dsvm-functional-mysql-backend from old - job gate-muranoclient-dsvm-functional-mysql-backend-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 - export PYTHONUNBUFFERED=true - export DEVSTACK_GATE_NEUTRON=1 - export DEVSTACK_PROJECT_FROM_GIT=python-muranoclient - export BRANCH_OVERRIDE=default - - 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 KEEP_LOCALRC=1 - - # Enable murano devstack plugin. Provided repo should be cloned by zuul before devstack run - # and below provided link should not be used. - export DEVSTACK_LOCAL_CONFIG="enable_plugin heat git://git.openstack.org/openstack/heat" - export DEVSTACK_LOCAL_CONFIG+=$'\n'"enable_plugin murano git://git.openstack.org/openstack/murano" - - if [ "mysql-backend" = "glare-backend" ]; then - export DEVSTACK_LOCAL_CONFIG+=$'\n'"enable_service g-glare" - export DEVSTACK_LOCAL_CONFIG+=$'\n'"MURANO_USE_GLARE=True" - fi - - if [ "$BRANCH_OVERRIDE" != "default" ] ; then - export OVERRIDE_ZUUL_BRANCH=$BRANCH_OVERRIDE - fi - - function pre_test_hook { - # Install Murano devstack modules - cd /opt/stack/new/murano/functionaltests - ./pre_test_hook.sh - } - export -f pre_test_hook - - function post_test_hook { - # Configure and run functional tests - /opt/stack/new/python-muranoclient/muranoclient/tests/functional/hooks/post_test_hook.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 }}' diff --git a/zuul.d/zuul-legacy-jobs.yaml b/zuul.d/zuul-legacy-jobs.yaml index 48b4c513..71a3b3c3 100644 --- a/zuul.d/zuul-legacy-jobs.yaml +++ b/zuul.d/zuul-legacy-jobs.yaml @@ -872,20 +872,6 @@ run: playbooks/legacy/monasca-thresh-maven-build/run.yaml timeout: 1800 -- job: - name: legacy-muranoclient-dsvm-functional-mysql-backend - parent: legacy-dsvm-base - run: playbooks/legacy/muranoclient-dsvm-functional-mysql-backend/run.yaml - post-run: playbooks/legacy/muranoclient-dsvm-functional-mysql-backend/post.yaml - timeout: 4200 - required-projects: - - openstack-infra/devstack-gate - - openstack/heat - - openstack/murano - - openstack/murano-dashboard - - openstack/python-heatclient - - openstack/python-muranoclient - - job: name: legacy-networking-bagpipe-dsvm-fullstack parent: legacy-dsvm-base