From 4d9da421bcf3965cc68bf915eb280731e3e93dcc Mon Sep 17 00:00:00 2001 From: Miguel Lavalle Date: Tue, 13 Feb 2018 12:23:07 -0600 Subject: [PATCH] Removing Neutron periodic jobs Neutron periodic jobs definitions have been moved to the project's repo. This patch removes them from this project Depends-On: I2ed944dc70328b70dde5fd3e3db0e85ecc8d912e Change-Id: I528bd2d887c85ce47e73539676168795a80b8a2b --- .../post.yaml | 80 ------------------- .../periodic-neutron-dsvm-functional/run.yaml | 54 ------------- .../post.yaml | 15 ---- .../run.yaml | 46 ----------- .../post.yaml | 15 ---- .../run.yaml | 55 ------------- zuul.d/zuul-legacy-jobs.yaml | 35 -------- 7 files changed, 300 deletions(-) delete mode 100644 playbooks/legacy/periodic-neutron-dsvm-functional/post.yaml delete mode 100644 playbooks/legacy/periodic-neutron-dsvm-functional/run.yaml delete mode 100644 playbooks/legacy/periodic-tempest-dsvm-neutron-pg-full/post.yaml delete mode 100644 playbooks/legacy/periodic-tempest-dsvm-neutron-pg-full/run.yaml delete mode 100644 playbooks/legacy/periodic-tempest-dsvm-neutron-with-ryu-master/post.yaml delete mode 100644 playbooks/legacy/periodic-tempest-dsvm-neutron-with-ryu-master/run.yaml diff --git a/playbooks/legacy/periodic-neutron-dsvm-functional/post.yaml b/playbooks/legacy/periodic-neutron-dsvm-functional/post.yaml deleted file mode 100644 index dac87534..00000000 --- a/playbooks/legacy/periodic-neutron-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/periodic-neutron-dsvm-functional/run.yaml b/playbooks/legacy/periodic-neutron-dsvm-functional/run.yaml deleted file mode 100644 index 5e4dbf3c..00000000 --- a/playbooks/legacy/periodic-neutron-dsvm-functional/run.yaml +++ /dev/null @@ -1,54 +0,0 @@ -- hosts: all - name: Autoconverted job legacy-periodic-neutron-dsvm-functional from old job periodic-neutron-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 - export PYTHONUNBUFFERED=true - export DEVSTACK_GATE_TEMPEST=0 - export DEVSTACK_GATE_EXERCISES=0 - export DEVSTACK_GATE_NEUTRON=1 - export DEVSTACK_GATE_INSTALL_TESTONLY=1 - export BRANCH_OVERRIDE=master - if [ "$BRANCH_OVERRIDE" != "default" ] ; then - export OVERRIDE_ZUUL_BRANCH=$BRANCH_OVERRIDE - fi - - function gate_hook { - bash -xe $BASE/new/neutron/neutron/tests/contrib/gate_hook.sh dsvm-functional - } - export -f gate_hook - - function post_test_hook { - bash -xe $BASE/new/neutron/neutron/tests/contrib/post_test_hook.sh dsvm-functional - } - 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/legacy/periodic-tempest-dsvm-neutron-pg-full/post.yaml b/playbooks/legacy/periodic-tempest-dsvm-neutron-pg-full/post.yaml deleted file mode 100644 index e07f5510..00000000 --- a/playbooks/legacy/periodic-tempest-dsvm-neutron-pg-full/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/legacy/periodic-tempest-dsvm-neutron-pg-full/run.yaml b/playbooks/legacy/periodic-tempest-dsvm-neutron-pg-full/run.yaml deleted file mode 100644 index 258b048a..00000000 --- a/playbooks/legacy/periodic-tempest-dsvm-neutron-pg-full/run.yaml +++ /dev/null @@ -1,46 +0,0 @@ -- hosts: all - name: Autoconverted job legacy-periodic-tempest-dsvm-neutron-pg-full from old job - periodic-tempest-dsvm-neutron-pg-full-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_TEMPEST=1 - export DEVSTACK_GATE_TEMPEST_FULL=1 - export DEVSTACK_GATE_POSTGRES=1 - export DEVSTACK_GATE_NEUTRON=1 - export DEVSTACK_GATE_CONFIGDRIVE=0 - export DEVSTACK_GATE_TLSPROXY=1 - export BRANCH_OVERRIDE=master - 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/periodic-tempest-dsvm-neutron-with-ryu-master/post.yaml b/playbooks/legacy/periodic-tempest-dsvm-neutron-with-ryu-master/post.yaml deleted file mode 100644 index e07f5510..00000000 --- a/playbooks/legacy/periodic-tempest-dsvm-neutron-with-ryu-master/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/legacy/periodic-tempest-dsvm-neutron-with-ryu-master/run.yaml b/playbooks/legacy/periodic-tempest-dsvm-neutron-with-ryu-master/run.yaml deleted file mode 100644 index 6de10198..00000000 --- a/playbooks/legacy/periodic-tempest-dsvm-neutron-with-ryu-master/run.yaml +++ /dev/null @@ -1,55 +0,0 @@ -- hosts: all - name: Autoconverted job legacy-periodic-tempest-dsvm-neutron-with-ryu-master from - old job periodic-tempest-dsvm-neutron-with-ryu-master-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_TEMPEST=1 - export DEVSTACK_GATE_TEMPEST_FULL=1 - export DEVSTACK_GATE_NEUTRON=1 - export DEVSTACK_GATE_TLSPROXY=1 - export BRANCH_OVERRIDE=master - if [ "$BRANCH_OVERRIDE" != "default" ] ; then - export OVERRIDE_ZUUL_BRANCH=$BRANCH_OVERRIDE - fi - - function gate_hook { - local ryu_path=$BASE/new/ryu_master - if [ ! -d $ryu_path ]; then - git clone https://github.com/osrg/ryu $ryu_path - fi - sudo pip install -e $ryu_path - $BASE/new/devstack-gate/devstack-vm-gate.sh - } - export -f gate_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 20b6c178..89dfb446 100644 --- a/zuul.d/zuul-legacy-jobs.yaml +++ b/zuul.d/zuul-legacy-jobs.yaml @@ -2227,17 +2227,6 @@ required-projects: - openstack/requirements -- job: - name: legacy-periodic-neutron-dsvm-functional - parent: legacy-dsvm-base - run: playbooks/legacy/periodic-neutron-dsvm-functional/run.yaml - post-run: playbooks/legacy/periodic-neutron-dsvm-functional/post.yaml - timeout: 7800 - branches: master - required-projects: - - openstack-infra/devstack-gate - - openstack/neutron - - job: name: legacy-periodic-neutron-dynamic-routing-dsvm-tempest-with-ryu-master-scenario-ipv4 parent: legacy-dsvm-base @@ -2371,30 +2360,6 @@ - openstack/neutron - openstack/tempest -- job: - name: legacy-periodic-tempest-dsvm-neutron-pg-full - parent: legacy-dsvm-base - run: playbooks/legacy/periodic-tempest-dsvm-neutron-pg-full/run.yaml - post-run: playbooks/legacy/periodic-tempest-dsvm-neutron-pg-full/post.yaml - timeout: 10800 - branches: master - required-projects: - - openstack-infra/devstack-gate - - openstack/neutron - - openstack/tempest - -- job: - name: legacy-periodic-tempest-dsvm-neutron-with-ryu-master - parent: legacy-dsvm-base - run: playbooks/legacy/periodic-tempest-dsvm-neutron-with-ryu-master/run.yaml - post-run: playbooks/legacy/periodic-tempest-dsvm-neutron-with-ryu-master/post.yaml - timeout: 10800 - branches: master - required-projects: - - openstack-infra/devstack-gate - - openstack/neutron - - openstack/tempest - - job: name: legacy-periodic-tempest-dsvm-nnet-newton parent: legacy-dsvm-base