Merge "Revert "Add support for "tox" builder""

6 files changed, 0 insertions, 54 deletions

diff --git a/jenkins_jobs/modules/builders.py b/jenkins_jobs/modules/builders.py
index e6f10782..5c081ddd 100644
--- a/jenkins_jobs/modules/builders.py
+++ b/jenkins_jobs/modules/builders.py
@@ -1964,32 +1964,6 @@ def shining_panda(parser, xml_parent, data):
     XML.SubElement(t, 'ignoreExitCode').text = str(ignore_exit_code).lower()
 
 
-def tox(parser, xml_parent, data):
-    """yaml: tox
-    Use tox to build a multi-configuration project. Requires the Jenkins
-    :jenkins-wiki:`ShiningPanda plugin <ShiningPanda+Plugin>`.
-
-    :arg str ini: The TOX configuration file path (default: tox.ini)
-    :arg bool recreate: If true, create a new environment each time (default:
-        false)
-    :arg str toxenv-pattern: The pattern used to build the TOXENV environment
-        variable. (optional)
-
-    Example:
-
-    .. literalinclude:: /../../tests/builders/fixtures/tox001.yaml
-       :language: yaml
-    """
-    pluginelement = 'jenkins.plugins.shiningpanda.builders.ToxBuilder'
-    t = XML.SubElement(xml_parent, pluginelement)
-    XML.SubElement(t, 'toxIni').text = data.get('ini', 'tox.ini')
-    XML.SubElement(t, 'recreate').text = str(
-        data.get('recreate', False)).lower()
-    pattern = data.get('toxenv-pattern')
-    if pattern:
-        XML.SubElement(t, 'toxenvPattern').text = pattern
-
-
 def managed_script(parser, xml_parent, data):
     """yaml: managed-script
     This step allows to reference and execute a centrally managed
diff --git a/setup.cfg b/setup.cfg
index 26b1463e..65b1cee2 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -87,7 +87,6 @@ jenkins_jobs.builders =
     sonatype-clm=jenkins_jobs.modules.builders:sonatype_clm
     ssh-builder=jenkins_jobs.modules.builders:ssh_builder
     system-groovy=jenkins_jobs.modules.builders:system_groovy
-    tox=jenkins_jobs.modules.builders:tox
     trigger-builds=jenkins_jobs.modules.builders:trigger_builds
     trigger-remote=jenkins_jobs.modules.builders:trigger_remote
 jenkins_jobs.reporters =
diff --git a/tests/builders/fixtures/tox001.xml b/tests/builders/fixtures/tox001.xml
deleted file mode 100644
index 1456396a..00000000
--- a/tests/builders/fixtures/tox001.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<project>
-  <builders>
-    <jenkins.plugins.shiningpanda.builders.ToxBuilder>
-      <toxIni>tox.ini</toxIni>
-      <recreate>true</recreate>
-    </jenkins.plugins.shiningpanda.builders.ToxBuilder>
-  </builders>
-</project>
diff --git a/tests/builders/fixtures/tox001.yaml b/tests/builders/fixtures/tox001.yaml
deleted file mode 100644
index 4dfead28..00000000
--- a/tests/builders/fixtures/tox001.yaml
+++ /dev/null
@@ -1,3 +0,0 @@
-builders:
-  - tox:
-      recreate: True
diff --git a/tests/builders/fixtures/tox002.xml b/tests/builders/fixtures/tox002.xml
deleted file mode 100644
index 26cb9291..00000000
--- a/tests/builders/fixtures/tox002.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<project>
-  <builders>
-    <jenkins.plugins.shiningpanda.builders.ToxBuilder>
-      <toxIni>foo.conf</toxIni>
-      <recreate>false</recreate>
-      <toxenvPattern>TOX_ENV</toxenvPattern>
-    </jenkins.plugins.shiningpanda.builders.ToxBuilder>
-  </builders>
-</project>
diff --git a/tests/builders/fixtures/tox002.yaml b/tests/builders/fixtures/tox002.yaml
deleted file mode 100644
index 8376f440..00000000
--- a/tests/builders/fixtures/tox002.yaml
+++ /dev/null
@@ -1,5 +0,0 @@
-builders:
-  - tox:
-      ini: "foo.conf"
-      toxenv-pattern: TOX_ENV
-