Use native Zuul v3 tox job
Replace tox legacy job with native Zuul v3 job. Also, remove name from project stanza, this is not needed anymore. Change-Id: I97f852a39ad461c0ef7bef8071c18eb9eab453a1
This commit is contained in:
Andreas Jaeger
Andreas Jaeger
parent
2832f1a7fd
commit
21af4fe428
13
.zuul.yaml
13
.zuul.yaml
@ -88,10 +88,11 @@
|
||||
# Experimental
|
||||
- job:
|
||||
name: keystone-tox-patch_cover
|
||||
parent: legacy-base
|
||||
run: playbooks/legacy/keystone-tox-patch_cover/run.yaml
|
||||
post-run: playbooks/legacy/keystone-tox-patch_cover/post.yaml
|
||||
timeout: 2400
|
||||
parent: openstack-tox
|
||||
description: |
|
||||
Run test for keystone project.
|
||||
|
||||
Uses tox with the ``patch_cover`` environment.
|
||||
irrelevant-files:
|
||||
- ^.*\.rst$
|
||||
- ^api-ref/.*$
|
||||
@ -99,8 +100,8 @@
|
||||
- ^etc/.*$
|
||||
- ^keystone/tests/unit/.*$
|
||||
- ^releasenotes/.*$
|
||||
required-projects:
|
||||
- openstack/requirements
|
||||
vars:
|
||||
tox_envlist: patch_cover
|
||||
|
||||
# Experimental
|
||||
- job:
|
||||
|
||||
@ -1,67 +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
|
||||
@ -1,86 +0,0 @@
|
||||
- hosts: all
|
||||
name: Autoconverted job legacy-keystone-tox-patch_cover from old job gate-keystone-tox-patch_cover-ubuntu-xenial
|
||||
tasks:
|
||||
|
||||
- name: Ensure legacy workspace directory
|
||||
file:
|
||||
path: '{{ ansible_user_dir }}/workspace'
|
||||
state: directory
|
||||
|
||||
- shell:
|
||||
cmd: |
|
||||
set -e
|
||||
set -x
|
||||
CLONEMAP=`mktemp`
|
||||
REQS_DIR=`mktemp -d`
|
||||
function cleanup {
|
||||
mkdir -p $WORKSPACE
|
||||
rm -rf $CLONEMAP $REQS_DIR
|
||||
}
|
||||
trap cleanup EXIT
|
||||
cat > $CLONEMAP << EOF
|
||||
clonemap:
|
||||
- name: $ZUUL_PROJECT
|
||||
dest: .
|
||||
EOF
|
||||
# zuul cloner works poorly if there are 2 names that are the
|
||||
# same in here.
|
||||
if [[ "$ZUUL_PROJECT" != "openstack/requirements" ]]; then
|
||||
cat >> $CLONEMAP << EOF
|
||||
- name: openstack/requirements
|
||||
dest: $REQS_DIR
|
||||
EOF
|
||||
fi
|
||||
/usr/zuul-env/bin/zuul-cloner -m $CLONEMAP --cache-dir /opt/git \
|
||||
git://git.openstack.org $ZUUL_PROJECT openstack/requirements
|
||||
# REQS_DIR is not set for openstack/requirements and there is also
|
||||
# no need to copy in this case.
|
||||
if [[ "$ZUUL_PROJECT" != "openstack/requirements" ]]; then
|
||||
cp $REQS_DIR/upper-constraints.txt ./
|
||||
fi
|
||||
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: |
|
||||
if [ -x tools/test-setup.sh ] ; then
|
||||
tools/test-setup.sh
|
||||
fi
|
||||
chdir: '{{ ansible_user_dir }}/workspace'
|
||||
environment: '{{ zuul | zuul_legacy_vars }}'
|
||||
|
||||
- shell:
|
||||
cmd: |
|
||||
set -x
|
||||
sudo rm -f /etc/sudoers.d/zuul
|
||||
# Prove that general sudo access is actually revoked
|
||||
! sudo -n true
|
||||
executable: /bin/bash
|
||||
chdir: '{{ ansible_user_dir }}/workspace'
|
||||
environment: '{{ zuul | zuul_legacy_vars }}'
|
||||
|
||||
- shell:
|
||||
cmd: /usr/local/jenkins/slave_scripts/run-tox.sh patch_cover
|
||||
chdir: '{{ ansible_user_dir }}/workspace'
|
||||
environment: '{{ zuul | zuul_legacy_vars }}'
|
||||
|
||||
- shell:
|
||||
cmd: |
|
||||
OUT=`git ls-files --other --exclude-standard --directory`
|
||||
if [ -z "$OUT" ]; then
|
||||
echo "No extra files created during test."
|
||||
exit 0
|
||||
else
|
||||
echo "The following un-ignored files were created during the test:"
|
||||
echo "$OUT"
|
||||
exit 0 # TODO: change to 1 to fail tests.
|
||||
fi
|
||||
executable: /bin/bash
|
||||
chdir: '{{ ansible_user_dir }}/workspace'
|
||||
environment: '{{ zuul | zuul_legacy_vars }}'
|
||||
Loading…
Reference in New Issue
Block a user