From 15877f4fe9ca220b766c4fcd4d846f7d2040c229 Mon Sep 17 00:00:00 2001
From: Monty Taylor <mordred@inaugust.com>
Date: Tue, 17 Oct 2017 16:39:58 +0200
Subject: [PATCH] Add openstack-tox-with-sudo test jobs

Some tox jobs need to not have sudo revoked. Make a job that can be used
that runs tox as the other jobs do but does not revoke sudo first.

Also, add a openstack-tox-functional-with-sudo job as needed by os-vif.

Update some job descriptions.

Co-Authored-By: Andreas Jaeger <aj@suse.com>
Change-Id: Ida9404d2d6d2a4385e92cb40016f1c8bccd7198f
Needed-By: I5b3a6ce0355616084d968c1b01e5629cf0b674bd
---
 playbooks/tox-with-sudo/run.yaml |  3 +++
 zuul.d/jobs.yaml                 | 28 ++++++++++++++++++++++++++--
 2 files changed, 29 insertions(+), 2 deletions(-)
 create mode 100644 playbooks/tox-with-sudo/run.yaml

diff --git a/playbooks/tox-with-sudo/run.yaml b/playbooks/tox-with-sudo/run.yaml
new file mode 100644
index 00000000..22f82096
--- /dev/null
+++ b/playbooks/tox-with-sudo/run.yaml
@@ -0,0 +1,3 @@
+- hosts: all
+  roles:
+    - tox
diff --git a/zuul.d/jobs.yaml b/zuul.d/jobs.yaml
index a83b23aa..6735eab1 100644
--- a/zuul.d/jobs.yaml
+++ b/zuul.d/jobs.yaml
@@ -234,6 +234,14 @@
     vars:
       tox_constraints_file: '{{ ansible_user_dir }}/src/git.openstack.org/openstack/requirements/upper-constraints.txt'
 
+- job:
+    name: openstack-tox-with-sudo
+    parent: openstack-tox
+    description: |
+      Job to run tox for tests with OpenStack project specific
+      settings such as constraints but without sudo access being revoked.
+    run: playbooks/tox-with-sudo/run.yaml
+
 - job:
     name: openstack-tox-py27
     parent: openstack-tox
@@ -345,7 +353,7 @@
     name: openstack-tox-functional
     parent: openstack-tox
     description: |
-      Run functional tests.
+      Run tox-based functional tests for an OpenStack Python project.
 
       Uses tox with the ``functional`` environment.
     irrelevant-files:
@@ -355,11 +363,27 @@
     vars:
       tox_envlist: functional
 
+- job:
+    name: openstack-tox-functional-with-sudo
+    parent: openstack-tox-with-sudo
+    description: |
+      Run tox-based functional tests for an OpenStack Python project.
+
+      Uses tox with the ``functional`` environment.
+      Sudo access is not revoked.
+    irrelevant-files:
+      - ^.*\.rst$
+      - ^doc/.*$
+      - ^releasenotes/.*$
+    vars:
+      tox_envlist: functional
+
 - job:
     name: openstack-tox-functional-py35
     parent: openstack-tox
     description: |
-      Run functional tests using python 3.5.
+      Run tox-based functional tests for an OpenStack Python project
+      under cPython version 3.5..
 
       Uses tox with the ``functional-py35`` environment.
     irrelevant-files: