summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVieri <15050873171@163.com>2018-08-21 15:58:21 +0000
committerAndreas Jaeger <aj@suse.com>2018-09-06 09:32:53 +0200
commitbfb26f159cb6365f73df561c87da8137249de32c (patch)
treeb61325f76949b0955b02fd8bfb5cea8d85a9e532
parent2f87f8961c0c36ca10107126933481fdcd6e3a6d (diff)
import zuul job settings from project-configstable/ocata
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. Remove also tools/tox_install.sh usage, it breaks doc building and is not needed. See the python3-first goal document for details: https://governance.openstack.org/tc/goals/stein/python3-first.html Change-Id: I1f33955c761091bcbc4227dcfcc2f9bd7fbe9357 Story: #2002586 Task: #24295
Notes
Notes (review): Code-Review+2: Andrey Pavlov <andrey.mp@gmail.com> Workflow+1: Andrey Pavlov <andrey.mp@gmail.com> Verified+2: Zuul Submitted-by: Zuul Submitted-at: Thu, 06 Sep 2018 12:44:06 +0000 Reviewed-on: https://review.openstack.org/594350 Project: openstack/ec2-api Branch: refs/heads/stable/ocata
-rw-r--r--.zuul.yaml8
-rwxr-xr-xtools/tox_install.sh30
-rw-r--r--tox.ini2
3 files changed, 9 insertions, 31 deletions
diff --git a/.zuul.yaml b/.zuul.yaml
new file mode 100644
index 0000000..a9254b8
--- /dev/null
+++ b/.zuul.yaml
@@ -0,0 +1,8 @@
1- project:
2 templates:
3 - openstack-python-jobs
4 - openstack-python35-jobs
5 - check-requirements
6 - publish-openstack-sphinx-docs
7 gate:
8 queue: ec2-api
diff --git a/tools/tox_install.sh b/tools/tox_install.sh
deleted file mode 100755
index e61b63a..0000000
--- a/tools/tox_install.sh
+++ /dev/null
@@ -1,30 +0,0 @@
1#!/usr/bin/env bash
2
3# Client constraint file contains this client version pin that is in conflict
4# with installing the client from source. We should remove the version pin in
5# the constraints file before applying it for from-source installation.
6
7CONSTRAINTS_FILE="$1"
8shift 1
9
10set -e
11
12# NOTE(tonyb): Place this in the tox enviroment's log dir so it will get
13# published to logs.openstack.org for easy debugging.
14localfile="$VIRTUAL_ENV/log/upper-constraints.txt"
15
16if [[ "$CONSTRAINTS_FILE" != http* ]]; then
17 CONSTRAINTS_FILE="file://$CONSTRAINTS_FILE"
18fi
19# NOTE(tonyb): need to add curl to bindep.txt if the project supports bindep
20curl "$CONSTRAINTS_FILE" --insecure --progress-bar --output "$localfile"
21
22pip install -c"$localfile" openstack-requirements
23
24# This is the main purpose of the script: Allow local installation of
25# the current repo. It is listed in constraints file and thus any
26# install will be constrained and we need to unconstrain it.
27edit-constraints "$localfile" -- "$CLIENT_NAME"
28
29pip install -c"$localfile" -U "$@"
30exit $?
diff --git a/tox.ini b/tox.ini
index 1ffa97a..7f1d36e 100644
--- a/tox.ini
+++ b/tox.ini
@@ -6,7 +6,7 @@ skipsdist = True
6[testenv] 6[testenv]
7sitepackages = False 7sitepackages = False
8usedevelop = True 8usedevelop = True
9install_command = {toxinidir}/tools/tox_install.sh {env:UPPER_CONSTRAINTS_FILE:https://git.openstack.org/cgit/openstack/requirements/plain/upper-constraints.txt?h=stable/ocata} {opts} {packages} 9install_command = pip install -c {env:UPPER_CONSTRAINTS_FILE:https://git.openstack.org/cgit/openstack/requirements/plain/upper-constraints.txt?h=stable/ocata} {opts} {packages}
10setenv = VIRTUAL_ENV={envdir} 10setenv = VIRTUAL_ENV={envdir}
11 BRANCH_NAME=master 11 BRANCH_NAME=master
12 CLIENT_NAME=ec2-api 12 CLIENT_NAME=ec2-api