Use 'functional' tox environment

Code Issues Proposed changes

Rename 'func' to 'functional' tox environment and replace custom
legacy func job with cross-project 'openstack-tox-functional' job.
Change-Id: I2a774a0a9870163457d1e7bc9c2976a9680ace01

This commit is contained in:

Ruby Loo

2017年11月21日 16:43:17 -05:00

parent 831576c906

commit 64b663719a

5 changed files with 3 additions and 165 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

67
playbooks/legacy/ironic-python-agent-tox-func/post.yaml

View File

@@ -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

86
playbooks/legacy/ironic-python-agent-tox-func/run.yaml

View File

@@ -1,86 +0,0 @@

- hosts:all

name:Autoconverted job legacy-ironic-python-agent-tox-func from old job gate-ironic-python-agent-tox-func-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 func

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 }}'

4
tox.ini

View File

@@ -1,7 +1,7 @@

[tox]

minversion = 1.6

skipsdist = True

envlist = py3,py27,func,pep8

envlist = py3,py27,functional,pep8

[testenv]

usedevelop = True

@@ -14,7 +14,7 @@ setenv =

deps = -r{toxinidir}/test-requirements.txt

commands = ostestr {posargs}

[testenv:func]

[testenv:functional]

usedevelop = True

# Define virtualenv directory, port to use for functional testing, and number

# of seconds to wait for the agent to come alive during functional testing.

9
zuul.d/legacy-ironic-jobs.yaml

View File

@@ -22,15 +22,6 @@

- openstack/tempest

- openstack/virtualbmc

- job:

name:ironic-python-agent-tox-func

parent:legacy-base

run:playbooks/legacy/ironic-python-agent-tox-func/run.yaml

post-run:playbooks/legacy/ironic-python-agent-tox-func/post.yaml

timeout:2400

required-projects:

- openstack/requirements

- job:

name:ipa-tempest-dsvm-wholedisk-bios-agent_ipmitool-coreos-src

parent:legacy-ipa-dsvm-base

2
zuul.d/project.yaml

View File

@@ -13,7 +13,7 @@

# Non-voting jobs

- ipa-tempest-dsvm-ironic-inspector-src:

voting:false

- ironic-python-agent-tox-func:

- openstack-tox-functional:

voting:false

gate:

jobs: