Use UPPER_CONSTRAINTS_FILE to deal with ipa-builder
The generate_upper_constraints.sh script in ipa-builder 2.2.0 still uses UPPER_CONSTRAINTS_FILE as fallback to get the upper constraints file. Also remove duplicate option in ironic-ipa-dib-base and use bionic for the tinyipa jobs so we're sure to use the correct kernel when building the ipa ramdisk. Change-Id: I1883dc3b1b290f1f2f60dad5e5af57ceffba9d14
This commit is contained in:
parent
90b79c2f3c
commit
b9c9b0be10
2
tox.ini
2
tox.ini
|
@ -14,7 +14,7 @@ setenv =
|
|||
LANGUAGE=en_US
|
||||
LC_ALL=en_US.utf-8
|
||||
deps =
|
||||
-c{env:TOX_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/ussuri}
|
||||
-c{env:UPPER_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/ussuri}
|
||||
-r{toxinidir}/requirements.txt
|
||||
-r{toxinidir}/test-requirements.txt
|
||||
commands = stestr run {posargs}
|
||||
|
|
|
@ -182,8 +182,6 @@
|
|||
parent: ironic-ipa-base
|
||||
required-projects:
|
||||
- openstack/diskimage-builder
|
||||
- name: openstack/ironic-python-agent-builder
|
||||
override-checkout: 2.2.0
|
||||
timeout: 9600
|
||||
vars:
|
||||
tempest_test_timeout: 2400
|
||||
|
@ -230,6 +228,15 @@
|
|||
- job:
|
||||
name: ironic-python-agent-build-image-tinyipa-ussuri
|
||||
parent: ironic-python-agent-build-image-tinyipa
|
||||
nodeset: ubuntu-bionic
|
||||
required-projects:
|
||||
- name: openstack/ironic-python-agent-builder
|
||||
override-checkout: 2.2.0
|
||||
|
||||
- job:
|
||||
name: ironic-python-agent-check-image-tinyipa-ussuri
|
||||
parent: ironic-python-agent-check-image-tinyipa
|
||||
nodeset: ubuntu-bionic
|
||||
required-projects:
|
||||
- name: openstack/ironic-python-agent-builder
|
||||
override-checkout: 2.2.0
|
||||
|
|
|
@ -15,7 +15,7 @@
|
|||
- metalsmith-integration-ipa-src
|
||||
# NOTE(dtantsur): non-voting because IPA source code is very unlikely
|
||||
# to break them. They rather serve as a canary for broken POST jobs.
|
||||
- ironic-python-agent-check-image-tinyipa:
|
||||
- ironic-python-agent-check-image-tinyipa-ussuri:
|
||||
voting: false
|
||||
- ironic-python-agent-check-image-dib-centos8:
|
||||
voting: false
|
||||
|
|
Loading…
Reference in New Issue