Fix Zuul jobs
The jobs are not working with Zuul v3 as is, we need to update all job configuration and add a new job 1) Add os-api-ref-nova-src job Replace the legacy version with a new shiny one. 2) Avoid tox_install.sh for constraints support Follow https://review.openstack.org/#/c/508061 to remove tools/tox_install.sh, we can build without it. Depends-On: I97448d681e3e48753496818fa248ee96dd36d65b Change-Id: Ia9c8672c820a415746e43d3b1fccb2df2f574b24
This commit is contained in:
parent
0cd27677a4
commit
7a389a1ff4
|
@ -0,0 +1,19 @@
|
|||
- job:
|
||||
name: os-api-ref-nova-src
|
||||
parent: build-openstack-api-ref
|
||||
description: |
|
||||
Run the api-ref job against nova with proposed os-api-ref change.
|
||||
vars:
|
||||
zuul_work_dir: src/git.openstack.org/openstack/nova
|
||||
required-projects:
|
||||
- openstack/nova
|
||||
- openstack/os-api-ref
|
||||
|
||||
- project:
|
||||
name: openstack/os-api-ref
|
||||
check:
|
||||
jobs:
|
||||
- os-api-ref-nova-src
|
||||
gate:
|
||||
jobs:
|
||||
- os-api-ref-nova-src
|
|
@ -1,30 +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 remove the version pin in
|
||||
# the constraints file before applying it for from-source installation.
|
||||
|
||||
CONSTRAINTS_FILE="$1"
|
||||
shift 1
|
||||
|
||||
set -e
|
||||
|
||||
# NOTE(tonyb): Place this in the tox enviroment's log dir so it will get
|
||||
# published to logs.openstack.org for easy debugging.
|
||||
localfile="$VIRTUAL_ENV/log/upper-constraints.txt"
|
||||
|
||||
if [[ "$CONSTRAINTS_FILE" != http* ]]; then
|
||||
CONSTRAINTS_FILE="file://$CONSTRAINTS_FILE"
|
||||
fi
|
||||
# NOTE(tonyb): need to add curl to bindep.txt if the project supports bindep
|
||||
curl "$CONSTRAINTS_FILE" --insecure --progress-bar --output "$localfile"
|
||||
|
||||
pip install -c"$localfile" openstack-requirements
|
||||
|
||||
# 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"
|
||||
|
||||
pip install -c"$localfile" -U "$@"
|
||||
exit $?
|
8
tox.ini
8
tox.ini
|
@ -6,10 +6,10 @@ skipsdist = True
|
|||
[testenv]
|
||||
setenv =
|
||||
VIRTUAL_ENV={envdir}
|
||||
BRANCH_NAME=master
|
||||
CLIENT_NAME=os-api-ref
|
||||
install_command = {toxinidir}/tools/tox_install.sh {toxinidir}/upper-constraints.txt {opts} {packages}
|
||||
deps = -r{toxinidir}/requirements.txt
|
||||
install_command = pip install -U {opts} {packages}
|
||||
deps =
|
||||
-c{env:UPPER_CONSTRAINTS_FILE:https://git.openstack.org/cgit/openstack/requirements/plain/upper-constraints.txt}
|
||||
-r{toxinidir}/requirements.txt
|
||||
-r{toxinidir}/test-requirements.txt
|
||||
commands = python setup.py test --slowest --no-parallel --testr-args='{posargs}'
|
||||
|
||||
|
|
Loading…
Reference in New Issue