From b78b2055028cfa0e9266673a266c25ba212b548d Mon Sep 17 00:00:00 2001 From: Chandan Kumar Date: Thu, 16 Nov 2017 16:16:32 +0530 Subject: [PATCH] Remove neutron tempest plugin jobs from neutron project * https://review.openstack.org/520370 moves the zuulv3 neutron tempest plugin jobs to neutron-tempest-plugin as those jobs are meant for testing neutron tempest tests. If we donot move the jobs there we cannot inherit the same job to neutron project. Depends-On: I950913a2d76d1fd75dbf535c59c7879e5a93c092 Needed-By: I98c42a407e15e9db016103bd0b5484ad7f12649d Change-Id: Ic4e88f1f9d2ea7803efe8d0e32117df304d6d3e5 --- .zuul.yaml | 59 -------------- .../neutron-tempest-plugin-api/post.yaml | 80 ------------------- playbooks/neutron-tempest-plugin-api/run.yaml | 68 ---------------- .../post.yaml | 15 ---- .../run.yaml | 71 ---------------- .../post.yaml | 80 ------------------- .../run.yaml | 71 ---------------- 7 files changed, 444 deletions(-) delete mode 100644 .zuul.yaml delete mode 100644 playbooks/neutron-tempest-plugin-api/post.yaml delete mode 100644 playbooks/neutron-tempest-plugin-api/run.yaml delete mode 100644 playbooks/neutron-tempest-plugin-dvr-multinode-scenario/post.yaml delete mode 100644 playbooks/neutron-tempest-plugin-dvr-multinode-scenario/run.yaml delete mode 100644 playbooks/neutron-tempest-plugin-scenario-linuxbridge/post.yaml delete mode 100644 playbooks/neutron-tempest-plugin-scenario-linuxbridge/run.yaml diff --git a/.zuul.yaml b/.zuul.yaml deleted file mode 100644 index cccafa727af..00000000000 --- a/.zuul.yaml +++ /dev/null @@ -1,59 +0,0 @@ -- job: - name: neutron-tempest-plugin-api - parent: legacy-dsvm-base - run: playbooks/neutron-tempest-plugin-api/run.yaml - post-run: playbooks/neutron-tempest-plugin-api/post.yaml - timeout: 10000 - required-projects: - - openstack-infra/devstack-gate - - openstack/neutron - - openstack/neutron-tempest-plugin - - openstack/tempest - irrelevant-files: - - ^(test-|)requirements.txt$ - - ^releasenotes/.*$ - - ^setup.cfg$ - voting: false - -- job: - name: neutron-tempest-plugin-scenario-linuxbridge - parent: legacy-dsvm-base - run: playbooks/neutron-tempest-plugin-scenario-linuxbridge/run.yaml - post-run: playbooks/neutron-tempest-plugin-scenario-linuxbridge/post.yaml - timeout: 10000 - required-projects: - - openstack-infra/devstack-gate - - openstack/neutron - - openstack/neutron-tempest-plugin - - openstack/tempest - irrelevant-files: - - ^(test-|)requirements.txt$ - - ^releasenotes/.*$ - - ^setup.cfg$ - voting: false - -- job: - name: neutron-tempest-plugin-dvr-multinode-scenario - parent: legacy-dsvm-base-multinode - run: playbooks/neutron-tempest-plugin-dvr-multinode-scenario/run.yaml - post-run: playbooks/neutron-tempest-plugin-dvr-multinode-scenario/post.yaml - nodeset: legacy-ubuntu-xenial-2-node - timeout: 10800 - required-projects: - - openstack-infra/devstack-gate - - openstack/neutron - - openstack/neutron-tempest-plugin - - openstack/tempest - irrelevant-files: - - ^(test-|)requirements.txt$ - - ^releasenotes/.*$ - - ^setup.cfg$ - voting: false - -- project: - name: openstack/neutron - check: - jobs: - - neutron-tempest-plugin-dvr-multinode-scenario - - neutron-tempest-plugin-scenario-linuxbridge - - neutron-tempest-plugin-api diff --git a/playbooks/neutron-tempest-plugin-api/post.yaml b/playbooks/neutron-tempest-plugin-api/post.yaml deleted file mode 100644 index dac875340aa..00000000000 --- a/playbooks/neutron-tempest-plugin-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/neutron-tempest-plugin-api/run.yaml b/playbooks/neutron-tempest-plugin-api/run.yaml deleted file mode 100644 index 3470bd4e3c7..00000000000 --- a/playbooks/neutron-tempest-plugin-api/run.yaml +++ /dev/null @@ -1,68 +0,0 @@ -- hosts: all - name: neutron-tempest-plugin-api - 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/neutron-tempest-plugin' - 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 DEVSTACK_GATE_EXERCISES=0 - export DEVSTACK_GATE_TEMPEST_REGEX="neutron_tempest_plugin.api" - export BRANCH_OVERRIDE=default - if [ "$BRANCH_OVERRIDE" != "default" ] ; then - export OVERRIDE_ZUUL_BRANCH=$BRANCH_OVERRIDE - fi - - export PROJECTS="openstack/neutron-tempest-plugin $PROJECTS" - - function gate_hook { - bash -xe $BASE/new/neutron/neutron/tests/contrib/gate_hook.sh api - } - export -f gate_hook - - function post_test_hook { - bash -xe $BASE/new/neutron/neutron/tests/contrib/post_test_hook.sh api - } - 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/playbooks/neutron-tempest-plugin-dvr-multinode-scenario/post.yaml b/playbooks/neutron-tempest-plugin-dvr-multinode-scenario/post.yaml deleted file mode 100644 index e07f5510ae7..00000000000 --- a/playbooks/neutron-tempest-plugin-dvr-multinode-scenario/post.yaml +++ /dev/null @@ -1,15 +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=/logs/** - - --include=*/ - - --exclude=* - - --prune-empty-dirs diff --git a/playbooks/neutron-tempest-plugin-dvr-multinode-scenario/run.yaml b/playbooks/neutron-tempest-plugin-dvr-multinode-scenario/run.yaml deleted file mode 100644 index d68747c7e8a..00000000000 --- a/playbooks/neutron-tempest-plugin-dvr-multinode-scenario/run.yaml +++ /dev/null @@ -1,71 +0,0 @@ -- hosts: all - name: neutron-tempest-plugin-dvr-multinode-scenario - 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/neutron-tempest-plugin' - 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 DEVSTACK_GATE_CONFIGDRIVE=0 - export DEVSTACK_GATE_TEMPEST_REGEX="(neutron_tempest_plugin.scenario)" - export TEMPEST_CONCURRENCY=2 - # Test DVR works multinode - export DEVSTACK_GATE_NEUTRON_DVR=1 - export BRANCH_OVERRIDE=default - if [ "$BRANCH_OVERRIDE" != "default" ] ; then - export OVERRIDE_ZUUL_BRANCH=$BRANCH_OVERRIDE - fi - export DEVSTACK_GATE_TOPOLOGY="multinode" - export PROJECTS="openstack/neutron-tempest-plugin $PROJECTS" - - function gate_hook { - bash -xe $BASE/new/neutron/neutron/tests/contrib/gate_hook.sh dsvm-scenario-ovs - } - export -f gate_hook - - function post_test_hook { - bash -xe $BASE/new/neutron/neutron/tests/contrib/post_test_hook.sh dsvm-scenario-ovs - } - 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/playbooks/neutron-tempest-plugin-scenario-linuxbridge/post.yaml b/playbooks/neutron-tempest-plugin-scenario-linuxbridge/post.yaml deleted file mode 100644 index dac875340aa..00000000000 --- a/playbooks/neutron-tempest-plugin-scenario-linuxbridge/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/neutron-tempest-plugin-scenario-linuxbridge/run.yaml b/playbooks/neutron-tempest-plugin-scenario-linuxbridge/run.yaml deleted file mode 100644 index f2be1309851..00000000000 --- a/playbooks/neutron-tempest-plugin-scenario-linuxbridge/run.yaml +++ /dev/null @@ -1,71 +0,0 @@ -- hosts: all - name: neutron-tempest-plugin-scenario-linuxbridge - 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]] - Q_AGENT=linuxbridge - PHYSICAL_NETWORK=default - TEMPEST_PLUGINS='/opt/stack/new/neutron-tempest-plugin' - - 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 DEVSTACK_GATE_EXERCISES=0 - export DEVSTACK_GATE_TEMPEST_REGEX="(neutron_tempest_plugin.scenario)" - export BRANCH_OVERRIDE=default - if [ "$BRANCH_OVERRIDE" != "default" ] ; then - export OVERRIDE_ZUUL_BRANCH=$BRANCH_OVERRIDE - fi - - export TEMPEST_CONCURRENCY=2 - export PROJECTS="openstack/neutron-tempest-plugin $PROJECTS" - function gate_hook { - bash -xe $BASE/new/neutron/neutron/tests/contrib/gate_hook.sh dsvm-scenario-linuxbridge dvrskip - } - export -f gate_hook - - function post_test_hook { - bash -xe $BASE/new/neutron/neutron/tests/contrib/post_test_hook.sh dsvm-scenario-linuxbridge - } - 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 }}'