summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTim Burke <tim.burke@gmail.com>2023-01-09 09:00:23 -0800
committerTim Burke <tim.burke@gmail.com>2023-01-23 11:47:02 -0800
commit91144596c670741c2f452c864c026eff5583989c (patch)
tree6c7ecb56d153b31f76e4598700f277c9d1beff78
parenta86270bed72cdbdf2f42eec562d9fae2d273fa64 (diff)
downloadswift-91144596c670741c2f452c864c026eff5583989c.tar.gz
Fix stable/train gate
Two things: * Add attrs to lower-constraints (cherry picked from commit ee12a11e708fce6c982a85b58cd2c3899f13479e) * Drop tempest and grenade testing Recently, these jobs started failing while installing tempest. The trouble seems to be: * tempest 26.1.0 depends on paramiko>=2.7.0 * paramiko 3.0.0 is selected which in turn depends on cryptography >= 3.3 and bcrypt >= 3.2 * cryptography 39.0.0 and bcrypt 4.0.1 are selected, neither of which get installed from binary wheels and both of which require a Rust toolchain to compile For some unknown reason, this used to be OK-ish -- the stable/train upper-constraints file would be respected, paramiko==2.6.0 would be installed with cryptography==2.8 and bcrypt==3.1.7, and pip would simply warn ERROR: tempest 26.1.0 has requirement paramiko>=2.7.0, but you'll have paramiko 2.6.0 which is incompatible. even though everything would still work. It's not at all clear how or why this stopped working -- there haven't been any recent changes to tempest's requirements or the stable/train constraints file, and the version of pip is the same. Given the age of the branch and its extended-maintenance state, dropping the testing seems best. Change-Id: I61750a1083a1c97a6222ec9040f90980ee73acc8
-rw-r--r--.zuul.yaml31
-rw-r--r--lower-constraints.txt1
2 files changed, 1 insertions, 31 deletions
diff --git a/.zuul.yaml b/.zuul.yaml
index 94c6e773d..cd061a22f 100644
--- a/.zuul.yaml
+++ b/.zuul.yaml
@@ -439,7 +439,6 @@
- periodic-stable-jobs
- check-requirements
- release-notes-jobs-python3
- - integrated-gate-object-storage
check:
jobs:
- swift-build-image:
@@ -561,21 +560,6 @@
- ^(api-ref|doc|releasenotes)/.*$
- ^test/probe/.*$
- ^(.gitreview|.mailmap|AUTHORS|CHANGELOG)$
- - tempest-integrated-object-storage:
- irrelevant-files:
- - ^(api-ref|doc|releasenotes)/.*$
- - ^test/.*$
- - ^(.gitreview|.mailmap|AUTHORS|CHANGELOG)$
- - tempest-ipv6-only:
- irrelevant-files:
- - ^(api-ref|doc|releasenotes)/.*$
- - ^test/.*$
- - ^(.gitreview|.mailmap|AUTHORS|CHANGELOG)$
- - grenade-py3:
- irrelevant-files:
- - ^(api-ref|doc|releasenotes)/.*$
- - ^test/.*$
- - ^(.gitreview|.mailmap|AUTHORS|CHANGELOG)$
gate:
jobs:
# For gate jobs, err towards running more jobs (so, generally avoid
@@ -627,21 +611,6 @@
- ^(api-ref|etc|examples|releasenotes)/.*$
# Keep doc/manpages -- we want to syntax check them
- ^doc/(requirements.txt|(saio|s3api|source)/.*)$
- - tempest-integrated-object-storage:
- irrelevant-files:
- - ^(api-ref|doc|releasenotes)/.*$
- - ^test/.*$
- - ^(.gitreview|.mailmap|AUTHORS|CHANGELOG)$
- - tempest-ipv6-only:
- irrelevant-files:
- - ^(api-ref|doc|releasenotes)/.*$
- - ^test/.*$
- - ^(.gitreview|.mailmap|AUTHORS|CHANGELOG)$
- - grenade-py3:
- irrelevant-files:
- - ^(api-ref|doc|releasenotes)/.*$
- - ^test/.*$
- - ^(.gitreview|.mailmap|AUTHORS|CHANGELOG)$
experimental:
jobs:
- swift-tox-py27-centos-7
diff --git a/lower-constraints.txt b/lower-constraints.txt
index 536e8b61e..785e99ab4 100644
--- a/lower-constraints.txt
+++ b/lower-constraints.txt
@@ -1,5 +1,6 @@
alabaster==0.7.10
asn1crypto==0.24.0
+attrs==21.4.0
Babel==2.5.3
bandit==1.1.0
boto==2.32.1