Merge "Remove devstack-legacy base job"
This commit is contained in:
commit
7bdbcf1675
91
.zuul.yaml
91
.zuul.yaml
|
@ -52,82 +52,17 @@
|
|||
playbooks/post
|
||||
|
||||
- job:
|
||||
name: devstack-legacy
|
||||
parent: base-test
|
||||
description: |
|
||||
Legacy devstack base job
|
||||
|
||||
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.
|
||||
|
||||
nodes: devstack-single-node
|
||||
required-projects:
|
||||
- openstack-dev/devstack
|
||||
- openstack-infra/devstack-gate
|
||||
- openstack-infra/tripleo-ci
|
||||
- openstack/ceilometer
|
||||
- openstack/ceilometermiddleware
|
||||
- openstack/cinder
|
||||
- openstack/django_openstack_auth
|
||||
- openstack/glance
|
||||
- openstack/glance_store
|
||||
- openstack/heat
|
||||
- openstack/heat-cfntools
|
||||
- openstack/heat-templates
|
||||
- openstack/horizon
|
||||
- openstack/keystone
|
||||
- openstack/keystoneauth
|
||||
- openstack/keystonemiddleware
|
||||
- openstack/manila
|
||||
- openstack/manila-ui
|
||||
- openstack/neutron
|
||||
- openstack/neutron-fwaas
|
||||
- openstack/neutron-lbaas
|
||||
- openstack/neutron-vpnaas
|
||||
- openstack/nova
|
||||
- openstack/octavia
|
||||
- openstack/os-apply-config
|
||||
- openstack/os-brick
|
||||
- openstack/os-client-config
|
||||
- openstack/os-collect-config
|
||||
- openstack/os-net-config
|
||||
- openstack/os-refresh-config
|
||||
- openstack/osc-lib
|
||||
- openstack/requirements
|
||||
- openstack/swift
|
||||
- openstack/tempest
|
||||
- openstack/tempest-lib
|
||||
- openstack/tripleo-heat-templates
|
||||
- openstack/tripleo-image-elements
|
||||
- openstack/tripleo-incubator
|
||||
- openstack/zaqar
|
||||
timeout: 7200
|
||||
pre-run:
|
||||
playbooks/legacy-pre
|
||||
post-run:
|
||||
playbooks/legacy-post
|
||||
|
||||
- job:
|
||||
name: devstack-legacy-tempest-dsvm-neutron-full
|
||||
parent: devstack-legacy
|
||||
name: legacy-tempest-dsvm-neutron-full
|
||||
parent: legacy-dsvm-base
|
||||
run: playbooks/legacy/tempest-dsvm-neutron-full/run
|
||||
post-run: playbooks/legacy/tempest-dsvm-neutron-full/post
|
||||
timeout: 10800
|
||||
vars:
|
||||
devstack_local_conf_contents: |
|
||||
[[local|localrc]]
|
||||
ENABLE_FILE_INJECTION=True
|
||||
devstack_legacy_shell: |
|
||||
#!/bin/bash -xe
|
||||
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=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
|
||||
BUILD_TIMEOUT: '10800000'
|
||||
required-projects:
|
||||
- openstack/neutron
|
||||
- openstack/tempest
|
||||
- openstack-infra/devstack-gate
|
||||
|
||||
- project:
|
||||
name: openstack-infra/devstack-gate
|
||||
|
@ -139,8 +74,6 @@
|
|||
- ^playbooks/post
|
||||
- ^playbooks/devstack
|
||||
- ^roles/
|
||||
- devstack-legacy-tempest-dsvm-neutron-full:
|
||||
- legacy-tempest-dsvm-neutron-full:
|
||||
files:
|
||||
- ^playbooks/legacy-pre
|
||||
- ^playbooks/legacy-post
|
||||
- ^playbooks/devstack-legacy
|
||||
- ^playbooks/legacy/tempest-dsvm-neutron-full/.*
|
||||
|
|
|
@ -1,13 +0,0 @@
|
|||
- hosts: all
|
||||
tasks:
|
||||
- name: Collect legacy devstack logs
|
||||
synchronize:
|
||||
# The remote dir logs/ is a symlink and rsync is running with
|
||||
# --safe-symlinks so it will be ignored unless we dereference
|
||||
# it by appending the trailing / to src. To ensure that the
|
||||
# devstack logs end up in the logs/ subdirectory, add it to
|
||||
# the dest explicitly. Yes, that means on disk it's
|
||||
# .../work/logs/logs/.
|
||||
dest: "{{ zuul.executor.log_root }}/logs/"
|
||||
mode: pull
|
||||
src: "logs/"
|
|
@ -1,7 +0,0 @@
|
|||
- hosts: all
|
||||
tasks:
|
||||
- name: Write job-specific localrc variables
|
||||
copy:
|
||||
dest: /tmp/dg-local.conf
|
||||
content: '{{ devstack_local_conf_contents }}'
|
||||
when: devstack_local_conf_contents is defined
|
|
@ -0,0 +1,15 @@
|
|||
- hosts: all
|
||||
tasks:
|
||||
|
||||
- name: Copy files from {{ ansible_user_dir }} on node
|
||||
synchronize:
|
||||
src: '{{ ansible_user_dir }}/'
|
||||
dest: '{{ zuul.executor.log_root }}'
|
||||
mode: pull
|
||||
copy_links: true
|
||||
verify_host: true
|
||||
rsync_opts:
|
||||
- --include="/logs/**"
|
||||
- --include="*/"
|
||||
- --exclude="*"
|
||||
- --prune-empty-dirs
|
|
@ -0,0 +1,48 @@
|
|||
- hosts: all
|
||||
name: Autoconverted job legacy-tempest-dsvm-neutron-full from old job gate-tempest-dsvm-neutron-full-ubuntu-xenial
|
||||
tasks:
|
||||
|
||||
- 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
|
||||
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
|
||||
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=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
|
||||
environment: '{{ zuul | zuul_legacy_vars }}'
|
Loading…
Reference in New Issue