Merge "Remove special searchlight unit test setup"

jenkins/jobs/macros.yaml

@@ -1060,33 +1060,6 @@
               sudo service ssh restart
           fi
 
-
-# Install specific elasticsearch version(1.7.5) as needed for searchlight.
-- builder:
-    name: elasticsearch-install-1
-    builders:
-      - shell: |
-          #!/bin/bash -xe
-          sudo apt-get update
-          sudo apt-get install -y default-jre
-          wget https://download.elastic.co/elasticsearch/elasticsearch/elasticsearch-1.7.5.deb
-          sudo dpkg -i elasticsearch-1.7.5.deb
-          #Make 'elasticsearch' binary callable from within functional tests
-          sudo ln -s /usr/share/elasticsearch/bin/elasticsearch /usr/local/bin/elasticsearch
-
-# Install specific elasticsearch version(2.x) as needed for searchlight.
-- builder:
-    name: elasticsearch-install
-    builders:
-      - shell: |
-          #!/bin/bash -xe
-          sudo apt-get update
-          sudo apt-get install -y default-jre
-          wget https://download.elastic.co/elasticsearch/release/org/elasticsearch/distribution/deb/elasticsearch/2.3.2/elasticsearch-2.3.2.deb
-          sudo dpkg -i elasticsearch-2.3.2.deb
-          #Make 'elasticsearch' binary callable from within functional tests
-          sudo ln -s /usr/share/elasticsearch/bin/elasticsearch /usr/local/bin/elasticsearch
-
 - builder:
     name: mount-xfs-tmp-space
     builders:

jenkins/jobs/projects.yaml

@@ -13237,9 +13237,10 @@
     doc-publisher-site: docs.openstack.org
 
     jobs:
-      - python-jobs-searchlight
+      - python-jobs
       - 'gate-{name}-pypy'
-      - 'gate-{name}-python35-searchlight-nv'
+      - 'gate-{name}-python35{suffix}':
+          suffix: '-nv'
       - openstack-client-publish-jobs
       - pypi-jobs
 
@@ -14028,8 +14029,9 @@
     tarball-site: tarballs.openstack.org
     doc-publisher-site: docs.openstack.org
     jobs:
-      - python-jobs-searchlight
+      - python-jobs
-      - 'gate-{name}-python35-searchlight-nv'
+      - 'gate-{name}-python35{suffix}':
+          suffix: '-nv'
       - openstack-publish-jobs
       - openstack-releasenotes-jobs
       - openstack-server-release-jobs

jenkins/jobs/python-jobs.yaml

@@ -763,24 +763,6 @@
     jobs:
       - 'gate-cross-{name}-python27-db-{node}'
 
-- job-group:
-    name: python-jobs-searchlight
-    node:
-      - ubuntu-trusty
-      - ubuntu-xenial
-    jobs:
-      - 'gate-{name}-pep8-{node}'
-      - 'gate-{name}-python27-searchlight'
-      - 'gate-{name}-python27-searchlight-es1'
-      - 'gate-{name}-python34-searchlight'
-      - 'gate-{name}-docs-{node}'
-      - 'gate-{name}-requirements'
-      - '{name}-branch-tarball'
-      # pylint isn't standard
-      # pypy isn't standard
-      # gate-{name}-tox-{envlist} also isn't standard, but is reserved for
-      # projects that want to run specific jobs via tox
-
 - job-group:
     name: openstack-server-release-jobs
     jobs:

jenkins/jobs/searchlight.yaml

@@ -1,95 +0,0 @@
-- job-template:
-    name: 'gate-{name}-python27-searchlight'
-
-    wrappers:
-      - build-timeout:
-          timeout: 50
-      - timestamps
-
-    builders:
-      - print-template-name:
-          template-name: "{template-name}"
-      - zuul-git-prep-upper-constraints
-      - elasticsearch-install
-      - install-distro-packages
-      - revoke-sudo
-      - python27
-      - assert-no-extra-files
-
-    publishers:
-      - test-results
-      - console-log
-
-    node: ubuntu-trusty
-
-- job-template:
-    name: 'gate-{name}-python27-searchlight-es1'
-
-    wrappers:
-      - build-timeout:
-          timeout: 50
-      - timestamps
-
-    builders:
-      - print-template-name:
-          template-name: "{template-name}"
-      - zuul-git-prep-upper-constraints
-      - elasticsearch-install-1
-      - install-distro-packages
-      - revoke-sudo
-      - python27
-      - assert-no-extra-files
-
-    publishers:
-      - test-results
-      - console-log
-
-    node: ubuntu-trusty
-
-- job-template:
-    name: 'gate-{name}-python34-searchlight'
-
-    wrappers:
-      - build-timeout:
-          timeout: 40
-      - timestamps
-
-    builders:
-      - print-template-name:
-          template-name: "{template-name}"
-      - zuul-git-prep-upper-constraints
-      - elasticsearch-install
-      - install-distro-packages
-      - revoke-sudo
-      - python34
-      - assert-no-extra-files
-
-    publishers:
-      - test-results
-      - console-log
-
-    node: ubuntu-trusty
-
-- job-template:
-    name: 'gate-{name}-python35-searchlight-nv'
-
-    wrappers:
-      - build-timeout:
-          timeout: 40
-      - timestamps
-
-    builders:
-      - print-template-name:
-          template-name: "{template-name}"
-      - zuul-git-prep-upper-constraints
-      - elasticsearch-install
-      - install-distro-packages
-      - revoke-sudo
-      - python35
-      - assert-no-extra-files
-
-    publishers:
-      - test-results
-      - console-log
-
-    node: ubuntu-xenial

