Optimize jobs run on novaclient
novaclient run 2 jobs for functional tests - novaclient-dsvm-functional-identity-v3-only (non-voting) - novaclient-dsvm-functional-neutron These 2 were added when neturon and identity v3 were not default in devstack. Now both run as default and we do not separate job to run. This commit does below changes: - delete the 'novaclient-dsvm-functional-neutron' - In 'novaclient-dsvm-functional-identity-v3-only' - make 'novaclient-dsvm-functional-identity-v3-only' as voting - cleanup some 'if' condition which are hardcoded true now - rename 'novaclient-dsvm-functional-identity-v3-only' to 'novaclient-dsvm-functional' NOTE: this not going to backport to stable branch as they seems running identity v2 and v3 in those jobs. Let's keep the same setup there. Change-Id: I4bc564e548876ef4d3b30e736c0055f19c062319
This commit is contained in:
ghanshyam
parent
2d1786f454
commit
ee2221f052
24
.zuul.yaml
24
.zuul.yaml
@ -1,24 +1,11 @@
|
||||
- job:
|
||||
name: novaclient-dsvm-functional-identity-v3-only
|
||||
name: novaclient-dsvm-functional
|
||||
parent: legacy-dsvm-base
|
||||
run: playbooks/legacy/novaclient-dsvm-functional-identity-v3-only/run.yaml
|
||||
post-run: playbooks/legacy/novaclient-dsvm-functional-identity-v3-only/post.yaml
|
||||
timeout: 7200
|
||||
voting: false
|
||||
required-projects:
|
||||
- openstack-infra/devstack-gate
|
||||
- openstack/nova
|
||||
- openstack/python-novaclient
|
||||
|
||||
- job:
|
||||
name: novaclient-dsvm-functional-neutron
|
||||
parent: legacy-dsvm-base
|
||||
run: playbooks/legacy/novaclient-dsvm-functional-neutron/run.yaml
|
||||
post-run: playbooks/legacy/novaclient-dsvm-functional-neutron/post.yaml
|
||||
run: playbooks/legacy/novaclient-dsvm-functional/run.yaml
|
||||
post-run: playbooks/legacy/novaclient-dsvm-functional/post.yaml
|
||||
timeout: 7200
|
||||
required-projects:
|
||||
- openstack-infra/devstack-gate
|
||||
- openstack/neutron
|
||||
- openstack/nova
|
||||
- openstack/python-novaclient
|
||||
|
||||
@ -26,8 +13,7 @@
|
||||
name: openstack/python-novaclient
|
||||
check:
|
||||
jobs:
|
||||
- novaclient-dsvm-functional-identity-v3-only
|
||||
- novaclient-dsvm-functional-neutron
|
||||
- novaclient-dsvm-functional
|
||||
gate:
|
||||
jobs:
|
||||
- novaclient-dsvm-functional-neutron
|
||||
- novaclient-dsvm-functional
|
||||
|
||||
@ -1,59 +0,0 @@
|
||||
- hosts: all
|
||||
name: Autoconverted job legacy-novaclient-dsvm-functional-identity-v3-only from
|
||||
old job gate-novaclient-dsvm-functional-identity-v3-only-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
|
||||
export PYTHONUNBUFFERED=true
|
||||
export BRANCH_OVERRIDE=default
|
||||
export DEVSTACK_PROJECT_FROM_GIT=python-novaclient
|
||||
if [ "$BRANCH_OVERRIDE" != "default" ] ; then
|
||||
export OVERRIDE_ZUUL_BRANCH=$BRANCH_OVERRIDE
|
||||
fi
|
||||
# This ensures that if we set override branch to something
|
||||
# else, we still take python-novaclient from the zuul branch
|
||||
# name. So override branch can be 'stable/mitaka' but we can
|
||||
# test master changes.
|
||||
uc_project=`echo $DEVSTACK_PROJECT_FROM_GIT | tr [:lower:] [:upper:] | tr '-' '_' | sed 's/[^A-Z_]//'`
|
||||
export "OVERRIDE_"$uc_project"_PROJECT_BRANCH"=$ZUUL_BRANCH
|
||||
|
||||
function post_test_hook {
|
||||
# Configure and run functional tests
|
||||
$BASE/new/python-novaclient/novaclient/tests/functional/hooks/post_test_hook.sh
|
||||
}
|
||||
if [ "-identity-v3-only" == "-identity-v3-only" ] ; then
|
||||
export DEVSTACK_LOCAL_CONFIG="ENABLE_IDENTITY_V2=False"
|
||||
elif [ "-identity-v3-only" == "-neutron" ] ; then
|
||||
export DEVSTACK_GATE_NEUTRON=1
|
||||
fi
|
||||
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 }}'
|
||||
@ -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
|
||||
@ -1,5 +1,5 @@
|
||||
- hosts: all
|
||||
name: Autoconverted job legacy-novaclient-dsvm-functional-neutron from old job gate-novaclient-dsvm-functional-neutron-ubuntu-xenial
|
||||
name: novaclient-dsvm-functional job with identity v3 and neutron
|
||||
tasks:
|
||||
|
||||
- name: Ensure legacy workspace directory
|
||||
@ -44,11 +44,6 @@
|
||||
# Configure and run functional tests
|
||||
$BASE/new/python-novaclient/novaclient/tests/functional/hooks/post_test_hook.sh
|
||||
}
|
||||
if [ "-neutron" == "-identity-v3-only" ] ; then
|
||||
export DEVSTACK_LOCAL_CONFIG="ENABLE_IDENTITY_V2=False"
|
||||
elif [ "-neutron" == "-neutron" ] ; then
|
||||
export DEVSTACK_GATE_NEUTRON=1
|
||||
fi
|
||||
export -f post_test_hook
|
||||
|
||||
cp devstack-gate/devstack-vm-gate-wrap.sh ./safe-devstack-vm-gate-wrap.sh
|
||||
Loading…
Reference in New Issue
Block a user