openstack
/
freezer
Code Issues Proposed changes

Refactor freezer legacy jobs 

We can remove some duplicate code and stop using legacy nodesets.

Change-Id: Icb51a022eb50ba7651b7f0c0b3d2d11366af20b9
Signed-off-by: Paul Belanger <pabelanger@redhat.com>
This commit is contained in:
Paul Belanger 2018-08-13 17:34:33 -04:00
parent 4b951d12d8
commit e82092a917
7 changed files with 12 additions and 318 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
.zuul.yaml
View File

@ -14,10 +14,10 @@
- freezer-opensuse-423
- job:
name: freezer-ubuntu-xenial
name: freezer-legacy-dsvm-base
parent: legacy-dsvm-base
run: playbooks/legacy/freezer-ubuntu-xenial/run.yaml
post-run: playbooks/legacy/freezer-ubuntu-xenial/post.yaml
run: playbooks/legacy/freezer/run.yaml
post-run: playbooks/legacy/freezer/post.yaml
timeout: 7800
required-projects:
- openstack-infra/devstack-gate
@ -27,32 +27,16 @@
- openstack/python-freezerclient
- openstack/freezer-tempest-plugin
- job:
name: freezer-ubuntu-xenial
parent: freezer-legacy-dsvm-base
- job:
name: freezer-centos-7
parent: legacy-dsvm-base
run: playbooks/legacy/freezer-centos-7/run.yaml
post-run: playbooks/legacy/freezer-centos-7/post.yaml
timeout: 7800
nodeset: legacy-centos-7
required-projects:
- openstack-infra/devstack-gate
- openstack/freezer
- openstack/freezer-api
- openstack/freezer-web-ui
- openstack/python-freezerclient
- openstack/freezer-tempest-plugin
parent: freezer-legacy-dsvm-base
nodeset: centos-7
- job:
name: freezer-opensuse-423
parent: legacy-dsvm-base
run: playbooks/legacy/freezer-opensuse-423/run.yaml
post-run: playbooks/legacy/freezer-opensuse-423/post.yaml
timeout: 7800
nodeset: legacy-opensuse-423
required-projects:
- openstack-infra/devstack-gate
- openstack/freezer
- openstack/freezer-api
- openstack/freezer-web-ui
- openstack/python-freezerclient
- openstack/freezer-tempest-plugin
parent: freezer-legacy-dsvm-base
nodeset: opensuse-423

80
playbooks/legacy/freezer-centos-7/post.yaml
View File

@ -1,80 +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=**/*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

65
playbooks/legacy/freezer-centos-7/run.yaml
View File

@ -1,65 +0,0 @@
- hosts: all
name: Autoconverted job legacy-osbackup-freezer-dsvm-centos7 from old job gate-osbackup-freezer-dsvm-centos7
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]]
# enable freezer-agent and freezer-scheduler
enable_plugin freezer git://git.openstack.org/openstack/freezer
# enable freezer-api and python-freezerclient
enable_plugin freezer-api https://git.openstack.org/openstack/freezer-api
# enable freezer-web-ui and python-freezerclient
enable_plugin freezer-web-ui https://git.openstack.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 }}'

80
playbooks/legacy/freezer-opensuse-423/post.yaml
View File

@ -1,80 +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=**/*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

65
playbooks/legacy/freezer-opensuse-423/run.yaml
View File

@ -1,65 +0,0 @@
- hosts: all
name: Autoconverted job legacy-osbackup-freezer-dsvm-opensuse-423 from old job gate-osbackup-freezer-dsvm-opensuse-423
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]]
# enable freezer-agent and freezer-scheduler
enable_plugin freezer git://git.openstack.org/openstack/freezer
# enable freezer-api and python-freezerclient
enable_plugin freezer-api https://git.openstack.org/openstack/freezer-api
# enable freezer-web-ui and python-freezerclient
enable_plugin freezer-web-ui https://git.openstack.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 }}'

2
playbooks/legacy/freezer-ubuntu-xenial/post.yaml → playbooks/legacy/freezer/post.yaml
View File

@ -1,4 +1,4 @@
- hosts: primary
- hosts: all
tasks:
- name: Copy files from {{ ansible_user_dir }}/workspace/ on node

0
playbooks/legacy/freezer-ubuntu-xenial/run.yaml → playbooks/legacy/freezer/run.yaml
View File