openstack
/
murano
Code Issues Proposed changes

Using native Zuulv3 jobs 

Change-Id: I3dac2be8108c305128f4807693da7eb2db568902
This commit is contained in:
zhurong 2018-07-30 16:50:57 +08:00
parent a4931ab8d9
commit 3cfd3fc385
5 changed files with 26 additions and 329 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

51
.zuul.yaml
View File

@ -48,10 +48,8 @@
- openstack/rally-openstack
- job:
name: murano-tempest-api
parent: legacy-dsvm-base
run: playbooks/legacy/tempest-dsvm-murano-api/run.yaml
post-run: playbooks/legacy/tempest-dsvm-murano-api/post.yaml
name: murano-tempest-base
parent: devstack-tempest
irrelevant-files:
- ^(test-|)requirements.txt$
- ^setup.cfg$
@ -61,7 +59,6 @@
- ^murano/tests/.*$
timeout: 7800
required-projects:
- openstack-infra/devstack-gate
- openstack/heat
- openstack/murano
- openstack/murano-dashboard
@ -69,30 +66,34 @@
- openstack/python-muranoclient
- openstack/tempest
- openstack/murano-tempest-plugin
vars:
devstack_plugins:
murano: https://git.openstack.org/openstack/murano
heat: https://git.openstack.org/openstack/heat
devstack_services:
tempest: true
s-account: False
s-container: False
s-object: False
s-proxy: False
tls-proxy: false
devstack_localrc:
TEMPEST_PLUGINS: "'{{ ansible_user_dir }}/src/git.openstack.org/openstack/murano-tempest-plugin'"
tempest_test_regex: application_catalog
tox_envlist: all
- job:
name: murano-tempest-api
parent: murano-tempest-base
- job:
name: murano-tempest-cfapi
parent: legacy-dsvm-base
run: playbooks/legacy/tempest-dsvm-murano-cfapi/run.yaml
post-run: playbooks/legacy/tempest-dsvm-murano-cfapi/post.yaml
parent: murano-tempest-base
voting: false
irrelevant-files:
- ^(test-|)requirements.txt$
- ^setup.cfg$
- ^doc/.*$
- ^.*\.rst$
- ^releasenotes/.*$
- ^murano/tests/.*$
timeout: 7800
required-projects:
- openstack-infra/devstack-gate
- openstack/heat
- openstack/murano
- openstack/murano-dashboard
- openstack/python-heatclient
- openstack/python-muranoclient
- openstack/tempest
- openstack/murano-tempest-plugin
vars:
devstack_services:
murano-cfapi: true
tempest_test_regex: service_broker
- job:
name: murano-functional

80
playbooks/legacy/tempest-dsvm-murano-api/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

72
playbooks/legacy/tempest-dsvm-murano-api/run.yaml
View File

@ -1,72 +0,0 @@
- hosts: all
name: Autoconverted job legacy-tempest-dsvm-murano-api from old job gate-tempest-dsvm-murano-api-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-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]]
TEMPEST_PLUGINS='/opt/stack/new/murano-tempest-plugin'
enable_plugin heat git://git.openstack.org/openstack/heat
enable_plugin murano git://git.openstack.org/openstack/murano
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_NEUTRON=1
export ENABLED_SERVICES=tempest
export PROJECTS="openstack/heat $PROJECTS"
export PROJECTS="openstack/python-heatclient $PROJECTS"
export PROJECTS="openstack/murano $PROJECTS"
export PROJECTS="openstack/murano-dashboard $PROJECTS"
export PROJECTS="openstack/python-muranoclient $PROJECTS"
export PROJECTS="openstack/murano-tempest-plugin $PROJECTS"
export BRANCH_OVERRIDE=default
if [ "$BRANCH_OVERRIDE" != "default" ] ; then
export OVERRIDE_ZUUL_BRANCH=$BRANCH_OVERRIDE
fi
if [ "api" = "cfapi" ]; then
export ENABLED_SERVICES+=,murano-cfapi
export DEVSTACK_GATE_TEMPEST_REGEX="service_broker"
elif [ "api" = "api" ]; then
export DEVSTACK_GATE_TEMPEST_REGEX="application_catalog"
elif [ "api" = "glare-backend" ]; then
export DEVSTACK_GATE_TEMPEST_REGEX="application_catalog"
export DEVSTACK_LOCAL_CONFIG+=$'\n'"enable_service g-glare"
export DEVSTACK_LOCAL_CONFIG+=$'\n'"MURANO_USE_GLARE=True"
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 }}'

80
playbooks/legacy/tempest-dsvm-murano-cfapi/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

72
playbooks/legacy/tempest-dsvm-murano-cfapi/run.yaml
View File

@ -1,72 +0,0 @@
- hosts: all
name: Autoconverted job legacy-tempest-dsvm-murano-cfapi from old job gate-tempest-dsvm-murano-cfapi-ubuntu-xenial-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-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]]
TEMPEST_PLUGINS='/opt/stack/new/murano-tempest-plugin'
enable_plugin heat git://git.openstack.org/openstack/heat
enable_plugin murano git://git.openstack.org/openstack/murano
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_NEUTRON=1
export ENABLED_SERVICES=tempest
export PROJECTS="openstack/heat $PROJECTS"
export PROJECTS="openstack/python-heatclient $PROJECTS"
export PROJECTS="openstack/murano $PROJECTS"
export PROJECTS="openstack/murano-dashboard $PROJECTS"
export PROJECTS="openstack/python-muranoclient $PROJECTS"
export PROJECTS="openstack/murano-tempest-plugin $PROJECTS"
export BRANCH_OVERRIDE=default
if [ "$BRANCH_OVERRIDE" != "default" ] ; then
export OVERRIDE_ZUUL_BRANCH=$BRANCH_OVERRIDE
fi
if [ "cfapi" = "cfapi" ]; then
export ENABLED_SERVICES+=,murano-cfapi
export DEVSTACK_GATE_TEMPEST_REGEX="service_broker"
elif [ "cfapi" = "api" ]; then
export DEVSTACK_GATE_TEMPEST_REGEX="application_catalog"
elif [ "cfapi" = "glare-backend" ]; then
export DEVSTACK_GATE_TEMPEST_REGEX="application_catalog"
export DEVSTACK_LOCAL_CONFIG+=$'\n'"enable_service g-glare"
export DEVSTACK_LOCAL_CONFIG+=$'\n'"MURANO_USE_GLARE=True"
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 }}'