From cfffce262e191d47678a53861eede241eafa048e Mon Sep 17 00:00:00 2001
From: Steve Martinelli <s.martinelli@gmail.com>
Date: Wed, 11 Jan 2017 12:05:09 -0500
Subject: [PATCH] add functional test for osc that uses master libraries

OpenStackClient uses a lot of other openstack libraries, we need
a job that installs these from master and is non-voting so we
can catch failures before they are out in the wild.

Related Patch: Ib6391893b2302bdc514525d5ddda886fe8c60100

The related patch is for adding the underlying structure to
openstackclient, I did not add a Depends-On since the job is
non-voting.

Change-Id: I557955621a66a4746a5923915d13f5d8078bd0e6
---
 jenkins/jobs/osc.yaml      | 51 ++++++++++++++++++++++++++++++++++++++
 jenkins/jobs/projects.yaml |  5 ++++
 zuul/layout.yaml           |  1 +
 3 files changed, 57 insertions(+)

diff --git a/jenkins/jobs/osc.yaml b/jenkins/jobs/osc.yaml
index 34b7ad9c30..3d94841b35 100644
--- a/jenkins/jobs/osc.yaml
+++ b/jenkins/jobs/osc.yaml
@@ -49,6 +49,57 @@
       - devstack-logs
       - console-log
 
+- job-template:
+    name: '{pipeline}-osc-dsvm-functional-tips-{node}{suffix}'
+    node: '{node}'
+
+    wrappers:
+      - build-timeout:
+          timeout: 130
+      - timestamps
+
+    builders:
+      - link-logs
+      - net-info
+      - devstack-checkout
+      - shell: |
+          #!/bin/bash -xe
+          export PYTHONUNBUFFERED=true
+          export DEVSTACK_GATE_UNSTACK=0
+          export DEVSTACK_GATE_TEMPEST=0
+          export DEVSTACK_GATE_EXERCISES=0
+          export DEVSTACK_GATE_INSTALL_TESTONLY=1
+          export DEVSTACK_GATE_NEUTRON=1
+          export BRANCH_OVERRIDE={branch-override}
+          export PROJECTS="openstack/os-client-config $PROJECTS"
+          export PROJECTS="openstack/osc-lib $PROJECTS"
+          export PROJECTS="openstack/python-openstackclient $PROJECTS"
+          export PROJECTS="openstack/python-openstacksdk $PROJECTS"
+          export DEVSTACK_PROJECT_FROM_GIT=python-openstackclient
+          if [ "$BRANCH_OVERRIDE" != "default" ] ; then
+              export OVERRIDE_ZUUL_BRANCH=$BRANCH_OVERRIDE
+          fi
+          export DEVSTACK_LOCAL_CONFIG="enable_plugin neutron https://git.openstack.org/openstack/neutron"
+          export ENABLED_SERVICES=q-qos
+
+          function post_test_hook {{
+              # This test hook will install the master version of the following:
+              # - osc-lib
+              # - openstacksdk
+              # - os-client-config
+              hook_location=$BASE/new/python-openstackclient/openstackclient/tests/functional/post_test_hook_tips.sh
+              bash -xe $hook_location
+          }}
+          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
+      - console-log
+
 - job:
     name: check-osc-plugins
     node: ubuntu-trusty
diff --git a/jenkins/jobs/projects.yaml b/jenkins/jobs/projects.yaml
index 9657dfbf2f..751a783f10 100644
--- a/jenkins/jobs/projects.yaml
+++ b/jenkins/jobs/projects.yaml
@@ -12267,6 +12267,11 @@
             - ubuntu-xenial
           suffix: ''
           branch-override: default
+      - '{pipeline}-osc-dsvm-functional-tips-{node}{suffix}':
+          pipeline: gate
+          suffix: '-nv'
+          branch-override: default
+          node: ubuntu-xenial
       - openstack-client-publish-jobs
       - openstack-releasenotes-jobs
       - pypi-jobs
diff --git a/zuul/layout.yaml b/zuul/layout.yaml
index 891665062c..8168a092f5 100755
--- a/zuul/layout.yaml
+++ b/zuul/layout.yaml
@@ -15720,6 +15720,7 @@ projects:
     check:
       - gate-osc-dsvm-functional-ubuntu-trusty
       - gate-osc-dsvm-functional-ubuntu-xenial
+      - gate-osc-dsvm-functional-tips-ubuntu-xenial-nv
       - gate-tripleo-ci-centos-7-nonha-multinode-nv
     gate:
       - gate-osc-dsvm-functional-ubuntu-trusty