From f784efde006559655916b4c27a25d9dcee2b2a93 Mon Sep 17 00:00:00 2001
From: Tim Burke <tim.burke@gmail.com>
Date: Wed, 23 Sep 2020 21:03:47 -0700
Subject: Move liberasurecode-git behavior into all tox envs with compilelibs
 marker

This should let us use that to test against master libec in the gate,
rather than relying on legacy job cruft.

It may complicate cross-project dependencies, but I don't know that we
did that much anyways.

Add a job to test against master libec on centos8, as well.

Change-Id: I33553d9a3432d97a28e4ea685ffc7bc4fb92a340
---
 .zuul.yaml                                         | 34 ++++++++++++---------
 .../legacy/libec-pyeclib-unit-centos-7/run.yaml    | 35 ----------------------
 playbooks/legacy/libec-pyeclib-unit/run.yaml       | 35 ----------------------
 tox.ini                                            |  7 ++---
 4 files changed, 23 insertions(+), 88 deletions(-)
 delete mode 100644 playbooks/legacy/libec-pyeclib-unit-centos-7/run.yaml
 delete mode 100644 playbooks/legacy/libec-pyeclib-unit/run.yaml

diff --git a/.zuul.yaml b/.zuul.yaml
index 65f87bc..bcb51e8 100644
--- a/.zuul.yaml
+++ b/.zuul.yaml
@@ -9,8 +9,9 @@
         - openstack-tox-py38
         - pyeclib-tox-py27-centos-7
         - pyeclib-tox-py36-centos-8
-        - libec-pyeclib-unit-centos-7
         - libec-pyeclib-unit
+        - libec-pyeclib-unit-centos-7
+        - libec-pyeclib-unit-centos-8
     gate:
       jobs:
         - openstack-tox-py35
@@ -19,6 +20,9 @@
         - openstack-tox-py38
         - pyeclib-tox-py27-centos-7
         - pyeclib-tox-py36-centos-8
+        - libec-pyeclib-unit
+        - libec-pyeclib-unit-centos-7
+        - libec-pyeclib-unit-centos-8
 
 - job:
     name: pyeclib-tox-py27-centos-7
@@ -36,21 +40,23 @@
 
 - job:
     name: libec-pyeclib-unit-centos-7
-    parent: legacy-base
-    run: playbooks/legacy/libec-pyeclib-unit-centos-7/run.yaml
+    parent: openstack-tox-py27
     timeout: 1800
-    nodeset: legacy-centos-7
-    required-projects:
-      - openstack/liberasurecode
-      - openstack/pyeclib
-    voting: false
+    nodeset: centos-7
+    vars:
+      tox_envlist: py27-compilelibs
+
+- job:
+    name: libec-pyeclib-unit-centos-8
+    parent: openstack-tox-py36
+    timeout: 1800
+    nodeset: centos-8
+    vars:
+      tox_envlist: py36-compilelibs
 
 - job:
     name: libec-pyeclib-unit
-    parent: legacy-base
-    run: playbooks/legacy/libec-pyeclib-unit/run.yaml
+    parent: openstack-tox-py38
     timeout: 1800
-    required-projects:
-      - openstack/liberasurecode
-      - openstack/pyeclib
-    voting: false
+    vars:
+      tox_envlist: py38-compilelibs
diff --git a/playbooks/legacy/libec-pyeclib-unit-centos-7/run.yaml b/playbooks/legacy/libec-pyeclib-unit-centos-7/run.yaml
deleted file mode 100644
index 8c645b0..0000000
--- a/playbooks/legacy/libec-pyeclib-unit-centos-7/run.yaml
+++ /dev/null
@@ -1,35 +0,0 @@
-- hosts: all
-  name: Autoconverted job legacy-libec-pyeclib-unit-centos-7 from old job gate-libec-pyeclib-unit-centos-7
-  roles:
-    - bindep
-
-  tasks:
-
-    - name: Ensure legacy workspace directory
-      file:
-        path: '{{ ansible_user_dir }}/workspace'
-        state: directory
-
-    - shell:
-        cmd: |
-          set -e
-          set -x
-          cd $WORKSPACE
-          /usr/zuul-env/bin/zuul-cloner --cache-dir /opt/git \
-            https://opendev.org \
-            openstack/liberasurecode \
-            openstack/pyeclib
-          # build libec
-          cd openstack/liberasurecode
-          ./autogen.sh
-          ./configure
-          make
-          sudo make install
-          sudo bash -c "echo /usr/local/lib >> /etc/ld.so.conf"
-          sudo ldconfig
-          # test pyeclib
-          cd $WORKSPACE/openstack/pyeclib
-          tox -e py27
-        executable: /bin/bash
-        chdir: '{{ ansible_user_dir }}/workspace'
-      environment: '{{ zuul | zuul_legacy_vars }}'
diff --git a/playbooks/legacy/libec-pyeclib-unit/run.yaml b/playbooks/legacy/libec-pyeclib-unit/run.yaml
deleted file mode 100644
index 473a16b..0000000
--- a/playbooks/legacy/libec-pyeclib-unit/run.yaml
+++ /dev/null
@@ -1,35 +0,0 @@
-- hosts: all
-  name: Autoconverted job legacy-libec-pyeclib-unit from old job gate-libec-pyeclib-unit-ubuntu-xenial
-  roles:
-    - bindep
-
-  tasks:
-
-    - name: Ensure legacy workspace directory
-      file:
-        path: '{{ ansible_user_dir }}/workspace'
-        state: directory
-
-    - shell:
-        cmd: |
-          set -e
-          set -x
-          cd $WORKSPACE
-          /usr/zuul-env/bin/zuul-cloner --cache-dir /opt/git \
-            https://opendev.org \
-            openstack/liberasurecode \
-            openstack/pyeclib
-          # build libec
-          cd openstack/liberasurecode
-          ./autogen.sh
-          ./configure
-          make
-          sudo make install
-          sudo bash -c "echo /usr/local/lib >> /etc/ld.so.conf"
-          sudo ldconfig
-          # test pyeclib
-          cd $WORKSPACE/openstack/pyeclib
-          tox -e py27
-        executable: /bin/bash
-        chdir: '{{ ansible_user_dir }}/workspace'
-      environment: '{{ zuul | zuul_legacy_vars }}'
diff --git a/tox.ini b/tox.ini
index 349e374..59284c3 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,20 +1,19 @@
 [tox]
-envlist = py27,py35,py36,py37,pep8
+envlist = py{27,35,36,37,38}-compilelibs,pep8,docs
 
 [testenv]
 deps =
   -r{toxinidir}/test-requirements.txt
 commands=
     nosetests --no-path-adjustment -v test/
-
-[testenv:liberasurecode-git]
 setenv = LIBERASURECODE_DIR={envdir}/liberasurecode
     ISAL_DIR={envdir}/isa-l
     JERASURE_DIR={envdir}/jerasure
     GFCOMPLETE_DIR={envdir}/gf-complete
 passenv = LIBERASURECODE_REF
 install_command =
-    {toxinidir}/tools/pip-install-with-liberasurecode.sh {opts} {packages}
+    compilelibs: {toxinidir}/tools/pip-install-with-liberasurecode.sh {opts} {packages}
+    !compilelibs: pip install {opts} {packages}
 
 [testenv:pep8]
 skip_install = True
-- 
cgit v1.2.1