Merge "murano-congress-devstack job use native Zuulv3"
This commit is contained in:
commit
edb1158565
18
.zuul.yaml
18
.zuul.yaml
|
@ -16,9 +16,7 @@
|
||||||
|
|
||||||
- job:
|
- job:
|
||||||
name: murano-congress-devstack
|
name: murano-congress-devstack
|
||||||
parent: legacy-dsvm-base
|
parent: murano-tempest-base
|
||||||
run: playbooks/legacy/murano-congress-devstack-dsvm/run.yaml
|
|
||||||
post-run: playbooks/legacy/murano-congress-devstack-dsvm/post.yaml
|
|
||||||
voting: false
|
voting: false
|
||||||
timeout: 4200
|
timeout: 4200
|
||||||
irrelevant-files:
|
irrelevant-files:
|
||||||
|
@ -29,19 +27,23 @@
|
||||||
- ^releasenotes/.*$
|
- ^releasenotes/.*$
|
||||||
- ^murano/tests/.*$
|
- ^murano/tests/.*$
|
||||||
required-projects:
|
required-projects:
|
||||||
- openstack-dev/devstack
|
|
||||||
- openstack-infra/devstack-gate
|
|
||||||
- openstack/congress
|
- openstack/congress
|
||||||
- openstack/congress-dashboard
|
- openstack/congress-dashboard
|
||||||
- openstack/heat
|
|
||||||
- openstack/mistral
|
- openstack/mistral
|
||||||
- openstack/mistral-dashboard
|
- openstack/mistral-dashboard
|
||||||
- openstack/murano
|
|
||||||
- openstack/murano-dashboard
|
|
||||||
- openstack/python-congressclient
|
- openstack/python-congressclient
|
||||||
- openstack/python-heatclient
|
- openstack/python-heatclient
|
||||||
- openstack/python-mistralclient
|
- openstack/python-mistralclient
|
||||||
- openstack/python-muranoclient
|
- openstack/python-muranoclient
|
||||||
|
vars:
|
||||||
|
devstack_services:
|
||||||
|
tls-proxy: false
|
||||||
|
devstack_localrc:
|
||||||
|
MURANO_ENABLE_MODEL_POLICY_ENFORCEMENT: True
|
||||||
|
devstack_plugins:
|
||||||
|
congress: https://git.openstack.org/openstack/congress
|
||||||
|
mistral: https://git.openstack.org/openstack/mistral
|
||||||
|
tempest_test_regex: functional
|
||||||
|
|
||||||
- job:
|
- job:
|
||||||
name: murano-rally-task
|
name: murano-rally-task
|
||||||
|
|
|
@ -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,84 +0,0 @@
|
||||||
- hosts: all
|
|
||||||
name: Autoconverted job legacy-murano-congress-devstack-dsvm from old job gate-murano-congress-devstack-dsvm-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]]
|
|
||||||
enable_plugin heat git://git.openstack.org/openstack/heat
|
|
||||||
enable_plugin mistral git://git.openstack.org/openstack/mistral
|
|
||||||
enable_plugin congress git://git.openstack.org/openstack/congress
|
|
||||||
MURANO_ENABLE_MODEL_POLICY_ENFORCEMENT=True
|
|
||||||
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_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/congress $PROJECTS"
|
|
||||||
export PROJECTS="openstack/python-congressclient $PROJECTS"
|
|
||||||
export PROJECTS="openstack/congress-dashboard $PROJECTS"
|
|
||||||
export PROJECTS="openstack/mistral $PROJECTS"
|
|
||||||
export PROJECTS="openstack/mistral-dashboard $PROJECTS"
|
|
||||||
export PROJECTS="openstack/python-mistralclient $PROJECTS"
|
|
||||||
export KEEP_LOCALRC=1
|
|
||||||
|
|
||||||
# Enable murano devstack plugin. Provided repo should be cloned by zuul before devstack run
|
|
||||||
# and below provided link should not be used.
|
|
||||||
|
|
||||||
function pre_test_hook {
|
|
||||||
cd /opt/stack/new/murano/functionaltests
|
|
||||||
./pre_test_hook_congress.sh
|
|
||||||
./pre_test_hook_mistral.sh
|
|
||||||
./pre_test_hook.sh
|
|
||||||
}
|
|
||||||
export -f pre_test_hook
|
|
||||||
|
|
||||||
function post_test_hook {
|
|
||||||
cd /opt/stack/new/murano/functionaltests
|
|
||||||
./post_test_hook.sh congress_mistral
|
|
||||||
}
|
|
||||||
export -f post_test_hook
|
|
||||||
|
|
||||||
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