Change experimental to actual for searchlight

https://review.openstack.org/#/c/294224 had an experimental
job for testing elasticsearch install inside py27 job.

The test was successfull, so changing it for real.

Also adding elasticsearch package to py34 job which I
realized was missing.

Change-Id: Ifec2835a63d399a136ee5bdcdedadead18ebe817
This commit is contained in:
Lakshmi N Sampath
2016-03-28 11:08:26 -07:00
parent 678c1c81b5
commit e9a6156a05
4 changed files with 38 additions and 15 deletions

View File

@@ -818,11 +818,6 @@
sudo apt-get install -y openjdk-7-jre
wget https://download.elastic.co/elasticsearch/elasticsearch/elasticsearch-1.7.5.deb
sudo dpkg -i elasticsearch-1.7.5.deb
#Switch to tar extract if service start doesn't work.
#wget https://download.elastic.co/elasticsearch/elasticsearch/elasticsearch-1.7.5.tar.gz
#tar -zxvf elasticsearch-1.7.5.tar.gz
#Make 'elasticsearch' binary callable from within functional tests
sudo ln -s /usr/share/elasticsearch/bin/elasticsearch /usr/local/bin/elasticsearch

View File

@@ -515,7 +515,7 @@
- '{name}-coverage'
- 'gate-{name}-pep8'
- 'gate-{name}-python27-searchlight'
- 'gate-{name}-python34'
- 'gate-{name}-python34-searchlight'
- 'gate-{name}-pypy'
- 'gate-{name}-docs'
- 'gate-{name}-requirements'

View File

@@ -22,3 +22,28 @@
- zuul-swift-test-results-with-console
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
- zuul-swift-test-results-with-console
node: ubuntu-trusty

View File

@@ -309,20 +309,16 @@ project-templates:
- '{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
# python27-searchlight is used instead of python27.
# The job python27-searchlight installs extra packages
- name: python-jobs-searchlight
check:
- 'gate-{name}-docs'
- 'gate-{name}-pep8'
# TODO(jaegerandi): Enable once experimental job works.
# - 'gate-{name}-python27-searchlight'
- 'gate-{name}-python27-searchlight'
gate:
- 'gate-{name}-docs'
- 'gate-{name}-pep8'
# TODO(jaegerandi): Enable once experimental job works.
# - 'gate-{name}-python27-searchlight'
experimental:
- 'gate-{name}-python27-searchlight'
post:
- '{name}-branch-tarball'
@@ -410,6 +406,13 @@ project-templates:
gate:
- 'gate-{name}-python34'
# Invokes the same targets as python3-jobs, but sets up extra packages.
- name: python3-jobs-searchlight
check:
- 'gate-{name}-python34-searchlight'
gate:
- 'gate-{name}-python34-searchlight'
# Invokes the same targets as python3-jobs, but sets up databases.
- name: python3-db-jobs
check:
@@ -9835,7 +9838,7 @@ projects:
template:
- name: merge-check
- name: python-jobs-searchlight
- name: python3-jobs
- name: python3-jobs-searchlight
- name: openstack-client-publish-jobs
- name: check-requirements
- name: publish-to-pypi
@@ -10374,7 +10377,7 @@ projects:
template:
- name: merge-check
- name: python-jobs-searchlight
- name: python3-jobs
- name: python3-jobs-searchlight
- name: openstack-server-publish-jobs
- name: openstack-server-release-jobs
- name: check-requirements