Skip to content

Commit f2d7949

Browse files
author
Elod Illes
committed
[CI] Fix multiple gate issue
1. Use OVS main branch git checkout of OVS master branch causes an error [1]. OVS deleted its master branch and replaced it with main branch. 2. Cap setuptools <71.0.0 py38 jobs (on ubuntu-focal) started to fail (see the relevant github issue [1]) due to recent virtualenv release (20.26.4; which bundles setuptools). setuptools is bundled in virtualenv, so it has to be capped via the virtualenv package. tox also needed to be capped (<4) as gate uses tox 3.28.0, but with capping virtualenv we pull in latest tox as well, which would cause other errors. 3. Remove lower-constraints job lower-constraints jobs are not supported anymore and are removed from most of the branches, so let's remove here as well to unblock the gate. [1] error: pathspec 'master' did not match any file(s) known to git [2] pypa/setuptools#4483 Change-Id: I010e145f4c5079a80b72c5229dfacc4d6896373e
1 parent ab3e0cb commit f2d7949

File tree

3 files changed

+7
-2
lines changed

3 files changed

+7
-2
lines changed

tools/setup-ovs.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#!/bin/bash -xe
22

3-
OVS_BRANCH=${OVS_BRANCH:-master}
3+
OVS_BRANCH=${OVS_BRANCH:-main}
44
OVN_BRANCH=${OVN_BRANCH:-main}
55

66
function use_new_ovn_repository {

tox.ini

+6
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,12 @@ minversion = 3.1.1
33
envlist = py3,pep8
44
skipsdist = True
55
ignore_basepython_conflict = True
6+
# Cap setuptools via virtualenv to prevent compatibility issue with yoga
7+
# branch's upper constraint of 'packaging' package (21.3).
8+
requires =
9+
virtualenv<20.26.4
10+
tox<4
11+
setuptools<71.0.0
612

713
[testenv]
814
basepython = python3

zuul.d/project.yaml

-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
- project:
22
templates:
33
- check-requirements
4-
- openstack-lower-constraints-jobs
54
- openstack-python3-yoga-jobs
65
- publish-openstack-docs-pti
76
check:

0 commit comments

Comments
 (0)