zuul: use the native jobs from freezer-tempest-plugin
... and remove the legacy jobs. Also, remove the custom jobs which are simple alias for the jobs in freezer-tempest-plugin. Change-Id: Iac143982f7f4f295bb36364f609079fa21db302b
This commit is contained in:
Luigi Toscano
parent
1d1369a45b
commit
663737694f
38
.zuul.yaml
38
.zuul.yaml
|
|
@ -8,47 +8,31 @@
|
|||
check:
|
||||
jobs:
|
||||
- openstack-tox-pylint
|
||||
- freezer-agent-tempest
|
||||
- freezer-scheduler-tempest
|
||||
- freezer-tempest-agent
|
||||
- freezer-tempest-scheduler
|
||||
gate:
|
||||
queue: freezer
|
||||
jobs:
|
||||
- openstack-tox-pylint
|
||||
- freezer-agent-tempest
|
||||
- freezer-scheduler-tempest
|
||||
- freezer-tempest-agent
|
||||
- freezer-tempest-scheduler
|
||||
|
||||
- job:
|
||||
name: freezer-legacy-dsvm-base
|
||||
parent: legacy-dsvm-base
|
||||
run: playbooks/legacy/freezer/run.yaml
|
||||
post-run: playbooks/legacy/freezer/post.yaml
|
||||
timeout: 7800
|
||||
required-projects:
|
||||
- openstack/devstack-gate
|
||||
- openstack/freezer
|
||||
- openstack/freezer-api
|
||||
- openstack/freezer-web-ui
|
||||
- openstack/python-freezerclient
|
||||
- openstack/freezer-tempest-plugin
|
||||
name: freezer-base
|
||||
parent: freezer-tempest-basic
|
||||
vars:
|
||||
tempest_test_regex: '^(freezer_tempest_plugin.tests.freezer)'
|
||||
|
||||
- job:
|
||||
name: freezer-ubuntu
|
||||
parent: freezer-legacy-dsvm-base
|
||||
parent: freezer-base
|
||||
|
||||
- job:
|
||||
name: freezer-centos-7
|
||||
parent: freezer-legacy-dsvm-base
|
||||
parent: freezer-base
|
||||
nodeset: centos-7
|
||||
|
||||
- job:
|
||||
name: freezer-opensuse-15
|
||||
parent: freezer-legacy-dsvm-base
|
||||
parent: freezer-base
|
||||
nodeset: opensuse-15
|
||||
|
||||
- job:
|
||||
name: freezer-scheduler-tempest
|
||||
parent: freezer-tempest-scheduler
|
||||
|
||||
- job:
|
||||
name: freezer-agent-tempest
|
||||
parent: freezer-tempest-agent
|
||||
|
|
|
|||
|
|
@ -1,80 +0,0 @@
|
|||
- hosts: all
|
||||
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
|
||||
|
|
@ -1,65 +0,0 @@
|
|||
- hosts: all
|
||||
name: Autoconverted job legacy-osbackup-freezer-dsvm from old job gate-osbackup-freezer-dsvm
|
||||
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 freezer-agent and freezer-scheduler
|
||||
enable_plugin freezer https://opendev.org/openstack/freezer
|
||||
# enable freezer-api and python-freezerclient
|
||||
enable_plugin freezer-api https://opendev.org/openstack/freezer-api
|
||||
# enable freezer-web-ui and python-freezerclient
|
||||
enable_plugin freezer-web-ui https://opendev.org/openstack/freezer-web-ui
|
||||
TEMPEST_PLUGINS='/opt/stack/new/freezer-tempest-plugin'
|
||||
EOF
|
||||
executable: /bin/bash
|
||||
chdir: '{{ ansible_user_dir }}/workspace'
|
||||
environment: '{{ zuul | zuul_legacy_vars }}'
|
||||
|
||||
- shell:
|
||||
cmd: |
|
||||
set -e
|
||||
set -x
|
||||
export PYTHONUNBUFFERED=true
|
||||
# checkout freezer components
|
||||
export PROJECTS="openstack/freezer-api $PROJECTS"
|
||||
export PROJECTS="openstack/freezer-web-ui $PROJECTS"
|
||||
export PROJECTS="openstack/freezer $PROJECTS"
|
||||
export PROJECTS="openstack/python-freezerclient $PROJECTS"
|
||||
export PROJECTS="openstack/freezer-tempest-plugin $PROJECTS"
|
||||
# tempest config
|
||||
export DEVSTACK_GATE_TEMPEST=1
|
||||
export DEVSTACK_GATE_TEMPEST_REGEX="freezer_tempest_plugin.tests.freezer"
|
||||
# which repo is being tested
|
||||
export DEVSTACK_PROJECT_FROM_GIT=freezer,python-freezerclient
|
||||
export "OVERRIDE_FREEZER_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 }}'
|
||||
Loading…
Reference in New Issue