summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVanou Ishii <ishii.vanou@fujitsu.com>2022-11-28 03:07:13 -0500
committerVanou Ishii <ishii.vanou@fujitsu.com>2022-11-28 03:49:41 -0500
commit5b194c2d424634e5cc08a59095bacb4c852af1a3 (patch)
tree895d2e04d4bd9e68731e78ecd7845b2cd7467d8b
parentaac7854febf7cf731a5c366f06d7cdb4a1e14bbe (diff)
downloadironic-5b194c2d424634e5cc08a59095bacb4c852af1a3.tar.gz
Deals with migration of tox base job to Ubuntu Jammy
OpenStack Infra Zuul jobs (openstack/openstack-zuul-jobs) adds support of Zuul node based on Ubuntu Jammy on 2022 Oct 12th (6d85fd8399ed6b9f2358412945cd6683989662cd). This causes CI failure in openstack-tox-cover, openstack-tox-pep8, ironic-tox-unit-with-driver-libs, ironic-tox-bandit and ironic-cross-sushy (there is no package named 'python-dev' in Ubuntu Jammy). This commit fixes this through specifying Ubuntu Focal Zuul node. Change-Id: I98955e90f216411c0ca3077dfb20fc3f2dc5b93e
-rw-r--r--bindep.txt2
-rw-r--r--zuul.d/ironic-jobs.yaml7
2 files changed, 8 insertions, 1 deletions
diff --git a/bindep.txt b/bindep.txt
index f64e20165..6c95ee87c 100644
--- a/bindep.txt
+++ b/bindep.txt
@@ -46,7 +46,7 @@ iptables [devstack]
net-tools [platform:rpm devstack]
# these are needed to compile Python dependencies from sources
-python-dev [platform:dpkg test]
+python-dev [platform:dpkg test !platform:ubuntu-jammy]
python3-all-dev [platform:dpkg !platform:ubuntu-precise test]
python3-devel [platform:rpm test]
build-essential [platform:dpkg test]
diff --git a/zuul.d/ironic-jobs.yaml b/zuul.d/ironic-jobs.yaml
index db87ca9f7..9166e5d84 100644
--- a/zuul.d/ironic-jobs.yaml
+++ b/zuul.d/ironic-jobs.yaml
@@ -660,6 +660,7 @@
- job:
name: ironic-tox-unit-with-driver-libs
+ nodeset: ubuntu-focal
parent: openstack-tox
description: |
Run python 3 unit tests with driver dependencies installed.
@@ -696,6 +697,7 @@
- job:
# Security testing for known issues
name: ironic-tox-bandit
+ nodeset: ubuntu-focal
parent: openstack-tox
timeout: 2400
vars:
@@ -1053,6 +1055,7 @@
- job:
name: ironic-cross-sushy
description: Ironic unit tests run with Sushy from source
+ nodeset: ubuntu-focal
parent: openstack-tox
required-projects:
- name: opendev.org/openstack/ironic
@@ -1086,6 +1089,7 @@
check:
jobs:
- openstack-tox-pep8:
+ nodeset: ubuntu-focal
required-projects:
- name: openstack/requirements
override-checkout: stable/yoga
@@ -1100,6 +1104,7 @@
gate:
jobs:
- openstack-tox-pep8:
+ nodeset: ubuntu-focal
required-projects:
- name: openstack/requirements
override-checkout: stable/yoga
@@ -1138,12 +1143,14 @@
check:
jobs:
- openstack-tox-cover:
+ nodeset: ubuntu-focal
required-projects:
- name: openstack/requirements
override-checkout: stable/yoga
gate:
jobs:
- openstack-tox-cover:
+ nodeset: ubuntu-focal
required-projects:
- name: openstack/requirements
override-checkout: stable/yoga