From c0e63d977fc077be55a02106403840165b89a349 Mon Sep 17 00:00:00 2001
From: Brian Rosmaita <rosmaita.fossdev@gmail.com>
Date: Sun, 3 Dec 2017 23:24:27 -0500
Subject: Migrate dsvm functional test jobs to project repo

Migrate legacy dsvm functional test jobs for python-glanceclient
to the project repository as zuul3 jobs using the devstack
functional base job.

Co-authored-by: Monty Taylor <mordred@inaugust.com>
Co-authored-by: Brian Rosmaita <rosmaita.fossdev@gmail.com>

Needed-By: I0b974bf60da6bafabeb037a75ac10654e2a6406c
Needed-By: I0271a1430843ef546e991a7a3c4b572b3e404963
Depends-On: I84de60181cb88574e341ff83cd4857cce241f2dd
Change-Id: I1977ee0d348645987107c2efb5b454d7f8b81adf
---
 .zuul.yaml                                         | 50 ++++++++++++++++++++++
 .../tests/functional/hooks/post_test_hook.sh       | 46 --------------------
 2 files changed, 50 insertions(+), 46 deletions(-)
 create mode 100644 .zuul.yaml
 delete mode 100755 glanceclient/tests/functional/hooks/post_test_hook.sh

diff --git a/.zuul.yaml b/.zuul.yaml
new file mode 100644
index 0000000..bd537dc
--- /dev/null
+++ b/.zuul.yaml
@@ -0,0 +1,50 @@
+- job:
+    name: glanceclient-dsvm-functional
+    parent: devstack-tox-functional
+    description: |
+      devstack-based functional tests for glanceclient
+    required-projects:
+      - openstack/python-glanceclient
+    timeout: 4200
+    vars:
+      devstack_localrc:
+        # TODO(rosmaita): remove when glanceclient tests no longer
+        #   use the Images v1 API
+        GLANCE_V1_ENABLED: True
+        LIBS_FROM_GIT: python-glanceclient
+      devstack_services:
+        # turn off ceilometer
+        ceilometer-acentral: false
+        ceilometer-acompute: false
+        ceilometer-alarm-evaluator: false
+        ceilometer-alarm-notifier: false
+        ceilometer-anotification: false
+        ceilometer-api: false
+        ceilometer-collector: false
+        # turn on swift
+        s-account: true
+        s-container: true
+        s-object: true
+        s-proxy: true
+        # TODO(rosmaita): restore ssl
+        tls-proxy: false
+      # Hardcode glanceclient path so the job can be run on glance patches
+      zuul_work_dir: src/git.openstack.org/openstack/python-glanceclient
+
+- job:
+    name: glanceclient-dsvm-functional-identity-v3-only
+    parent: glanceclient-dsvm-functional
+    vars:
+      devstack_localrc:
+        ENABLE_IDENTITY_V2: False
+
+- project:
+    name: openstack/python-glanceclient
+    check:
+      jobs:
+        - glanceclient-dsvm-functional
+        - glanceclient-dsvm-functional-identity-v3-only:
+            voting: false
+    gate:
+      jobs:
+        - glanceclient-dsvm-functional
diff --git a/glanceclient/tests/functional/hooks/post_test_hook.sh b/glanceclient/tests/functional/hooks/post_test_hook.sh
deleted file mode 100755
index e0c2de0..0000000
--- a/glanceclient/tests/functional/hooks/post_test_hook.sh
+++ /dev/null
@@ -1,46 +0,0 @@
-#!/bin/bash -xe
-
-# Licensed under the Apache License, Version 2.0 (the "License"); you may
-# not use this file except in compliance with the License. You may obtain
-# a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
-# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
-# License for the specific language governing permissions and limitations
-# under the License.
-
-# This script is executed inside post_test_hook function in devstack gate.
-
-function generate_testr_results {
-    if [ -f .testrepository/0 ]; then
-        sudo .tox/functional/bin/testr last --subunit > $WORKSPACE/testrepository.subunit
-        sudo mv $WORKSPACE/testrepository.subunit $BASE/logs/testrepository.subunit
-        sudo /usr/os-testr-env/bin/subunit2html $BASE/logs/testrepository.subunit $BASE/logs/testr_results.html
-        sudo gzip -9 $BASE/logs/testrepository.subunit
-        sudo gzip -9 $BASE/logs/testr_results.html
-        sudo chown jenkins:jenkins $BASE/logs/testrepository.subunit.gz $BASE/logs/testr_results.html.gz
-        sudo chmod a+r $BASE/logs/testrepository.subunit.gz $BASE/logs/testr_results.html.gz
-    fi
-}
-
-export GLANCECLIENT_DIR="$BASE/new/python-glanceclient"
-
-sudo chown -R jenkins:stack $GLANCECLIENT_DIR
-
-# Go to the glanceclient dir
-cd $GLANCECLIENT_DIR
-
-# Run tests
-echo "Running glanceclient functional test suite"
-set +e
-# Preserve env for OS_ credentials
-sudo -E -H -u jenkins tox -efunctional
-EXIT_CODE=$?
-set -e
-
-# Collect and parse result
-generate_testr_results
-exit $EXIT_CODE
-- 
cgit v1.2.1