EVE-1150 builbot upgrade to 2.7.0

build/workers/focal/requirements.txt

@@ -47,23 +47,24 @@ bcrypt==3.2.0
     # via crossbar
 bitstring==3.1.7
     # via crossbar
-buildbot-pkg==2.0.1
+buildbot-pkg==2.7.0
     # via
     #   -c build/workers/focal/../../../requirements/constraints.txt
     #   -r build/workers/focal/../../../requirements/base.in
-buildbot-worker==2.0.1
+buildbot-worker==2.7.0
     # via
     #   -c build/workers/focal/../../../requirements/constraints.txt
     #   -r build/workers/focal/../../../requirements/base.in
-buildbot-www==2.0.1
+buildbot-www==2.7.0
     # via
     #   -c build/workers/focal/../../../requirements/constraints.txt
     #   -r build/workers/focal/../../../requirements/base.in
-buildbot==2.0.1
+buildbot[tls]==2.7.0
     # via
     #   -c build/workers/focal/../../../requirements/constraints.txt
     #   -r build/workers/focal/../../../requirements/base.in
-buildbot_wsgi_dashboards==2.0.1
+    #   buildbot-www
+buildbot_wsgi_dashboards==2.7.0
     # via
     #   -c build/workers/focal/../../../requirements/constraints.txt
     #   -r build/workers/focal/../../../requirements/base.in
@@ -89,6 +90,7 @@ cffi==1.14.5
     #   bcrypt
     #   cryptography
     #   pynacl
+    #   zlmdb
 chardet==3.0.4
     # via
     #   -c build/workers/focal/../../../requirements/constraints.txt
@@ -110,14 +112,16 @@ cliff==3.7.0
 cmd2==1.5.0
     # via cliff
 colorama==0.4.4
-    # via cmd2
+    # via
+    #   cmd2
+    #   crossbar
 constantly==15.1.0
     # via
     #   crossbar
     #   twisted
 coverage==5.5
     # via pytest-cov
-crossbar==21.1.1
+crossbar==21.3.1
     # via -r build/workers/focal/../../../requirements/system_tests.in
 cryptography==3.4.7
     # via
@@ -158,9 +162,7 @@ flatbuffers==1.12
     #   autobahn
     #   zlmdb
 future==0.18.2
-    # via
-    #   buildbot
-    #   buildbot-worker
+    # via buildbot-worker
 google-auth==1.28.1
     # via kubernetes
 h2==3.2.0
@@ -186,7 +188,7 @@ importlib-metadata==3.10.1
     # via
     #   -c build/workers/focal/../../../requirements/constraints.txt
     #   -r build/workers/focal/../../../requirements/base.in
-importlib-resources==5.1.2
+importlib-resources==5.1.4
     # via crossbar
 incremental==21.3.0
     # via
@@ -272,7 +274,7 @@ netifaces==0.10.9
     #   -r build/workers/focal/../../../requirements/base.in
     #   openstacksdk
     #   oslo.utils
-numpy==1.19.5
+numpy==1.20.3
     # via zlmdb
 oauthlib==3.1.0
     # via requests-oauthlib
@@ -395,6 +397,8 @@ pyflakes==2.3.1
     #   flake8
 pygments==2.8.1
     # via crossbar
+pyhamcrest==2.0.2
+    # via twisted
 pyjwt==2.0.1
     # via
     #   adal
@@ -542,7 +546,6 @@ six==1.15.0
     #   python-swiftclient
     #   sqlalchemy-migrate
     #   tox
-    #   treq
     #   virtualenv
     #   websocket-client
 snowballstemmer==2.1.0
@@ -582,11 +585,12 @@ towncrier==21.3.0
     # via -r build/workers/focal/../../../requirements/relnotes.in
 tox==3.23.0
     # via -r build/workers/focal/requirements.in
-treq==21.1.0
+treq==21.5.0
     # via
+    #   -c build/workers/focal/../../../requirements/constraints.txt
     #   -r build/workers/focal/../../../requirements/base.in
     #   crossbar
-twisted[tls]==21.2.0
+twisted[tls]==20.3.0
     # via
     #   -c build/workers/focal/../../../requirements/constraints.txt
     #   autobahn
@@ -631,8 +635,10 @@ wrapt==1.12.1
 xunitparser==1.3.3
     # via -r build/workers/focal/../../../requirements/base.in
 zipp==3.4.1
-    # via importlib-metadata
-zlmdb==21.1.1
+    # via
+    #   importlib-metadata
+    #   importlib-resources
+zlmdb==21.2.1
     # via crossbar
 zope.interface==5.3.0
     # via
@@ -643,5 +649,4 @@ zope.interface==5.3.0
     #   txtorcon
 
 # The following packages are considered to be unsafe in a requirements file:
-# pip
 # setuptools

requirements/base.txt

@@ -25,23 +25,24 @@ babel==2.6.0
     # via
     #   -c requirements/constraints.txt
     #   python-heatclient
-buildbot-pkg==2.0.1
+buildbot-pkg==2.7.0
     # via
     #   -c requirements/constraints.txt
     #   -r requirements/base.in
