summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDoug Hellmann <doug@doughellmann.com>2018-09-09 06:00:52 -0400
committerNguyen Hai <nguyentrihai93@gmail.com>2018-09-14 13:54:10 +0000
commitb10b8170cd21f9fd40a4a85fc26075a2737fbe31 (patch)
tree7dfbc1dc7059fab833c0ac6fce9381fdaf759c8c
parent97dd5908f80ab7bb4b2e36c8bbf0c37739938439 (diff)
downloadpython-troveclient-2.12.1.tar.gz
import zuul job settings from project-configpike-em2.12.1
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: Ia95d44ff8d2b3666dff846a05b6cf1b03fb54428 Story: #2002586 Task: #24342
-rw-r--r--.zuul.yaml15
-rwxr-xr-xtools/tox_install.sh55
-rw-r--r--tox.ini7
3 files changed, 18 insertions, 59 deletions
diff --git a/.zuul.yaml b/.zuul.yaml
new file mode 100644
index 0000000..753791d
--- /dev/null
+++ b/.zuul.yaml
@@ -0,0 +1,15 @@
+- project:
+ templates:
+ - check-requirements
+ - publish-openstack-sphinx-docs
+ - openstack-python-jobs
+ - openstack-python35-jobs
+ - release-notes-jobs
+ - openstackclient-plugin-jobs
+ check:
+ jobs:
+ - trove-functional-mysql
+ gate:
+ queue: trove
+ jobs:
+ - trove-functional-mysql
diff --git a/tools/tox_install.sh b/tools/tox_install.sh
deleted file mode 100755
index 1a3164c..0000000
--- a/tools/tox_install.sh
+++ /dev/null
@@ -1,55 +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 replace the version pin in
-# the constraints file before applying it for from-source installation.
-
-ZUUL_CLONER=/usr/zuul-env/bin/zuul-cloner
-BRANCH_NAME=master
-CLIENT_NAME=python-troveclient
-requirements_installed=$(echo "import openstack_requirements" | python 2>/dev/null ; echo $?)
-
-set -e
-
-CONSTRAINTS_FILE=$1
-shift
-
-install_cmd="pip install"
-mydir=$(mktemp -dt "$CLIENT_NAME-tox_install-XXXXXXX")
-trap "rm -rf $mydir" EXIT
-localfile=$mydir/upper-constraints.txt
-if [[ $CONSTRAINTS_FILE != http* ]]; then
- CONSTRAINTS_FILE=file://$CONSTRAINTS_FILE
-fi
-curl $CONSTRAINTS_FILE -k -o $localfile
-install_cmd="$install_cmd -c$localfile"
-
-if [ $requirements_installed -eq 0 ]; then
- echo "ALREADY INSTALLED" > /tmp/tox_install.txt
- echo "Requirements already installed; using existing package"
-elif [ -x "$ZUUL_CLONER" ]; then
- echo "ZUUL CLONER" > /tmp/tox_install.txt
- pushd $mydir
- $ZUUL_CLONER --cache-dir \
- /opt/git \
- --branch $BRANCH_NAME \
- git://git.openstack.org \
- openstack/requirements
- cd openstack/requirements
- $install_cmd -e .
- popd
-else
- echo "PIP HARDCODE" > /tmp/tox_install.txt
- if [ -z "$REQUIREMENTS_PIP_LOCATION" ]; then
- REQUIREMENTS_PIP_LOCATION="git+https://git.openstack.org/openstack/requirements@$BRANCH_NAME#egg=requirements"
- fi
- $install_cmd -U -e ${REQUIREMENTS_PIP_LOCATION}
-fi
-
-# 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 "-e file://$PWD#egg=$CLIENT_NAME"
-
-$install_cmd -U $*
-exit $?
diff --git a/tox.ini b/tox.ini
index de4f1a3..cd315cb 100644
--- a/tox.ini
+++ b/tox.ini
@@ -13,10 +13,9 @@ setenv = VIRTUAL_ENV={envdir}
NOSE_OPENSTACK_YELLOW=0.025
NOSE_OPENSTACK_SHOW_ELAPSED=1
usedevelop = True
-install_command = {toxinidir}/tools/tox_install.sh \
- {env:UPPER_CONSTRAINTS_FILE:https://git.openstack.org/cgit/openstack/requirements/plain/upper-constraints.txt} \
- {opts} {packages}
-deps = -r{toxinidir}/requirements.txt
+install_command = pip install {opts} {packages}
+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
commands = find . -type f -name "*.pyc" -delete
rm -f .testrepository/times.dbm