Merge "Remove ocata branch filters"

playbooks/legacy/tempest-dsvm-neutron-full-ocata/post.yaml

@@ -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

playbooks/legacy/tempest-dsvm-neutron-full-ocata/run.yaml

@@ -1,56 +0,0 @@
-- hosts: all
-  name: Autoconverted job legacy-tempest-dsvm-neutron-full-ocata from old job gate-tempest-dsvm-neutron-full-ubuntu-xenial-ocata-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/devstack-gate
-              dest: devstack-gate
-          EOF
-          /usr/zuul-env/bin/zuul-cloner -m clonemap.yaml --cache-dir /opt/git \
-              https://opendev.org \
-              openstack/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]]
-          ENABLE_FILE_INJECTION=True
-
-          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_TEMPEST_FULL=1
-          export DEVSTACK_GATE_NEUTRON=1
-          export DEVSTACK_GATE_TLSPROXY=1
-          export BRANCH_OVERRIDE=stable/ocata
-          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 }}'

zuul.d/jobs.yaml

@@ -1346,25 +1346,6 @@
       tox_envlist: deploy-guide
       tox_skip_pdf: true
 
-- job:
-    name: build-openstack-install-guide
-    parent: build-openstack-sphinx-docs
-    description: |
-      Build install-guide document.
-    vars:
-      sphinx_build_dir: install-guide/build
-      sphinx_source_dir: install-guide/source
-    # This job runs only pre-pike, with pike the documents have been
-    # integrated into normal builds.
-    branches:
-      - stable/newton
-      - stable/ocata
-    files:
-      - ^install-guide/.*
-      - bindep.txt
-      - doc/requirements.txt
-      - test-requirements.txt
-
 - job:
     name: legacy-base
     abstract: true

zuul.d/project-templates.yaml

@@ -2638,20 +2638,6 @@
         - promote-deploy-guide:
             files: *deploy-guide-triggers
 
-- project-template:
-    name: install-guide-jobs
-    description: |
-      Build and publish install-guide document.
-    check:
-      jobs:
-        - build-openstack-install-guide
-    gate:
-      jobs:
-        - build-openstack-install-guide
-    post:
-      jobs:
-        - publish-install-guide
-
 - project-template:
     name: periodic-stable-jobs
     description: |

zuul.d/zuul-legacy-jobs.yaml

@@ -28,7 +28,7 @@
 - job:
     name: legacy-grenade-dsvm-cinder-mn-sub-volbak
     parent: legacy-dsvm-base-multinode
-    branches: ^(?!(driverfixes|stable/(newton|ocata))).*$
+    branches: ^(?!(driverfixes)).*$
     run: playbooks/legacy/grenade-dsvm-cinder-mn-sub-volbak/run.yaml
     post-run: playbooks/legacy/grenade-dsvm-cinder-mn-sub-volbak/post.yaml
     timeout: 10800
@@ -70,7 +70,6 @@
       - openstack/devstack-gate
       - openstack/neutron
       - openstack/neutron-fwaas
-    branches: ^(?!stable/(newton|ocata)).*$
 
 - job:
     name: legacy-grenade-dsvm-neutron-libs
@@ -91,7 +90,6 @@
       - openstack/python-keystoneclient
       - openstack/python-neutronclient
       - openstack/python-novaclient
-    branches: ^(?!stable/(newton|ocata)).*$
 
 - job:
     name: legacy-grenade-dsvm-neutron-linuxbridge-multinode
@@ -103,7 +101,6 @@
       - openstack/grenade
       - openstack/devstack-gate
       - openstack/neutron
-    branches: ^(?!stable/(newton|ocata)).*$
 
 - job:
     name: legacy-grenade-dsvm-neutron-multinode-zero-downtime
@@ -115,7 +112,6 @@
       - openstack/grenade
       - openstack/devstack-gate
       - openstack/neutron
-    branches: ^(?!stable/(newton|ocata)).*$
 
 - job:
     name: legacy-group-based-policy-dsvm-aim
@@ -602,18 +598,6 @@
       - openstack/neutron
       - openstack/tempest
 
-- job:
-    name: legacy-tempest-dsvm-neutron-full-ocata
-    parent: legacy-dsvm-base
-    run: playbooks/legacy/tempest-dsvm-neutron-full-ocata/run.yaml
-    post-run: playbooks/legacy/tempest-dsvm-neutron-full-ocata/post.yaml
-    timeout: 10800
-    required-projects:
-      - openstack/devstack-gate
-      - openstack/neutron
-      - openstack/tempest
-    nodeset: legacy-ubuntu-xenial
-
 - job:
     name: legacy-tempest-dsvm-neutron-pecan
     parent: legacy-dsvm-base

zuul.d/zuul-legacy-project-templates.yaml

@@ -14,8 +14,6 @@
       OpenStack functionality.
     check:
       jobs:
-        - legacy-tempest-dsvm-neutron-full:
-            branches: ^stable/(newton|ocata)$
         - tempest-full
         - neutron-grenade:
             # NOTE(gmann): Do not run the grenade job for
@@ -25,8 +23,6 @@
             branches: ^stable/(queens|rocky|stein|train).*$
     gate:
       jobs:
-        - legacy-tempest-dsvm-neutron-full:
-            branches: ^stable/(newton|ocata)$
         - tempest-full
         - neutron-grenade:
             # NOTE(gmann): Do not run the grenade job for