summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVieri <15050873171@163.com>2018-08-21 15:58:32 +0000
committerAndreas Jaeger <aj@suse.com>2018-09-06 09:30:54 +0200
commitf2c87dae9925aa45b13c39bc9989900f5f991a4f (patch)
tree236204e2f792dc0d4fa97fb3bde62851460117de
parenta46e753a69e103a1c6d1276f9f03152a57ea1cfb (diff)
import zuul job settings from project-configstable/pike
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 unused tools/tox_install.sh, the existance breaks docs building. See the python3-first goal document for details: https://governance.openstack.org/tc/goals/stein/python3-first.html Change-Id: I2491e59c0801b76f92e00061ab46a09eff514008 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 10:45:14 +0000 Reviewed-on: https://review.openstack.org/594351 Project: openstack/ec2-api Branch: refs/heads/stable/pike
-rw-r--r--.zuul.yaml7
-rwxr-xr-xtools/tox_install.sh30
2 files changed, 7 insertions, 30 deletions
diff --git a/.zuul.yaml b/.zuul.yaml
index 773edd2..81e759d 100644
--- a/.zuul.yaml
+++ b/.zuul.yaml
@@ -1,4 +1,9 @@
1- project: 1- project:
2 templates:
3 - openstack-python-jobs
4 - openstack-python35-jobs
5 - check-requirements
6 - publish-openstack-sphinx-docs
2 name: openstack/ec2-api 7 name: openstack/ec2-api
3 check: 8 check:
4 jobs: 9 jobs:
@@ -14,3 +19,5 @@
14 voting: false 19 voting: false
15 - tripleo-ci-centos-7-scenario002-multinode-oooq-container: 20 - tripleo-ci-centos-7-scenario002-multinode-oooq-container:
16 voting: false 21 voting: false
22 gate:
23 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 $?