-buildbot-worker==2.0.1
+buildbot-worker==2.7.0
     # via
     #   -c requirements/constraints.txt
     #   -r requirements/base.in
-buildbot-www==2.0.1
+buildbot-www==2.7.0
     # via
     #   -c requirements/constraints.txt
     #   -r requirements/base.in
-buildbot==2.0.1
+buildbot[tls]==2.7.0
     # via
     #   -c requirements/constraints.txt
     #   -r requirements/base.in
-buildbot_wsgi_dashboards==2.0.1
+    #   buildbot-www
+buildbot_wsgi_dashboards==2.7.0
     # via
     #   -c requirements/constraints.txt
     #   -r requirements/base.in
@@ -94,9 +95,7 @@ dogpile.cache==1.1.2
 flask==1.1.2
     # via -r requirements/base.in
 future==0.18.2
-    # via
-    #   buildbot
-    #   buildbot-worker
+    # via buildbot-worker
 google-auth==1.30.0
     # via kubernetes
 hyperlink==21.0.0
@@ -258,6 +257,8 @@ pyflakes==2.3.1
     # via
     #   -c requirements/constraints.txt
     #   -r requirements/base.in
+pyhamcrest==2.0.2
+    # via twisted
 pyjwt==2.1.0
     # via
     #   adal
@@ -355,7 +356,6 @@ six==1.15.0
     #   python-keystoneclient
     #   python-swiftclient
     #   sqlalchemy-migrate
-    #   treq
     #   websocket-client
 snowballstemmer==2.1.0
     # via pydocstyle
@@ -381,9 +381,11 @@ stevedore==3.3.0
     #   python-openstackclient
 tempita==0.5.2
     # via sqlalchemy-migrate
-treq==21.1.0
-    # via -r requirements/base.in
-twisted[tls]==21.2.0
+treq==21.5.0
+    # via
+    #   -c requirements/constraints.txt
+    #   -r requirements/base.in
+twisted[tls]==20.3.0
     # via
     #   -c requirements/constraints.txt
     #   buildbot
@@ -416,5 +418,4 @@ zope.interface==5.4.0
     #   twisted
 
 # The following packages are considered to be unsafe in a requirements file:
-# pip
 # setuptools

requirements/constraints.txt

@@ -1,11 +1,11 @@
 # CONSTRAINTS for all installs
 
 # fix version of buildbot
-buildbot-pkg==2.0.1
-buildbot-worker==2.0.1
-buildbot-www==2.0.1
-buildbot==2.0.1
-buildbot_wsgi_dashboards==2.0.1
+buildbot-pkg==2.7.0
+buildbot-worker==2.7.0
+buildbot-www==2.7.0
+buildbot==2.7.0
+buildbot_wsgi_dashboards==2.7.0
 
 # Buildbot deps
 sqlalchemy==1.2.17
@@ -18,6 +18,7 @@ certifi==2018.11.29
 babel==2.6.0
 urllib3==1.24.3
 chardet==3.0.4
+treq==21.5.0
 
 # pydocstyle 2.1.1 raises new errors
 # we will need a proper integration of the new version

requirements/system_tests.txt

@@ -98,7 +98,7 @@ idna==2.5
     #   hyperlink
     #   requests
     #   twisted
-importlib-resources==5.1.2
+importlib-resources==5.1.4
     # via crossbar
 incremental==21.3.0
     # via
@@ -122,7 +122,7 @@ msgpack==1.0.2
     # via autobahn
 netaddr==0.8.0
     # via crossbar
-numpy==1.20.2
+numpy==1.20.3
     # via zlmdb
 packaging==20.9
     # via pytest
@@ -157,6 +157,8 @@ pycparser==2.20
     # via cffi
 pygments==2.8.1
     # via crossbar
+pyhamcrest==2.0.2
+    # via twisted
 pynacl==1.4.0
     # via
     #   autobahn
@@ -218,14 +220,15 @@ six==1.15.0
     #   bcrypt
     #   pynacl
     #   pyopenssl
-    #   treq
 sortedcontainers==2.3.0
     # via pytrie
 toml==0.10.2
     # via pytest
-treq==21.1.0
-    # via crossbar
-twisted[tls]==21.2.0
+treq==21.5.0
+    # via
+    #   -c requirements/constraints.txt
+    #   crossbar
+twisted[tls]==20.3.0
     # via
     #   -c requirements/constraints.txt
     #   autobahn
@@ -251,6 +254,8 @@ watchdog==2.0.3
     # via crossbar
 werkzeug==1.0.1
     # via crossbar
+zipp==3.4.1
+    # via importlib-resources
 zlmdb==21.2.1
     # via crossbar
 zope.interface==5.4.0

tests/docker/test_docker.py

