From a8cc712ce3b4305018fd0e7bb96461483ac547e6 Mon Sep 17 00:00:00 2001 From: Michael Johnson Date: Wed, 20 Sep 2017 18:26:00 -0700 Subject: [PATCH] Remove Octavia dashboard projects integration jobs This patch removes the neutron-lbaas-dashboard and octavia-dashboard integration jobs as the Horizon team is no longer recommending them. They were always non-voting jobs in the Octavia projects. Change-Id: Ifb60ff6ebfa8d88771df35b29406ae8c4e971a83 --- jenkins/jobs/neutron-lbaas.yaml | 89 --------------------------------- jenkins/jobs/octavia.yaml | 89 --------------------------------- jenkins/jobs/projects.yaml | 12 ----- zuul/layout.yaml | 8 --- 4 files changed, 198 deletions(-) diff --git a/jenkins/jobs/neutron-lbaas.yaml b/jenkins/jobs/neutron-lbaas.yaml index 6e8c7ff391..01efc879d6 100644 --- a/jenkins/jobs/neutron-lbaas.yaml +++ b/jenkins/jobs/neutron-lbaas.yaml @@ -100,92 +100,3 @@ publishers: - devstack-logs - console-log - -- job-template: - name: gate-neutron-lbaas-dashboard-dsvm-integration-{node}{suffix} - node: '{node}' - - wrappers: - - build-timeout: - timeout: 60 - - 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 PROJECTS="openstack/neutron-lbaas-dashboard $PROJECTS" - - - function pre_test_hook {{ - $BASE/new/neutron-lbaas-dashboard/tools/gate/integration/pre_test_hook.sh - }} - export -f pre_test_hook - - function post_test_hook {{ - $BASE/new/neutron-lbaas-dashboard/tools/gate/integration/post_test_hook.sh - }} - 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-screenshots - - console-log - -- job-template: - name: gate-neutron-lbaas-dashboard-dsvm-py3x-integration-{node}{suffix} - node: '{node}' - - wrappers: - - build-timeout: - timeout: 60 - - timestamps - - builders: - - link-logs - - net-info - - devstack-checkout - - firefox-install - - xvfb-install - - shell: | - #!/bin/bash -xe - export DEVSTACK_GATE_USE_PYTHON3=True - 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 PROJECTS="openstack/neutron-lbaas-dashboard $PROJECTS" - - - function pre_test_hook {{ - $BASE/new/neutron-lbaas-dashboard/tools/gate/integration/pre_test_hook.sh - }} - export -f pre_test_hook - - function post_test_hook {{ - $BASE/new/neutron-lbaas-dashboard/tools/gate/integration/post_test_hook.sh - }} - 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-screenshots - - console-log diff --git a/jenkins/jobs/octavia.yaml b/jenkins/jobs/octavia.yaml index 3f594f652b..be07cd979f 100644 --- a/jenkins/jobs/octavia.yaml +++ b/jenkins/jobs/octavia.yaml @@ -350,92 +350,3 @@ publishers: - devstack-logs - console-log - -- job-template: - name: gate-octavia-dashboard-dsvm-integration-{node}{suffix} - node: '{node}' - - wrappers: - - build-timeout: - timeout: 60 - - 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 PROJECTS="openstack/octavia-dashboard $PROJECTS" - - - function pre_test_hook {{ - $BASE/new/octavia-dashboard/tools/gate/integration/pre_test_hook.sh - }} - export -f pre_test_hook - - function post_test_hook {{ - $BASE/new/octavia-dashboard/tools/gate/integration/post_test_hook.sh - }} - 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-screenshots - - console-log - -- job-template: - name: gate-octavia-dashboard-dsvm-py3x-integration-{node}{suffix} - node: '{node}' - - wrappers: - - build-timeout: - timeout: 60 - - timestamps - - builders: - - link-logs - - net-info - - devstack-checkout - - firefox-install - - xvfb-install - - shell: | - #!/bin/bash -xe - export DEVSTACK_GATE_USE_PYTHON3=True - 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 PROJECTS="openstack/octavia-dashboard $PROJECTS" - - - function pre_test_hook {{ - $BASE/new/octavia-dashboard/tools/gate/integration/pre_test_hook.sh - }} - export -f pre_test_hook - - function post_test_hook {{ - $BASE/new/octavia-dashboard/tools/gate/integration/post_test_hook.sh - }} - 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-screenshots - - console-log diff --git a/jenkins/jobs/projects.yaml b/jenkins/jobs/projects.yaml index 68838aa855..cbfbbd97fe 100644 --- a/jenkins/jobs/projects.yaml +++ b/jenkins/jobs/projects.yaml @@ -6571,12 +6571,6 @@ - translation-jobs - translation-jobs-ocata - translation-jobs-pike - - gate-neutron-lbaas-dashboard-dsvm-integration-{node}{suffix}: - node: ubuntu-xenial - suffix: '-nv' - - gate-neutron-lbaas-dashboard-dsvm-py3x-integration-{node}{suffix}: - node: ubuntu-xenial - suffix: '-nv' - project: name: neutron-lib @@ -6920,12 +6914,6 @@ - nodejs4-jobs - pypi-jobs - translation-jobs - - gate-octavia-dashboard-dsvm-integration-{node}{suffix}: - node: ubuntu-xenial - suffix: '-nv' - - gate-octavia-dashboard-dsvm-py3x-integration-{node}{suffix}: - node: ubuntu-xenial - suffix: '-nv' - project: name: octavia-tempest-plugin diff --git a/zuul/layout.yaml b/zuul/layout.yaml index 6cae3a10c9..3c79146d75 100755 --- a/zuul/layout.yaml +++ b/zuul/layout.yaml @@ -2334,10 +2334,6 @@ jobs: - name: ^gate-neutron-lbaasv2-dsvm-py3x-.*$ branch: ^(?!stable) - # This job is just to check Python 3.X compliance in master for NLBaaSv2 dashboard - - name: ^gate-neutron-lbaas-dashboard-dsvm-py3x-.*$ - branch: ^(?!stable) - # stable/newton octavia does not have multinode gate support - name: ^gate-octavia-v1-dsvm-.*-multinode$ branch: ^(?!stable/newton).*$ @@ -12852,8 +12848,6 @@ projects: check: - gate-neutron-lbaas-dashboard-nodejs4-npm-run-lint - gate-neutron-lbaas-dashboard-nodejs4-npm-run-test - - gate-neutron-lbaas-dashboard-dsvm-integration-ubuntu-xenial-nv - - gate-neutron-lbaas-dashboard-dsvm-py3x-integration-ubuntu-xenial-nv gate: - gate-neutron-lbaas-dashboard-nodejs4-npm-run-lint - gate-neutron-lbaas-dashboard-nodejs4-npm-run-test @@ -13174,8 +13168,6 @@ projects: check: - gate-octavia-dashboard-nodejs4-npm-run-lint - gate-octavia-dashboard-nodejs4-npm-run-test - - gate-octavia-dashboard-dsvm-integration-ubuntu-xenial-nv - - gate-octavia-dashboard-dsvm-py3x-integration-ubuntu-xenial-nv gate: - gate-octavia-dashboard-nodejs4-npm-run-lint - gate-octavia-dashboard-nodejs4-npm-run-test