From 6a026e72b4e4554d8aae7612f6a5034f5e40e060 Mon Sep 17 00:00:00 2001
From: Goutham Pacha Ravi <gouthampravi@gmail.com>
Date: Thu, 23 Jul 2020 22:32:18 -0700
Subject: [PATCH] Native Zuulv3 container scenario test job

Replace the "manila-tempest-dsvm-container-scenario-custom-image"
job with a native Zuulv3 style job that does not use
the deprecated devstack-gate project. This new test
job runs backend tests at the moment with the container
driver. Scenario tests that include mounting shares to
tenant VMs aren't yet enabled, and doing so is a TODO
item for the future.

Change-Id: I65379ffcf06e9de111d69cd3b5bc4acc7af0547e
Signed-off-by: Goutham Pacha Ravi <gouthampravi@gmail.com>
---
 zuul.d/manila-image-elements-jobs.yaml | 19 +++++++++++++++++++
 zuul.d/project.yaml                    |  2 +-
 2 files changed, 20 insertions(+), 1 deletion(-)

diff --git a/zuul.d/manila-image-elements-jobs.yaml b/zuul.d/manila-image-elements-jobs.yaml
index 7cab41a..fd9c49b 100644
--- a/zuul.d/manila-image-elements-jobs.yaml
+++ b/zuul.d/manila-image-elements-jobs.yaml
@@ -31,6 +31,25 @@
     run: playbooks/manila-buildimages/run.yaml
     post-run: playbooks/manila-publish-artifacts/post.yaml
 
+- job:
+    name: manila-image-elements-container-scenario
+    parent: manila-tempest-plugin-container
+    pre-run: playbooks/manila-buildimage-docker/run.yaml
+    required-projects:
+      - openstack/manila-image-elements
+      - openstack/manila
+      - openstack/manila-tempest-plugin
+      - openstack/python-manilaclient
+      - openstack/tempest
+    vars:
+      # NOTE(gouthamr): Not running scenario tests yet, need to test them
+      # against the container driver first
+      tempest_test_regex: '(^manila_tempest_tests.tests)(?=.*\[.*\bbackend\b.*\])'
+      devstack_localrc:
+        # "docker build" uploads the image we need to the local registry
+        # manila's devstack plugin just needs the name of the image to look up
+        MANILA_DOCKER_IMAGE_URL: "file:///home/zuul/src/opendev.org/openstack/manila-image-elements/manila-docker-container.tar.gz"
+
 - job:
     name: manila-image-elements-generic-scenario
     parent: manila-tempest-plugin-generic
diff --git a/zuul.d/project.yaml b/zuul.d/project.yaml
index e2f9299..bb4267e 100644
--- a/zuul.d/project.yaml
+++ b/zuul.d/project.yaml
@@ -8,7 +8,7 @@
         - openstack-tox-pep8
         - manila-image-elements-buildimages
         - manila-image-elements-buildimage-docker
-        - manila-tempest-dsvm-container-scenario-custom-image:
+        - manila-image-elements-container-scenario:
             voting: false
             irrelevant-files: &irrelevant-files
               - ^(test-|)requirements.txt$