From bc77ac247529b60de288415df0408ee813fe14ab Mon Sep 17 00:00:00 2001
From: Nguyen Hai <nguyentrihai93@gmail.com>
Date: Fri, 24 Aug 2018 16:38:43 +0900
Subject: import zuul job settings from project-config

This is a mechanically generated patch to complete step 1 of moving
the zuul job settings out of project-config and into each project
repository.

Because there will be a separate patch on each branch, the branch
specifiers for branch-specific jobs have been removed.

Because this patch is generated by a script, there may be some
cosmetic changes to the layout of the YAML file(s) as the contents are
normalized.

See the python3-first goal document for details:
https://governance.openstack.org/tc/goals/stein/python3-first.html

Change-Id: Iad080827488c1938eacd620238cf53c1318fcc62
Story: #2002586
Task: #24337
---
 .zuul.yaml            | 26 ++++++++++++++++++++++++++
 test-requirements.txt |  2 ++
 tools/tox_install.sh  | 31 -------------------------------
 tox.ini               |  8 +++-----
 4 files changed, 31 insertions(+), 36 deletions(-)
 create mode 100644 .zuul.yaml
 delete mode 100755 tools/tox_install.sh

diff --git a/.zuul.yaml b/.zuul.yaml
new file mode 100644
index 0000000..2d001c1
--- /dev/null
+++ b/.zuul.yaml
@@ -0,0 +1,26 @@
+- project:
+    templates:
+      - openstack-python-jobs
+      - openstack-python35-jobs
+      - publish-openstack-sphinx-docs
+      - check-requirements
+      - openstack-pypy-jobs-nonvoting
+      - lib-forward-testing
+      - release-notes-jobs
+    check:
+      jobs:
+        - legacy-swift-dsvm-functional
+        - legacy-swift-dsvm-functional-identity-v3-only:
+            voting: false
+        - legacy-swiftclient-dsvm-functional
+        - legacy-swiftclient-dsvm-functional-identity-v3-only:
+            voting: false
+        - openstack-tox-py36:
+            voting: false
+    gate:
+      jobs:
+        - legacy-swift-dsvm-functional
+        - legacy-swiftclient-dsvm-functional
+    post:
+      jobs:
+        - openstack-tox-cover
diff --git a/test-requirements.txt b/test-requirements.txt
index 0ce9cec..1743a8c 100644
--- a/test-requirements.txt
+++ b/test-requirements.txt
@@ -5,3 +5,5 @@ mock>=1.2
 oslosphinx>=4.7.0  # Apache-2.0
 sphinx>=1.1.2,<1.2
 testrepository>=0.0.18
+keystoneauth1>=3.1.0 # Apache-2.0
+python-keystoneclient>=3.8.0 # Apache-2.0
\ No newline at end of file
diff --git a/tools/tox_install.sh b/tools/tox_install.sh
deleted file mode 100755
index 15aa9de..0000000
--- a/tools/tox_install.sh
+++ /dev/null
@@ -1,31 +0,0 @@
-#!/usr/bin/env bash
-
-# Client constraint file contains this client version pin that is in conflict
-# with installing the client from source. We should remove the version pin in
-# the constraints file before applying it for from-source installation.
-
-set -e
-
-if [[ -z "$CONSTRAINTS_FILE" ]]; then
-    echo 'WARNING: expected $CONSTRAINTS_FILE to be set' >&2
-    PIP_FLAGS=(-U)
-else
-    # NOTE(tonyb): Place this in the tox enviroment's log dir so it will get
-    # published to logs.openstack.org for easy debugging.
-    localfile="$VIRTUAL_ENV/log/upper-constraints.txt"
-
-    if [[ "$CONSTRAINTS_FILE" != http* ]]; then
-        CONSTRAINTS_FILE="file://$CONSTRAINTS_FILE"
-    fi
-    curl "$CONSTRAINTS_FILE" --insecure --progress-bar --output "$localfile"
-
-    pip install -c"$localfile" openstack-requirements
-
-    # This is the main purpose of the script: Allow local installation of
-    # the current repo. It is listed in constraints file and thus any
-    # install will be constrained and we need to unconstrain it.
-    edit-constraints "$localfile" -- "$CLIENT_NAME"
-    PIP_FLAGS=(-c"$localfile" -U)
-fi
-
-pip install "${PIP_FLAGS[@]}" "$@"
diff --git a/tox.ini b/tox.ini
index 638e97b..e107f1d 100644
--- a/tox.ini
+++ b/tox.ini
@@ -5,17 +5,15 @@ skipsdist = True
 
 [testenv]
 usedevelop = True
-install_command = {toxinidir}/tools/tox_install.sh {opts} {packages}
+install_command = pip install {opts} {packages}
 setenv =
   LANG=en_US.utf8
   VIRTUAL_ENV={envdir}
   BRANCH_NAME=master
   CLIENT_NAME=python-swiftclient
-  CONSTRAINTS_FILE={env:UPPER_CONSTRAINTS_FILE:https://git.openstack.org/cgit/openstack/requirements/plain/upper-constraints.txt?h=stable/pike}
-
-deps = -r{toxinidir}/requirements.txt
+deps = -c{env:UPPER_CONSTRAINTS_FILE:https://git.openstack.org/cgit/openstack/requirements/plain/upper-constraints.txt?h=stable/pike}
+       -r{toxinidir}/requirements.txt
        -r{toxinidir}/test-requirements.txt
-       .[keystone]
 commands = sh -c '(find . -not \( -type d -name .?\* -prune \) \
            \( -type d -name "__pycache__" -or -type f -name "*.py[co]" \) \
            -print0; find . -name "*.dbm*" -print0) | xargs -0 rm -rf'
-- 
cgit v1.2.1