summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndreas Jaeger <aj@suse.com>2017-12-17 13:37:01 +0100
committerAndreas Jaeger <aj@suse.com>2017-12-17 18:52:31 +0100
commit1af8d87192a8ff05fc4ca2019bbe69d733e354a2 (patch)
treef4f2f7a20b62643773339e14c6394ba09cd8dea2
parent884ea2d8acd60cc18e37cfa721ba1b29789da818 (diff)
downloadpyeclib-1af8d87192a8ff05fc4ca2019bbe69d733e354a2.tar.gz
Convert tox job to native v3 Zuul
Use a native Zuul v3 jobs for the tox job. Remove the now unused playbooks. Also, add file extensions to playbooks, these are required now. Fix bindep.txt file: * Update package liberasurecode-devel, it does not exist in CentOS 7. * Update package yasm, it does not exist in CentOS 7. Change-Id: Ib576497058637b01d63bda3f5369527fe2505e01
-rw-r--r--.zuul.yaml17
-rw-r--r--bindep.txt6
-rw-r--r--playbooks/legacy/pyeclib-tox-py27-centos-7/post.yaml67
-rw-r--r--playbooks/legacy/pyeclib-tox-py27-centos-7/run.yaml86
4 files changed, 12 insertions, 164 deletions
diff --git a/.zuul.yaml b/.zuul.yaml
index af4628b..0c2a8c8 100644
--- a/.zuul.yaml
+++ b/.zuul.yaml
@@ -8,18 +8,17 @@
- job:
name: pyeclib-tox-py27-centos-7
- parent: legacy-base
- run: playbooks/legacy/pyeclib-tox-py27-centos-7/run
- post-run: playbooks/legacy/pyeclib-tox-py27-centos-7/post
- timeout: 2400
- nodeset: legacy-centos-7
- required-projects:
- - openstack/requirements
+ parent: openstack-tox
+ description: |
+ Run unit tests using ``py27`` environment on CentOS 7.
+ nodeset: centos-7
+ vars:
+ tox_envlist: py27
- job:
name: libec-pyeclib-unit-centos-7
parent: legacy-base
- run: playbooks/legacy/libec-pyeclib-unit-centos-7/run
+ run: playbooks/legacy/libec-pyeclib-unit-centos-7/run.yaml
timeout: 1800
nodeset: legacy-centos-7
required-projects:
@@ -29,7 +28,7 @@
- job:
name: libec-pyeclib-unit
parent: legacy-base
- run: playbooks/legacy/libec-pyeclib-unit/run
+ run: playbooks/legacy/libec-pyeclib-unit/run.yaml
timeout: 1800
required-projects:
- openstack/liberasurecode
diff --git a/bindep.txt b/bindep.txt
index a8f6a10..c6c69f7 100644
--- a/bindep.txt
+++ b/bindep.txt
@@ -7,8 +7,10 @@ make [platform:rpm]
autoconf
automake
libtool
-yasm
+# yasm exists everywhere but CentOS 7
+yasm [!platform:centos]
liberasurecode-dev [platform:dpkg]
-liberasurecode-devel [platform:rpm]
+# There's no library in CentOS 7 but Fedora and openSUSE have it.
+liberasurecode-devel [platform:rpm !platform:centos]
python-dev [platform:dpkg]
python-devel [platform:rpm]
diff --git a/playbooks/legacy/pyeclib-tox-py27-centos-7/post.yaml b/playbooks/legacy/pyeclib-tox-py27-centos-7/post.yaml
deleted file mode 100644
index 68fbdf8..0000000
--- a/playbooks/legacy/pyeclib-tox-py27-centos-7/post.yaml
+++ /dev/null
@@ -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
diff --git a/playbooks/legacy/pyeclib-tox-py27-centos-7/run.yaml b/playbooks/legacy/pyeclib-tox-py27-centos-7/run.yaml
deleted file mode 100644
index 90478c9..0000000
--- a/playbooks/legacy/pyeclib-tox-py27-centos-7/run.yaml
+++ /dev/null
@@ -1,86 +0,0 @@
-- hosts: all
- name: Autoconverted job legacy-pyeclib-tox-py27-centos-7 from old job gate-pyeclib-tox-py27-centos-7
- 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 py27
- 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 }}'