From 841accd5a71448448034a86dac0c3294e5abd597 Mon Sep 17 00:00:00 2001 From: David Lyle Date: Tue, 3 May 2016 15:25:49 -0600 Subject: [PATCH] Adding tempest-horizon repo and job In an effort to make the overall gate more robust and still allow Horizon to update their xstatic packages, this patch adds a repo containing the current horizon tempest scenario tests in tempest plugin form. The patch also adds a non-voting check job to allow testing of the plugin. Without this change, it is possible to break the gate by updating xstatic packages before Horizon can support the new version. This sad truth is an offshoot of the difficultly of supporting the many incompatibilities between versions of javascript libraries. Once the new job is verified and added to the horizon gate, the current horizon scenario tests in openstack/tempest would be removed. Needed-By: Ib01a69ffb978708ad7b515d3aaa4b58bc894a167 Change-Id: I1608407a4f8246728c30870fd5e1886c632e7734 --- gerrit/acls/openstack/tempest-horizon.config | 11 +++++++ gerrit/projects.yaml | 3 ++ jenkins/jobs/horizon.yaml | 30 ++++++++++++++++++++ jenkins/jobs/projects.yaml | 10 +++++++ zuul/layout.yaml | 15 ++++++++++ 5 files changed, 69 insertions(+) create mode 100644 gerrit/acls/openstack/tempest-horizon.config diff --git a/gerrit/acls/openstack/tempest-horizon.config b/gerrit/acls/openstack/tempest-horizon.config new file mode 100644 index 0000000000..eb3a00616d --- /dev/null +++ b/gerrit/acls/openstack/tempest-horizon.config @@ -0,0 +1,11 @@ +[access "refs/heads/*"] +abandon = group horizon-core +label-Code-Review = -2..+2 group horizon-core +label-Workflow = -1..+1 group horizon-core + +[receive] +requireChangeId = true +requireContributorAgreement = true + +[submit] +mergeContent = true diff --git a/gerrit/projects.yaml b/gerrit/projects.yaml index a95e9b3676..cdd2a61cc3 100755 --- a/gerrit/projects.yaml +++ b/gerrit/projects.yaml @@ -3720,6 +3720,9 @@ description: OpenStack Telemetry Specifications - project: openstack/tempest description: OpenStack Testing (Tempest) of an existing cloud +- project: openstack/tempest-horizon + description: Horizon plugin for tempest + upstream: https://github.com/dklyle/tempest-horizon.git - project: openstack/tempest-lib description: A library to assist in creating functional or integrated test suites for OpenStack projects. diff --git a/jenkins/jobs/horizon.yaml b/jenkins/jobs/horizon.yaml index cc8f537b30..21112ce399 100644 --- a/jenkins/jobs/horizon.yaml +++ b/jenkins/jobs/horizon.yaml @@ -82,3 +82,33 @@ publishers: - console-log + +- job: + name: gate-horizon-dsvm-tempest-plugin + node: ubuntu-trusty + + wrappers: + - build-timeout: + timeout: 100 + - timestamps + + builders: + - link-logs + - net-info + - devstack-checkout + - firefox-install + - xvfb-install + - shell: | + #!/bin/bash -xe + export PYTHONUNBUFFERED=true + export DEVSTACK_GATE_INSTALL_TESTONLY=1 + export DEVSTACK_GATE_TEMPEST=1 + export DEVSTACK_GATE_TEMPEST_NOTESTS=1 + export PROJECTS="openstack/tempest-horizon $PROJECTS" + + cp devstack-gate/devstack-vm-gate-wrap.sh ./safe-devstack-vm-gate-wrap.sh + ./safe-devstack-vm-gate-wrap.sh + + publishers: + - devstack-logs + - console-log diff --git a/jenkins/jobs/projects.yaml b/jenkins/jobs/projects.yaml index a1cba4522a..1e7dda6261 100644 --- a/jenkins/jobs/projects.yaml +++ b/jenkins/jobs/projects.yaml @@ -8703,6 +8703,16 @@ - openstack-releasenotes-jobs - pypi-jobs +- project: + name: tempest-horizon + tarball-site: tarballs.openstack.org + doc-publisher-site: docs.openstack.org + + jobs: + - python-jobs + - openstack-publish-jobs + - pypi-jobs + - project: name: tempest-lib tarball-site: tarballs.openstack.org diff --git a/zuul/layout.yaml b/zuul/layout.yaml index caa68d6ccb..1b68d11060 100755 --- a/zuul/layout.yaml +++ b/zuul/layout.yaml @@ -2344,6 +2344,10 @@ jobs: - name: gate-horizon-tox-py27dj19 branch: ^(?!stable/(kilo|liberty|mitaka)).*$ + - name: gate-horizon-dsvm-tempest-plugin + branch: ^(?!stable/(kilo|liberty|mitaka)).*$ + voting: false + - name: gate-django_openstack_auth-tox-py27dj18 branch: ^(?!stable/(kilo|liberty)).*$ @@ -6644,6 +6648,7 @@ projects: - gate-horizon-selenium-headless - gate-tempest-dsvm-full - gate-grenade-dsvm + - gate-horizon-dsvm-tempest-plugin gate: - gate-horizon-tox-py27dj18 - gate-horizon-tox-py27dj19 @@ -11561,6 +11566,16 @@ projects: - periodic-tempest-dsvm-stress-master - periodic-tempest-dsvm-neutron-identity-v3-only-full-master + - name: openstack/tempest-horizon + template: + - name: merge-check + - name: check-requirements + - name: publish-to-pypi + check: + - gate-horizon-dsvm-tempest-plugin + gate: + - gate-horizon-dsvm-tempest-plugin + - name: openstack/tempest-lib template: - name: merge-check