zuul/zuul-jobs
Code Issues Proposed changes

Update tox-tarball to use tox role

Browse Source 
We no longer need to depend on our run-tarball / run-wheel roles. I
also plan to add back our sha1sum / md5sum files back in a follow
patch.

Change-Id: If4814a21192112d841fdb24cfdd1fd1a8bd427e6
Signed-off-by: Paul Belanger <pabelanger@redhat.com>
This commit is contained in:
Paul Belanger 2017-08-01 14:42:31 -04:00
parent f21bd3e57e
commit 64785f464b
No known key found for this signature in database
GPG Key ID: 611A80832067AF38
5 changed files with 4 additions and 77 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
playbooks/tox/tarball.yaml
View File

@ -1,4 +1,6 @@
- hosts: all
roles:
- run-tarball
- run-wheel
- role: tox
tox_extra_args: -vv python setup.py sdist
- role: tox
tox_extra_args: -vv python setup.py bdist_wheel

3
roles/run-tarball/defaults/main.yaml
View File

@ -1,3 +0,0 @@
---
tox_envlist: venv
zuul_work_dir: "src/{{ zuul.project.canonical_name }}"

35
roles/run-tarball/tasks/main.yaml
View File

@ -1,35 +0,0 @@
- name: Build a tarball
args:
chdir: "{{ zuul_work_dir }}"
shell: |
#!/bin/bash -xe
# Copyright 2013 OpenStack Foundation
#
# Licensed under the Apache License, Version 2.0 (the "License"); you may
# not use this file except in compliance with the License. You may obtain
# a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
# License for the specific language governing permissions and limitations
# under the License.
venv={{ tox_envlist }}
rm -f dist/*.tar.gz
tox -e$venv python setup.py sdist
FILES=dist/*.tar.gz
for f in $FILES; do
echo "SHA1sum for $f:"
sha1sum $f | awk '{print $1}' > $f.sha1
cat $f.sha1
echo "MD5sum for $f:"
md5sum $f | awk '{print $1}' > $f.md5
cat $f.md5
done

3
roles/run-wheel/defaults/main.yaml
View File

@ -1,3 +0,0 @@
---
tox_envlist: venv
zuul_work_dir: "src/{{ zuul.project.canonical_name }}"

34
roles/run-wheel/tasks/main.yaml
View File

@ -1,34 +0,0 @@
- name: Build a wheel
args:
chdir: "{{ zuul_work_dir }}"
shell: |
#!/bin/bash -xe
# Copyright 2013 OpenStack Foundation
#
# Licensed under the Apache License, Version 2.0 (the "License"); you may
# not use this file except in compliance with the License. You may obtain
# a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
# License for the specific language governing permissions and limitations
# under the License.
venv={{ tox_envlist }}
rm -f dist/*.whl
tox -e$venv pip install wheel
tox -e$venv python setup.py bdist_wheel
FILES=dist/*.whl
for f in $FILES; do
echo -n "SHA1sum for $f: "
sha1sum $f | awk '{print $1}' | tee $f.sha1
echo -n "MD5sum for $f: "
md5sum $f | awk '{print $1}' | tee $f.md5
done