From 3d0a027186ee8bf83c69b66be5dbebfbe4e2566a Mon Sep 17 00:00:00 2001 From: Matt Riedemann Date: Tue, 31 Oct 2017 10:16:17 -0400 Subject: [PATCH] Don't run legacy-grenade-dsvm-neutron* jobs in newton or ocata Neutron's newton branch is now EOL so we can't run neutron grenade jobs in stable/newton or stable/ocata since newton won't install. Notes: legacy-grenade-dsvm-neutron-forward is omitted since the grenade forward job in ocata shouldn't be affected by newton-eol. legacy-grenade-dsvm-neutron-multinode-live-migration and legacy-grenade-dsvm-neutron-dvr-multinode branch restrictions are pulled in from project-config and updated for ocata. legacy-grenade-dsvm-neutron-nova-next is removed since it was pinned to stable/ocata in project-config and only makes sense in a stable/ocata environment. Depends-On: If56e8053a3b340d9770c52283900e091a7b02de5 Change-Id: I9f0421d4b3b821c710075a8532a255fd5851daa0 --- .../grenade-dsvm-neutron-nova-next/post.yaml | 15 ----- .../grenade-dsvm-neutron-nova-next/run.yaml | 58 ------------------- zuul.d/zuul-legacy-jobs.yaml | 20 +++---- 3 files changed, 8 insertions(+), 85 deletions(-) delete mode 100644 playbooks/legacy/grenade-dsvm-neutron-nova-next/post.yaml delete mode 100644 playbooks/legacy/grenade-dsvm-neutron-nova-next/run.yaml diff --git a/playbooks/legacy/grenade-dsvm-neutron-nova-next/post.yaml b/playbooks/legacy/grenade-dsvm-neutron-nova-next/post.yaml deleted file mode 100644 index e07f5510..00000000 --- a/playbooks/legacy/grenade-dsvm-neutron-nova-next/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/grenade-dsvm-neutron-nova-next/run.yaml b/playbooks/legacy/grenade-dsvm-neutron-nova-next/run.yaml deleted file mode 100644 index c1e39aaa..00000000 --- a/playbooks/legacy/grenade-dsvm-neutron-nova-next/run.yaml +++ /dev/null @@ -1,58 +0,0 @@ -- hosts: all - name: Autoconverted job legacy-grenade-dsvm-neutron-nova-next from old job gate-grenade-dsvm-neutron-nova-next-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]] - # NOTE(mriedem): cells v2 should be the default after newton-eol - NOVA_CONFIGURE_CELLSV2=True - - EOF - executable: /bin/bash - chdir: '{{ ansible_user_dir }}/workspace' - environment: '{{ zuul | zuul_legacy_vars }}' - - - shell: - cmd: | - set -e - set -x - export ENABLED_SERVICES=placement-api - export PROJECTS="openstack-dev/grenade $PROJECTS" - export PYTHONUNBUFFERED=true - export DEVSTACK_GATE_TEMPEST=1 - export DEVSTACK_GATE_GRENADE=pullup - export DEVSTACK_GATE_NEUTRON=1 - export BRANCH_OVERRIDE=default - 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/zuul.d/zuul-legacy-jobs.yaml b/zuul.d/zuul-legacy-jobs.yaml index 7c1b058c..3c37b570 100644 --- a/zuul.d/zuul-legacy-jobs.yaml +++ b/zuul.d/zuul-legacy-jobs.yaml @@ -1662,6 +1662,7 @@ - openstack-dev/grenade - openstack-infra/devstack-gate - openstack/neutron + branches: ^(?!stable/(newton|ocata)).*$ - job: name: legacy-grenade-dsvm-neutron-dvr-multinode @@ -1674,6 +1675,7 @@ - openstack-infra/devstack-gate - openstack/neutron nodeset: legacy-ubuntu-xenial-2-node + branches: ^(?!(driverfixes|stable/(newton|ocata))).*$ - job: name: legacy-grenade-dsvm-neutron-forward @@ -1698,6 +1700,7 @@ - openstack/neutron - openstack/neutron-fwaas nodeset: legacy-ubuntu-xenial-2-node + branches: ^(?!stable/(newton|ocata)).*$ - job: name: legacy-grenade-dsvm-neutron-libs @@ -1718,6 +1721,7 @@ - openstack/python-keystoneclient - openstack/python-neutronclient - openstack/python-novaclient + branches: ^(?!stable/(newton|ocata)).*$ - job: name: legacy-grenade-dsvm-neutron-linuxbridge-multinode @@ -1730,6 +1734,7 @@ - openstack-infra/devstack-gate - openstack/neutron nodeset: legacy-ubuntu-xenial-2-node + branches: ^(?!stable/(newton|ocata)).*$ - job: name: legacy-grenade-dsvm-neutron-multinode @@ -1742,6 +1747,7 @@ - openstack-infra/devstack-gate - openstack/neutron nodeset: legacy-ubuntu-xenial-2-node + branches: ^(?!stable/(newton|ocata)).*$ - job: name: legacy-grenade-dsvm-neutron-multinode-live-migration @@ -1754,6 +1760,7 @@ - openstack-infra/devstack-gate - openstack/neutron nodeset: legacy-ubuntu-xenial-2-node + branches: ^(?!(driverfixes|stable/(newton|ocata))).*$ - job: name: legacy-grenade-dsvm-neutron-multinode-zero-downtime @@ -1766,18 +1773,7 @@ - openstack-infra/devstack-gate - openstack/neutron nodeset: legacy-ubuntu-xenial-2-node - -- job: - name: legacy-grenade-dsvm-neutron-nova-next - parent: legacy-dsvm-base - run: playbooks/legacy/grenade-dsvm-neutron-nova-next/run.yaml - post-run: playbooks/legacy/grenade-dsvm-neutron-nova-next/post.yaml - timeout: 10800 - required-projects: - - openstack-dev/grenade - - openstack-infra/devstack-gate - - openstack/neutron - - openstack/nova + branches: ^(?!stable/(newton|ocata)).*$ - job: name: legacy-grenade-dsvm-redis-zaqar