Merge "Convert nodepool-zuul-functional job"
This commit is contained in:
commit
0ff94fa98b
13
.zuul.yaml
13
.zuul.yaml
|
@ -23,13 +23,18 @@
|
||||||
|
|
||||||
- job:
|
- job:
|
||||||
name: nodepool-zuul-functional
|
name: nodepool-zuul-functional
|
||||||
parent: legacy-base
|
parent: tox
|
||||||
run: playbooks/nodepool-zuul-functional/run.yaml
|
description: |
|
||||||
post-run: playbooks/nodepool-zuul-functional/post.yaml
|
Test that zuul works with current nodepool sources.
|
||||||
timeout: 1800
|
|
||||||
|
This test runs the zuul project ``nodepool`` environment.
|
||||||
|
pre-run: playbooks/nodepool-zuul-functional/pre.yaml
|
||||||
required-projects:
|
required-projects:
|
||||||
- openstack-infra/nodepool
|
- openstack-infra/nodepool
|
||||||
- openstack-infra/zuul
|
- openstack-infra/zuul
|
||||||
|
vars:
|
||||||
|
zuul_work_dir: "{{ zuul.projects['git.openstack.org/openstack-infra/zuul'].src_dir }}"
|
||||||
|
tox_envlist: nodepool
|
||||||
|
|
||||||
- project:
|
- project:
|
||||||
check:
|
check:
|
||||||
|
|
|
@ -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 }}/logs'
|
|
||||||
mode: pull
|
|
||||||
copy_links: true
|
|
||||||
verify_host: true
|
|
||||||
rsync_opts:
|
|
||||||
- --include=/logs/**
|
|
||||||
- --include=*/
|
|
||||||
- --exclude=*
|
|
||||||
- --prune-empty-dirs
|
|
|
@ -0,0 +1,8 @@
|
||||||
|
- hosts: all
|
||||||
|
name: Zuul setup for nodepool test
|
||||||
|
tasks:
|
||||||
|
|
||||||
|
- name: Run tools/nodepool-integration-setup.sh from zuul
|
||||||
|
shell:
|
||||||
|
cmd: tools/nodepool-integration-setup.sh
|
||||||
|
chdir: "{{ zuul.projects['git.openstack.org/openstack-infra/zuul'].src_dir }}"
|
|
@ -1,52 +0,0 @@
|
||||||
- hosts: all
|
|
||||||
name: Autoconverted job legacy-zuul-nodepool from old job gate-zuul-nodepool
|
|
||||||
tasks:
|
|
||||||
|
|
||||||
- name: Ensure legacy workspace directory
|
|
||||||
file:
|
|
||||||
path: '{{ ansible_user_dir }}/workspace'
|
|
||||||
state: directory
|
|
||||||
|
|
||||||
- shell:
|
|
||||||
cmd: |
|
|
||||||
set -e
|
|
||||||
set -x
|
|
||||||
CLONEMAP=`mktemp`
|
|
||||||
function cleanup {
|
|
||||||
# In cases where zuul-cloner is aborted during a git
|
|
||||||
# clone operation, git will remove the git work tree in
|
|
||||||
# its cleanup. The work tree in these jobs is the
|
|
||||||
# workspace directory, which means that subsequent
|
|
||||||
# jenkins post-build actions can not run because the
|
|
||||||
# workspace has been removed.
|
|
||||||
# To reduce the likelyhood of this having an impact,
|
|
||||||
# recreate the workspace directory if needed
|
|
||||||
mkdir -p $WORKSPACE
|
|
||||||
rm -f $CLONEMAP
|
|
||||||
}
|
|
||||||
trap cleanup EXIT
|
|
||||||
cat > $CLONEMAP << EOF
|
|
||||||
clonemap:
|
|
||||||
- name: openstack-infra/zuul
|
|
||||||
dest: .
|
|
||||||
EOF
|
|
||||||
/usr/zuul-env/bin/zuul-cloner -m $CLONEMAP --cache-dir /opt/git \
|
|
||||||
git://git.openstack.org openstack-infra/zuul
|
|
||||||
executable: /bin/bash
|
|
||||||
chdir: '{{ ansible_user_dir }}/workspace'
|
|
||||||
environment: '{{ zuul | zuul_legacy_vars }}'
|
|
||||||
|
|
||||||
- shell:
|
|
||||||
cmd: /usr/local/jenkins/slave_scripts/install-distro-packages.sh
|
|
||||||
chdir: '{{ ansible_user_dir }}/workspace'
|
|
||||||
environment: '{{ zuul | zuul_legacy_vars }}'
|
|
||||||
|
|
||||||
- shell:
|
|
||||||
cmd: tools/nodepool-integration-setup.sh
|
|
||||||
chdir: '{{ ansible_user_dir }}/workspace'
|
|
||||||
environment: '{{ zuul | zuul_legacy_vars }}'
|
|
||||||
|
|
||||||
- shell:
|
|
||||||
cmd: /usr/local/jenkins/slave_scripts/run-tox.sh nodepool
|
|
||||||
chdir: '{{ ansible_user_dir }}/workspace'
|
|
||||||
environment: '{{ zuul | zuul_legacy_vars }}'
|
|
Loading…
Reference in New Issue