summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDoug Hellmann <doug@doughellmann.com>2018-09-04 11:51:01 -0400
committerNguyen Hai <nguyentrihai93@gmail.com>2018-09-14 13:57:57 +0000
commit0a3304a0d51caae2a0bf5fe987d9513c9eb55618 (patch)
tree8d32db95eb49afdd75e07a497b97fdb991a1fe98
parent9f6dcb0617217241ea4260bd421b19dde35160b5 (diff)
downloadpython-barbicanclient-0a3304a0d51caae2a0bf5fe987d9513c9eb55618.tar.gz
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: Iba8cbf04b7d22fe218de3fdcd581c0b307787583 Story: #2002586 Task: #24285
-rw-r--r--.zuul.yaml13
-rwxr-xr-xtools/tox_install.sh53
-rw-r--r--tox.ini5
3 files changed, 16 insertions, 55 deletions
diff --git a/.zuul.yaml b/.zuul.yaml
new file mode 100644
index 0000000..43b89dc
--- /dev/null
+++ b/.zuul.yaml
@@ -0,0 +1,13 @@
+- project:
+ templates:
+ - openstack-python-jobs
+ - openstack-python35-jobs
+ - publish-openstack-sphinx-docs
+ - check-requirements
+ - openstackclient-plugin-jobs
+ check:
+ jobs:
+ - legacy-python-barbicanclient-dsvm
+ gate:
+ jobs:
+ - legacy-python-barbicanclient-dsvm
diff --git a/tools/tox_install.sh b/tools/tox_install.sh
deleted file mode 100755
index 7203698..0000000
--- a/tools/tox_install.sh
+++ /dev/null
@@ -1,53 +0,0 @@
-#!/usr/bin/env bash
-
-# [liujiong] This file is refer to tox_install.sh in neutron-lib.
-# Library constraint file contains this library version pin that is in conflict
-# with installing the library 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
-LIB_NAME=python-barbicanclient
-requirements_installed=$(echo "import openstack_requirements" | python 2>/dev/null ; echo $?)
-
-set -e
-
-CONSTRAINTS_FILE=$1
-shift
-
-install_cmd="pip install"
-mydir=$(mktemp -dt "$LIB_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 "Requirements already installed; using existing package"
-elif [ -x "$ZUUL_CLONER" ]; then
- 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
- 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 -- $LIB_NAME "-e file://$PWD#egg=$LIB_NAME"
-
-$install_cmd -U $*
-exit $?
diff --git a/tox.ini b/tox.ini
index 3bb2eda..8dcb654 100644
--- a/tox.ini
+++ b/tox.ini
@@ -5,10 +5,11 @@ skipsdist = True
[testenv]
usedevelop = True
-install_command = {toxinidir}/tools/tox_install.sh {env:UPPER_CONSTRAINTS_FILE:https://git.openstack.org/cgit/openstack/requirements/plain/upper-constraints.txt?h=stable/pike} {opts} {packages}
+install_command = pip install {opts} {packages}
setenv =
VIRTUAL_ENV={envdir}
-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
commands =
coverage erase