zuul/layout.yaml

@@ -394,28 +394,6 @@ project-templates:
     post:
       - '{name}-branch-tarball'
 
-  # Invokes the same targets as python-jobs with one change:
-  # python27-searchlight is used instead of python27.
-  # The job python27-searchlight installs extra packages.
-  # The job python27-searchlight-es1 installs extra packages.
-  - name: python-jobs-searchlight
-    check:
-      - 'gate-{name}-docs-ubuntu-trusty'
-      - 'gate-{name}-pep8-ubuntu-trusty'
-      - 'gate-{name}-docs-ubuntu-xenial'
-      - 'gate-{name}-pep8-ubuntu-xenial'
-      - 'gate-{name}-python27-searchlight'
-      - 'gate-{name}-python27-searchlight-es1'
-    gate:
-      - 'gate-{name}-docs-ubuntu-trusty'
-      - 'gate-{name}-pep8-ubuntu-trusty'
-      - 'gate-{name}-docs-ubuntu-xenial'
-      - 'gate-{name}-pep8-ubuntu-xenial'
-      - 'gate-{name}-python27-searchlight'
-      - 'gate-{name}-python27-searchlight-es1'
-    post:
-      - '{name}-branch-tarball'
-
   - name: python-charm-jobs
     check:
       - 'gate-{name}-pep8-ubuntu-trusty'
@@ -542,14 +520,6 @@ project-templates:
     gate:
       - 'gate-{name}-python34-db'
 
-  # Invokes the same targets as python34-jobs, but sets up extra packages.
-  # The job python34-searchlight installs extra packages.
-  - name: python34-jobs-searchlight
-    check:
-      - 'gate-{name}-python34-searchlight'
-    gate:
-      - 'gate-{name}-python34-searchlight'
-
   - name: python35-jobs-nv
     check:
       - 'gate-{name}-python35-nv'
@@ -572,12 +542,6 @@ project-templates:
     gate:
       - 'gate-{name}-python35-db'
 
-  # Invokes the same targets as python35-jobs, but sets up extra packages.
-  # The job python35-searchlight installs extra packages.
-  - name: python35-jobs-searchlight
-    check:
-      - 'gate-{name}-python35-searchlight-nv'
-
   - name: osc-plugin-jobs
     check:
       - 'check-osc-plugins'
@@ -2858,11 +2822,6 @@ jobs:
   - name: gate-manila-tempest-minimal-dsvm-lvm-ubuntu-trusty
     branch: ^(?:stable/mitaka).*$
 
-  # Broken by a recent client update; marking non-voting while we
-  # determine whether or not to keep this test job
-  - name: gate-searchlight-python27-searchlight-es1
-    voting: false
-
   # for devstack-plugin-amqp1
   - name: gate-tempest-dsvm-full-amqp1
     voting: false
@@ -15800,9 +15759,9 @@ projects:
   - name: openstack/python-searchlightclient
     template:
       - name: merge-check
-      - name: python-jobs-searchlight
+      - name: python-jobs
-      - name: python34-jobs-searchlight
+      - name: python34-jobs
-      - name: python35-jobs-searchlight
+      - name: python35-jobs-nv
       - name: openstack-client-publish-jobs
       - name: check-requirements
       - name: publish-to-pypi
@@ -16514,9 +16473,9 @@ projects:
   - name: openstack/searchlight
     template:
       - name: merge-check
-      - name: python-jobs-searchlight
+      - name: python-jobs
-      - name: python34-jobs-searchlight
+      - name: python34-jobs
-      - name: python35-jobs-searchlight
+      - name: python35-jobs-nv
       - name: openstack-server-publish-jobs
       - name: openstack-server-release-jobs
       - name: check-requirements