From 8ae5715b0e638851c3244196ec977c72ab1ceb99 Mon Sep 17 00:00:00 2001
From: Carlos Goncalves <cgoncalves@redhat.com>
Date: Sat, 4 Aug 2018 11:11:08 +0200
Subject: [PATCH] Temporarily remove octavia-v2-dsvm-scenario-ubuntu.bionic

The job definition of octavia-v2-dsvm-scenario-ubuntu.bionic has to be
moved over to octavia-tempest-plugin. Follow-up change
I7d2d8223e0b876257dd6a639fc92cbb11f0d6338 will re-define it and change
Iafd31337fed62affc4125e0e1eea0179db5f776d will re-enable the job
execution.

Change-Id: Iaecb484b7eee6e24e85df38a73d4f1f522e2204c
---
 zuul.d/jobs.yaml     | 8 --------
 zuul.d/projects.yaml | 2 --
 2 files changed, 10 deletions(-)

diff --git a/zuul.d/jobs.yaml b/zuul.d/jobs.yaml
index 3ca88f67af..e9d76c8b13 100644
--- a/zuul.d/jobs.yaml
+++ b/zuul.d/jobs.yaml
@@ -51,14 +51,6 @@
     run: playbooks/legacy/octavia-v1-dsvm-py3x-scenario/run.yaml
     post-run: playbooks/legacy/octavia-v1-dsvm-py3x-scenario/post.yaml
 
-- job:
-    name: octavia-v2-dsvm-scenario-ubuntu.bionic
-    parent: octavia-v2-dsvm-scenario
-    vars:
-      devstack_localrc:
-        OCTAVIA_AMP_BASE_OS: ubuntu
-        OCTAVIA_AMP_DISTRIBUTION_RELEASE_ID: bionic
-
 - job:
     name: octavia-v1-dsvm-scenario-multinode
     parent: octavia-legacy-dsvm-base-multinode
diff --git a/zuul.d/projects.yaml b/zuul.d/projects.yaml
index 7f74692134..a6e8c3eaa5 100644
--- a/zuul.d/projects.yaml
+++ b/zuul.d/projects.yaml
@@ -37,8 +37,6 @@
             voting: false
         - octavia-v1-dsvm-scenario-kvm-centos.7:
             voting: false
-        - octavia-v2-dsvm-scenario-ubuntu.bionic:
-            voting: false
         - octavia-v2-dsvm-noop-api:
             voting: false
         - octavia-v2-dsvm-noop-py35-api: