diff --git a/grafana/horizon.yaml b/grafana/horizon.yaml index 1cc6f73158..e108b82e9f 100644 --- a/grafana/horizon.yaml +++ b/grafana/horizon.yaml @@ -13,18 +13,6 @@ dashboard: - title: Graphs height: 320px panels: - - title: Integrated Failure Rates (Check queue) - span: 4 - targets: - - target: alias(movingAverage(asPercent(transformNull(stats_counts.zuul.pipeline.check.job.gate-horizon-dsvm-integration-current{,-ubuntu-trusty,-ubuntu-xenial}.FAILURE),sum(stats_counts.zuul.pipeline.check.job.gate-horizon-dsvm-integration-current{,-ubuntu-trusty,-ubuntu-xenial}.{SUCCESS,FAILURE})),'24hours'), 'dsvm-integration-current') - - target: alias(movingAverage(asPercent(transformNull(stats_counts.zuul.pipeline.check.job.gate-horizon-dsvm-integration-deprecated{,-ubuntu-trusty,-ubuntu-xenial}.FAILURE),sum(stats_counts.zuul.pipeline.check.job.gate-horizon-dsvm-integration-deprecated{,-ubuntu-trusty,-ubuntu-xenial}.{SUCCESS,FAILURE})),'24hours'), 'dsvm-integration-deprecated') - type: graph - - title: Integrated Failure Rates (Gate queue) - span: 4 - targets: - - target: alias(movingAverage(asPercent(transformNull(stats_counts.zuul.pipeline.gate.job.gate-horizon-dsvm-integration-current{,-ubuntu-trusty,-ubuntu-xenial}.FAILURE),sum(stats_counts.zuul.pipeline.gate.job.gate-horizon-dsvm-integration-current{,-ubuntu-trusty,-ubuntu-xenial}.{SUCCESS,FAILURE})),'24hours'), 'dsvm-integration-current') - - target: alias(movingAverage(asPercent(transformNull(stats_counts.zuul.pipeline.gate.job.gate-horizon-dsvm-integration-deprecated{,-ubuntu-trusty,-ubuntu-xenial}.FAILURE),sum(stats_counts.zuul.pipeline.gate.job.gate-horizon-dsvm-integration-deprecated{,-ubuntu-trusty,-ubuntu-xenial}.{SUCCESS,FAILURE})),'24hours'), 'dsvm-integration-deprecated') - type: graph - title: npm test Failure Rates (Gate queue) span: 4 targets: diff --git a/jenkins/jobs/horizon.yaml b/jenkins/jobs/horizon.yaml index fa932417cc..6d11645c3f 100644 --- a/jenkins/jobs/horizon.yaml +++ b/jenkins/jobs/horizon.yaml @@ -1,71 +1,3 @@ -- job-template: - name: 'gate-horizon-dsvm-integration-{testtype}-{node}' - node: '{node}' - - wrappers: - - build-timeout: - timeout: 150 - - timestamps - - builders: - - link-logs - - net-info - - devstack-checkout - - firefox-install - - xvfb-install - - shell: | - #!/bin/bash -xe - export PYTHONUNBUFFERED=true - export DEVSTACK_GATE_TEMPEST=0 - export DEVSTACK_GATE_EXERCISES=0 - export DEVSTACK_GATE_INSTALL_TESTONLY=1 - export DEVSTACK_GATE_NEUTRON=1 - export DEVSTACK_GATE_SETTINGS=/opt/stack/new/horizon/tools/gate/integration/devstack_gate_rc - - function pre_test_hook {{ - /opt/stack/new/horizon/tools/gate/integration/pre_test_hook.sh '{testtype}' - }} - export -f pre_test_hook - - function post_test_hook {{ - /opt/stack/new/horizon/tools/gate/integration/post_test_hook.sh '{testtype}' - }} - export -f post_test_hook - - cp devstack-gate/devstack-vm-gate-wrap.sh ./safe-devstack-vm-gate-wrap.sh - ./safe-devstack-vm-gate-wrap.sh - - publishers: - - test-results - - devstack-logs - - publish-test-reports - - console-log - -- publisher: - name: publish-test-reports - publishers: - - scp: - site: 'static.openstack.org' - files: - - target: 'logs/$LOG_PATH' - source: 'test_reports/**' - keep-hierarchy: true - copy-after-failure: true - -- job-group: - name: 'horizon-dsvm-integration-jobs' - jobs: - - 'gate-horizon-dsvm-integration-{testtype}-{node}': - testtype: 'current' - node: - - ubuntu-trusty - - ubuntu-xenial - - 'gate-horizon-dsvm-integration-{testtype}-{node}': - testtype: 'deprecated' - node: - - ubuntu-trusty - - ubuntu-xenial - - job-template: name: gate-horizon-selenium-headless-{node} node: '{node}' diff --git a/jenkins/jobs/projects.yaml b/jenkins/jobs/projects.yaml index 860621781c..0154da8eae 100644 --- a/jenkins/jobs/projects.yaml +++ b/jenkins/jobs/projects.yaml @@ -5479,7 +5479,6 @@ - translation-jobs-mitaka - translation-jobs-newton - nodejs4-jobs - - horizon-dsvm-integration-jobs - 'gate-{name}-tox-{envlist}-{node}': envlist: - py27dj19 diff --git a/zuul/layout.yaml b/zuul/layout.yaml index 215574cdea..03fd2e4b72 100755 --- a/zuul/layout.yaml +++ b/zuul/layout.yaml @@ -1515,7 +1515,7 @@ jobs: # Skip non-doc jobs for doc-only or translation-only horizon # changes. Since doc/source/* is checked by horizon-pep8, this job # should not be skipped. - - name: ^.*horizon-(python(27|34|35)|tox-py27dj.*|nodejs4-npm-run-.*|selenium-headless|dsvm-integration.*|dsvm-tempest-plugin)(-ubuntu-.*)?(-nv)?$ + - name: ^.*horizon-(python(27|34|35)|tox-py27dj.*|nodejs4-npm-run-.*|selenium-headless|dsvm-tempest-plugin)(-ubuntu-.*)?(-nv)?$ skip-if: - project: ^openstack/horizon$ all-files-match-any: @@ -2918,14 +2918,6 @@ jobs: - name: ^gate-django_openstack_auth-tox-py27dj19-ubuntu-trusty$ branch: ^stable/mitaka.*$ - # TODO(robcresswell): Make voting once tests are passing reliably - - name: gate-horizon-dsvm-integration-current-ubuntu-xenial - voting: false - - # TODO(robcresswell): Make voting once tests are passing reliably - - name: gate-horizon-dsvm-integration-deprecated-ubuntu-xenial - voting: false - # TODO(doug-fish): Make voting once tests are proven to pass reliably - name: gate-neutron-lbaas-dashboard-nodejs4-npm-run-lint voting: false @@ -2950,11 +2942,6 @@ jobs: - name: gate-zaqar-ui-nodejs4-npm-run-test voting: false - # TODO(jhesketh): Make voting once tests are passing reliably - - name: ^gate-horizon-dsvm-integration-.*-ubuntu-trusty - branch: ^(stable/mitaka).*$ - voting: false - - name: ^gate-horizon-selenium-headless-legacy-ubuntu-trusty branch: ^(stable/mitaka).*$ @@ -10292,10 +10279,6 @@ projects: - gate-horizon-selenium-headless-ubuntu-xenial - gate-horizon-dsvm-tempest-plugin-ubuntu-trusty - gate-horizon-dsvm-tempest-plugin-ubuntu-xenial - - gate-horizon-dsvm-integration-current-ubuntu-trusty - - gate-horizon-dsvm-integration-current-ubuntu-xenial - - gate-horizon-dsvm-integration-deprecated-ubuntu-trusty - - gate-horizon-dsvm-integration-deprecated-ubuntu-xenial gate: - gate-horizon-tox-py27dj19-ubuntu-xenial - gate-horizon-tox-py27dj110-ubuntu-xenial