Clean up ocata and pike branch filters
Since ocata and pike have transitioned to EOL, these filters are not needed anymore and can be deleted. This patch also removes some job definition which were only used for ocata and pike branches. Change-Id: I69ebf0ae122220ae8c88310094468aedb3f4a660
This commit is contained in:
Elod Illes
parent
6b1e64ade4
commit
a4936e55bc
@ -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
|
||||
@ -1,53 +0,0 @@
|
||||
- hosts: all
|
||||
name: Autoconverted job legacy-tempest-dsvm-neutron-src from old job gate-tempest-dsvm-neutron-src-{name}-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/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
|
||||
export PYTHONUNBUFFERED=true
|
||||
export DEVSTACK_GATE_TEMPEST=1
|
||||
export DEVSTACK_GATE_TEMPEST_FULL=1
|
||||
export DEVSTACK_GATE_NEUTRON=1
|
||||
export BRANCH_OVERRIDE=default
|
||||
if [ "$BRANCH_OVERRIDE" != "default" ] ; then
|
||||
export OVERRIDE_ZUUL_BRANCH=$BRANCH_OVERRIDE
|
||||
fi
|
||||
export DEVSTACK_PROJECT_FROM_GIT=$ZUUL_SHORT_PROJECT_NAME
|
||||
if [ "$DEVSTACK_PROJECT_FROM_GIT" == "django_openstack_auth" ] ; then
|
||||
export DEVSTACK_GATE_HORIZON=1
|
||||
fi
|
||||
|
||||
# Even if the branch is overridden, make sure we use
|
||||
# the correct branch using the OVERRIDE_*_PROJECT_BRANCH
|
||||
# variable.
|
||||
uc_project=`echo $DEVSTACK_PROJECT_FROM_GIT | tr [:lower:] [:upper:] | tr '-' '_' | sed 's/[^A-Z_]//'`
|
||||
export "OVERRIDE_"$uc_project"_PROJECT_BRANCH"=$ZUUL_BRANCH
|
||||
|
||||
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 }}'
|
||||
@ -6,7 +6,7 @@
|
||||
- job:
|
||||
name: build-openstack-sphinx-docs
|
||||
parent: build-sphinx-docs
|
||||
branches: ^stable/(ocata|pike|queens|rocky).*$
|
||||
branches: ^stable/(queens|rocky).*$
|
||||
nodeset: ubuntu-xenial
|
||||
description: |
|
||||
Builds documentation using Sphinx per a previous version of the
|
||||
@ -53,7 +53,7 @@
|
||||
Base job to run tox jobs with OpenStack project specific updates.
|
||||
|
||||
Processing upper-constraints files from openstack/requirements.
|
||||
branches: ^(?!stable/(ocata|pike|queens|rocky|stein|train|ussuri)).*$
|
||||
branches: ^(?!stable/(queens|rocky|stein|train|ussuri)).*$
|
||||
required-projects:
|
||||
- name: openstack/requirements
|
||||
vars:
|
||||
@ -92,12 +92,10 @@
|
||||
|
||||
Processing upper-constraints files from openstack/requirements.
|
||||
|
||||
This job runs on Xenial for stable/ocata, pike, queens and rocky. This
|
||||
This job runs on Xenial for stable/queens and rocky. This
|
||||
job is prepared to make sure all stable branches before stable/stein will
|
||||
keep running on xenial.
|
||||
branches:
|
||||
- stable/ocata
|
||||
- stable/pike
|
||||
- stable/queens
|
||||
- stable/rocky
|
||||
required-projects:
|
||||
@ -122,7 +120,7 @@
|
||||
Run unit tests for an OpenStack Python project under cPython version 2.7.
|
||||
|
||||
Uses tox with the ``py27`` environment.
|
||||
branches: ^(?!stable/(ocata|pike|queens|rocky)).*$
|
||||
branches: ^(?!stable/(queens|rocky)).*$
|
||||
irrelevant-files: &common-irrelevant-files
|
||||
- ^.*\.rst$
|
||||
- ^api-ref/.*$
|
||||
@ -143,12 +141,10 @@
|
||||
|
||||
Uses tox with the ``py27`` environment.
|
||||
|
||||
This job runs on Xenial for stable/ocata, pike, queens and rocky. This
|
||||
This job runs on Xenial for stable/queens and rocky. This
|
||||
job is prepared to make sure all stable branches before stable/stein will
|
||||
keep running on xenial.
|
||||
branches:
|
||||
- stable/ocata
|
||||
- stable/pike
|
||||
- stable/queens
|
||||
- stable/rocky
|
||||
irrelevant-files: *common-irrelevant-files
|
||||
@ -368,7 +364,7 @@
|
||||
|
||||
Uses tox with the ``cover`` environment.
|
||||
nodeset: ubuntu-focal
|
||||
branches: ^(?!stable/(ocata|pike|queens|rocky|stein|train|ussuri)).*$
|
||||
branches: ^(?!stable/(queens|rocky|stein|train|ussuri)).*$
|
||||
required-projects:
|
||||
- name: openstack/requirements
|
||||
irrelevant-files: *common-irrelevant-files
|
||||
@ -407,7 +403,7 @@
|
||||
|
||||
Uses tox with the ``cover`` environment.
|
||||
|
||||
This job runs on Xenial for stable/ocata, pike, queens and rocky. This
|
||||
This job runs on Xenial for stable/queens and rocky. This
|
||||
job is prepared to make sure all stable branches before stable/stein will
|
||||
keep running on xenial.
|
||||
nodeset: ubuntu-xenial
|
||||
@ -419,8 +415,6 @@
|
||||
tox_constraints_file: '{{ ansible_user_dir }}/src/opendev.org/openstack/requirements/upper-constraints.txt'
|
||||
timeout: 3000
|
||||
branches:
|
||||
- stable/ocata
|
||||
- stable/pike
|
||||
- stable/queens
|
||||
- stable/rocky
|
||||
|
||||
@ -452,7 +446,7 @@
|
||||
|
||||
Uses tox with the ``functional`` environment.
|
||||
irrelevant-files: *common-irrelevant-files
|
||||
branches: ^(?!stable/(ocata|pike|queens|rocky|stein|train|ussuri)).*$
|
||||
branches: ^(?!stable/(queens|rocky|stein|train|ussuri)).*$
|
||||
vars:
|
||||
tox_envlist: functional
|
||||
|
||||
@ -484,8 +478,6 @@
|
||||
irrelevant-files: *common-irrelevant-files
|
||||
nodeset: ubuntu-xenial
|
||||
branches:
|
||||
- stable/ocata
|
||||
- stable/pike
|
||||
- stable/queens
|
||||
- stable/rocky
|
||||
vars:
|
||||
@ -500,7 +492,7 @@
|
||||
Uses tox with the ``functional`` environment.
|
||||
Sudo access is not revoked.
|
||||
irrelevant-files: *common-irrelevant-files
|
||||
branches: ^(?!stable/(ocata|pike|queens|rocky|stein|train|ussuri)).*$
|
||||
branches: ^(?!stable/(queens|rocky|stein|train|ussuri)).*$
|
||||
vars:
|
||||
tox_envlist: functional
|
||||
|
||||
@ -534,8 +526,6 @@
|
||||
irrelevant-files: *common-irrelevant-files
|
||||
nodeset: ubuntu-xenial
|
||||
branches:
|
||||
- stable/ocata
|
||||
- stable/pike
|
||||
- stable/queens
|
||||
- stable/rocky
|
||||
vars:
|
||||
@ -739,7 +729,7 @@
|
||||
file is build if the tox environment specified by
|
||||
:zuul:jobvar:`tox_pdf_envlist` exists.
|
||||
|
||||
branches: ^(?!stable/(ocata|pike|queens|rocky|stein|train|ussuri)).*$
|
||||
branches: ^(?!stable/(queens|rocky|stein|train|ussuri)).*$
|
||||
required-projects:
|
||||
- name: openstack/requirements
|
||||
vars:
|
||||
@ -804,7 +794,7 @@
|
||||
|
||||
Uses tox with the ``docs`` environment.
|
||||
|
||||
This job runs on Xenial for stable/ocata, pike, queens and rocky. This
|
||||
This job runs on Xenial for stable/queens and rocky. This
|
||||
job is prepared to make sure all stable branches before stable/stein will
|
||||
keep running on xenial.
|
||||
required-projects:
|
||||
@ -815,8 +805,6 @@
|
||||
bindep_profile: compile doc
|
||||
nodeset: ubuntu-xenial
|
||||
branches:
|
||||
- stable/ocata
|
||||
- stable/pike
|
||||
- stable/queens
|
||||
- stable/rocky
|
||||
|
||||
@ -1055,7 +1043,7 @@
|
||||
description: |
|
||||
Base job (xenial) for autoconverted legacy jobs
|
||||
|
||||
This job runs on Xenial and this is for stable/ocata, pike, queens
|
||||
This job runs on Xenial and this is for stable/queens
|
||||
and rocky. This job is prepared to make sure all stable branches
|
||||
before stable/stein will keep running on xenial.
|
||||
pre-run: playbooks/legacy/pre.yaml
|
||||
@ -1063,8 +1051,6 @@
|
||||
vars:
|
||||
bindep_fallback: /usr/local/bindep-fallback/bindep-fallback.txt
|
||||
branches:
|
||||
- stable/ocata
|
||||
- stable/pike
|
||||
- stable/queens
|
||||
- stable/rocky
|
||||
|
||||
@ -1078,7 +1064,7 @@
|
||||
pre-run: playbooks/legacy/pre.yaml
|
||||
vars:
|
||||
bindep_fallback: /usr/local/bindep-fallback/bindep-fallback.txt
|
||||
branches: ^(?!stable/(ocata|pike|queens|rocky)).*$
|
||||
branches: ^(?!stable/(queens|rocky)).*$
|
||||
nodeset: legacy-ubuntu-bionic
|
||||
|
||||
- job:
|
||||
@ -1090,13 +1076,11 @@
|
||||
This job runs devstack-gate with as few changes as possible and
|
||||
may be used by jobs which have been automatically converted as
|
||||
part of the migration to Zuul v3. This job runs on Xenial for
|
||||
stable/ocata, pike, queens and rocky. This job is prepared to
|
||||
stable/queens and rocky. This job is prepared to
|
||||
make sure all stable branches before stable/stein will keep
|
||||
running on xenial.
|
||||
nodeset: devstack-single-node
|
||||
branches:
|
||||
- stable/ocata
|
||||
- stable/pike
|
||||
- stable/queens
|
||||
- stable/rocky
|
||||
pre-run: playbooks/legacy/pre.yaml
|
||||
@ -1150,7 +1134,7 @@
|
||||
may be used by jobs which have been automatically converted as
|
||||
part of the migration to Zuul v3. This job runs on Bionic from
|
||||
stable/stein on.
|
||||
branches: ^(?!stable/(ocata|pike|queens|rocky)).*$
|
||||
branches: ^(?!stable/(queens|rocky)).*$
|
||||
nodeset: legacy-ubuntu-bionic
|
||||
pre-run: playbooks/legacy/pre.yaml
|
||||
required-projects:
|
||||
@ -1201,7 +1185,7 @@
|
||||
Base job (xenial) for multinode devstack jobs.
|
||||
|
||||
Will setup firewall rules on all the nodes allowing them to talk to
|
||||
each other. This job runs on Xenial for stable/ocata, pike, queens
|
||||
each other. This job runs on Xenial for stable/queens
|
||||
and rocky. This job is prepared to make sure all stable branches
|
||||
before stable/stein will keep running on xenial.
|
||||
|
||||
@ -1210,8 +1194,6 @@
|
||||
pre-run: playbooks/legacy/multinode-networking/pre.yaml
|
||||
nodeset: legacy-ubuntu-xenial-2-node
|
||||
branches:
|
||||
- stable/ocata
|
||||
- stable/pike
|
||||
- stable/queens
|
||||
- stable/rocky
|
||||
|
||||
@ -1227,7 +1209,7 @@
|
||||
roles:
|
||||
- zuul: zuul/zuul-jobs
|
||||
pre-run: playbooks/legacy/multinode-networking/pre.yaml
|
||||
branches: ^(?!stable/(ocata|pike|queens|rocky)).*$
|
||||
branches: ^(?!stable/(queens|rocky)).*$
|
||||
nodeset: legacy-ubuntu-bionic-2-node
|
||||
|
||||
- job:
|
||||
@ -1237,14 +1219,12 @@
|
||||
description: |
|
||||
Base job (xenial) for autoconverted legacy jobs that publish artifacts
|
||||
|
||||
This job runs on Xenial for stable/ocata, pike, queens
|
||||
This job runs on Xenial for stable/queens
|
||||
and rocky. This job is prepared to make sure all stable branches
|
||||
before stable/stein will keep running on xenial.
|
||||
nodeset: devstack-single-node
|
||||
pre-run: playbooks/legacy/pre.yaml
|
||||
branches:
|
||||
- stable/ocata
|
||||
- stable/pike
|
||||
- stable/queens
|
||||
- stable/rocky
|
||||
|
||||
@ -1256,7 +1236,7 @@
|
||||
Base job (bionic) for autoconverted legacy jobs that publish artifacts.
|
||||
|
||||
This job runs on Bionic from stable/stein on.
|
||||
branches: ^(?!stable/(ocata|pike|queens|rocky)).*$
|
||||
branches: ^(?!stable/(queens|rocky)).*$
|
||||
nodeset: legacy-ubuntu-bionic
|
||||
pre-run: playbooks/legacy/pre.yaml
|
||||
|
||||
|
||||
@ -3158,22 +3158,14 @@
|
||||
repositories in the integrated gate.
|
||||
check:
|
||||
jobs:
|
||||
- grenade:
|
||||
# NOTE(elod.illes): Queens is the first branch where
|
||||
# grenade jobs are working as grenade requires working
|
||||
# Devstack and Tempest on the previous branch
|
||||
branches: ^(?!(stable/(ocata|pike))).*$
|
||||
- grenade
|
||||
- tempest-full-py3:
|
||||
branches: ^(?!(stable/(newton|ocata|pike)|driverfixes)).*$
|
||||
branches: ^(?!(driverfixes)).*$
|
||||
gate:
|
||||
jobs:
|
||||
- grenade:
|
||||
# NOTE(elod.illes): Queens is the first branch where
|
||||
# grenade jobs are working as grenade requires working
|
||||
# Devstack and Tempest on the previous branch
|
||||
branches: ^(?!(stable/(ocata|pike))).*$
|
||||
- grenade
|
||||
- tempest-full-py3:
|
||||
branches: ^(?!(stable/(newton|ocata|pike)|driverfixes)).*$
|
||||
branches: ^(?!(driverfixes)).*$
|
||||
|
||||
# TODO(gmann): Remove the 'integrated-gate-py35' template once all repo
|
||||
# including their stable branches are renamed it to 'integrated-gate-py3'
|
||||
@ -3186,12 +3178,12 @@
|
||||
jobs:
|
||||
- grenade-py3
|
||||
- tempest-full-py3:
|
||||
branches: ^(?!(stable/(newton|ocata|pike)|driverfixes)).*$
|
||||
branches: ^(?!(driverfixes)).*$
|
||||
gate:
|
||||
jobs:
|
||||
- grenade-py3
|
||||
- tempest-full-py3:
|
||||
branches: ^(?!(stable/(newton|ocata|pike)|driverfixes)).*$
|
||||
branches: ^(?!(driverfixes)).*$
|
||||
|
||||
- project-template:
|
||||
name: golang-jobs
|
||||
@ -3214,17 +3206,10 @@
|
||||
in devstack.
|
||||
check:
|
||||
jobs:
|
||||
# Tempest-full is only working on pike and newer.
|
||||
- tempest-full:
|
||||
branches: ^(?!stable/(newton|ocata)).*$
|
||||
- legacy-tempest-dsvm-neutron-src:
|
||||
branches: ^stable/(newton|ocata)$
|
||||
- tempest-full
|
||||
gate:
|
||||
jobs:
|
||||
- tempest-full:
|
||||
branches: ^(?!stable/(newton|ocata)).*$
|
||||
- legacy-tempest-dsvm-neutron-src:
|
||||
branches: ^stable/(newton|ocata)$
|
||||
- tempest-full
|
||||
|
||||
- project-template:
|
||||
name: lib-forward-testing-python3
|
||||
|
||||
Loading…
Reference in New Issue
Block a user