@@ -397,6 +397,7 @@ def test_long_step_name(self):
             step_names_and_descriptions = [(step['name'], step['state_string'])
                                            for step in premerge_steps]
             self.assertEqual(step_names_and_descriptions, [
+                (u'worker_preparation', u'worker ready'),
                 (u'prevent unuseful restarts', u"'[ $(expr ...'"),
                 (u'set the artifacts private url',
                  u"property 'artifacts_private_url' set"),

tests/docker/test_docker_with_registry.py

@@ -81,6 +81,7 @@ def test_simple_build(self):
         step_names_and_descriptions = [(step['name'], step['state_string'])
                                        for step in bootstrap_steps]
         self.assertEqual(step_names_and_descriptions, [
+            (u'worker_preparation', u'worker ready'),
             (u'set the bootstrap build number', u'Set'),
             (u'check index.lock', u"'test ! ...'"),
             (u'checkout git branch', u'update'),
@@ -110,6 +111,7 @@ def test_simple_build(self):
         step_names_and_descriptions = [(step['name'], step['state_string'])
                                        for step in steps]
         self.assertEqual(step_names_and_descriptions, [
+            (u'worker_preparation', u'worker ready'),
             (u'prevent unuseful restarts', u"'[ $(expr ...'"),
             (u'set the artifacts private url',
              u"property 'artifacts_private_url' set"),
@@ -139,6 +141,7 @@ def test_simple_build(self):
         step_names_and_descriptions = [(step['name'], step['state_string'])
                                        for step in bootstrap_steps]
         self.assertEqual(step_names_and_descriptions, [
+            (u'worker_preparation', u'worker ready'),
             (u'set the bootstrap build number', u'Set'),
             (u'check index.lock', u"'test ! ...'"),
             (u'checkout git branch', u'update'),
@@ -187,6 +190,7 @@ def test_simple_build(self):
         step_names_and_descriptions = [(step['name'], step['state_string'])
                                        for step in bootstrap_steps]
         self.assertEqual(step_names_and_descriptions, [
+            (u'worker_preparation', u'worker ready'),
             (u'set the bootstrap build number', u'Set'),
             (u'check index.lock', u"'test ! ...'"),
             (u'checkout git branch', u'update'),

tests/system/junit/test_junit.py

@@ -50,6 +50,11 @@ def test_junit_step(self):  # pylint: disable=too-many-statements
         results = [(step.name, step.state_string, step.result)
                    for step in child_build.steps]
         expected = [
+            (
+                u'worker_preparation',
+                u'worker ready',
+                'success'
+            ),
             (
                 u'prevent unuseful restarts',
                 u"'[ $(expr ...'",

tests/system/test_cluster.py

@@ -75,6 +75,7 @@ def test_simple_success(self):
             step_names_and_descriptions = [(step['name'], step['state_string'])
                                            for step in bootstrap_steps]
             self.assertEqual(step_names_and_descriptions, [
+                (u'worker_preparation', u'worker ready'),
                 (u'set the bootstrap build number', u'Set'),
                 (u'check index.lock', u"'test ! ...'"),
                 (u'checkout git branch', u'update'),
@@ -106,6 +107,7 @@ def test_simple_success(self):
             step_names_and_descriptions = [(step['name'], step['state_string'])
                                            for step in premerge_steps]
             self.assertEqual(step_names_and_descriptions, [
+                (u'worker_preparation', u'worker ready'),
                 (u'prevent unuseful restarts', u"'[ $(expr ...'"),
                 (u'set the artifacts private url',
                  u"property 'artifacts_private_url' set"),
@@ -196,6 +198,7 @@ def test_index_lock_failure(self):
             step_names_and_descriptions = [(step['name'], step['state_string'])
                                            for step in bootstrap_steps]
             self.assertEqual(step_names_and_descriptions, [
+                (u'worker_preparation', u'worker ready'),
                 (u'set the bootstrap build number', u'Set'),
                 (u'check index.lock', u"'test ! ...' (failure)")])
 
@@ -332,7 +335,7 @@ def check_prop(name, value=None, source=None):
             check_prop('artifacts_public_url')
             check_prop('bootstrap', 1, 'set the bootstrap build number')
             check_prop('branch', 'spam', 'Build')
-            check_prop('buildbot_version', '2.0.1')
+            check_prop('buildbot_version', '2.7.0')
             check_prop('builddir')
             check_prop('buildername', 'bootstrap', 'Builder')
             check_prop('buildnumber', 1, 'Build')
@@ -363,7 +366,7 @@ def check_prop(name, value=None, source=None):
             check_prop('bootstrap', 1, 'set the bootstrap build number')
             check_prop('bootstrap_reason', 'branch updated', 'BuildOrder')
             check_prop('branch', 'spam', 'Build')
-            check_prop('buildbot_version', '2.0.1')
+            check_prop('buildbot_version', '2.7.0')
             check_prop('builddir')
             check_prop('buildername', 'local-test_suffix', 'Builder')
             check_prop('buildnumber', 1, 'Build')

tests/system/test_patcher.py

@@ -148,6 +148,7 @@ def test_patcher_branch_no_match(self):
             step_names_and_descriptions = [(step['name'], step['state_string'])
                                            for step in premerge_steps]
             self.assertEqual(step_names_and_descriptions, [
+                (u'worker_preparation', u'worker ready'),
                 (u'prevent unuseful restarts', u"'[ $(expr ...'"),
                 (u'set the artifacts private url',
                  u"property 'artifacts_private_url' set"),