summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNguyen Hai <nguyentrihai93@gmail.com>2018-08-20 15:36:20 +0900
committerSean McGinnis <sean.mcginnis@gmail.com>2018-09-17 15:38:33 +0000
commit2dfd7c7531724751116930accde87486fde03b01 (patch)
tree795077eb1f1b314a16d3cba767a76a99025cf3ba
parent1eb97f877fff6e32f181366e7a72c9fd81a647ca (diff)
downloadpython-glanceclient-pike-em.tar.gz
import zuul job settings from project-configpike-em2.8.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: Ia4af09a3e32c91a1f030b254d6fc89850d48e0ef Story: #2002586 Task: #24297
-rw-r--r--.zuul.yaml14
-rwxr-xr-xtools/tox_install.sh55
-rw-r--r--tox.ini8
3 files changed, 16 insertions, 61 deletions
diff --git a/.zuul.yaml b/.zuul.yaml
index 0b8d434..d92b92b 100644
--- a/.zuul.yaml
+++ b/.zuul.yaml
@@ -10,7 +10,7 @@
devstack_localrc:
# TODO(rosmaita): remove when glanceclient tests no longer
# use the Images v1 API
- GLANCE_V1_ENABLED: True
+ GLANCE_V1_ENABLED: true
LIBS_FROM_GIT: python-glanceclient
SWIFT_HASH: de63c7a09e4049599f2d00da1a355f89
devstack_services:
@@ -35,9 +35,16 @@
parent: glanceclient-dsvm-functional
vars:
devstack_localrc:
- ENABLE_IDENTITY_V2: False
+ ENABLE_IDENTITY_V2: false
- project:
+ templates:
+ - openstack-python-jobs
+ - openstack-python35-jobs
+ - release-notes-jobs
+ - publish-openstack-sphinx-docs
+ - check-requirements
+ - lib-forward-testing
check:
jobs:
- glanceclient-dsvm-functional
@@ -46,3 +53,6 @@
gate:
jobs:
- glanceclient-dsvm-functional
+ post:
+ jobs:
+ - openstack-tox-cover
diff --git a/tools/tox_install.sh b/tools/tox_install.sh
deleted file mode 100755
index ee2df0c..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-glanceclient
-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 ab02ce2..925e5a7 100644
--- a/tox.ini
+++ b/tox.ini
@@ -5,14 +5,14 @@ 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}
OS_STDOUT_NOCAPTURE=False
OS_STDERR_NOCAPTURE=False
PYTHONHASHSEED=0
-
-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 = python setup.py testr --testr-args='{posargs}'