Restore CI jobs

Change-Id: I9867097ee2752790d1b0c3226f5ba28ac27d85bc

.zuul.yaml

@@ -4,18 +4,19 @@
       - check-requirements
       - publish-openstack-docs-pti
       - release-notes-jobs-python3
+      - openstack-python3-jobs
     check:
       jobs:
         - openstack-tox-pylint
-        # - freezer-tempest-agent
-        # - freezer-tempest-scheduler
+        - freezer-tempest-agent
+        - freezer-tempest-scheduler
         # - freezer-ubuntu
         # - freezer-centos-9-stream
     gate:
       jobs:
         - openstack-tox-pylint
-        # - freezer-tempest-agent
-        # - freezer-tempest-scheduler
+        - freezer-tempest-agent
+        - freezer-tempest-scheduler
         # - freezer-ubuntu
         # - freezer-centos-9-stream
 

devstack/lib/freezer

@@ -59,6 +59,11 @@ function install_freezer {
 
     git_clone $FREEZER_REPO $FREEZER_DIR $FREEZER_BRANCH
     setup_develop $FREEZER_DIR
+    if [[ "$GLOBAL_VENV" == "True" ]]; then
+        sudo ln -sf /opt/stack/data/venv/bin/freezer /usr/local/bin
+        sudo ln -sf /opt/stack/data/venv/bin/freezer-agent /usr/local/bin
+        sudo ln -sf /opt/stack/data/venv/bin/freezer-scheduler /usr/local/bin
+    fi
 }
 
 # executed during: stack post-config

freezer/engine/rsync/pyrsync.py

@@ -101,7 +101,8 @@ def rsyncdelta(datastream, remotesignatures, blocksize=4096):
             # matching strong hash does not occur at the first match, it will
             # be missed and the data sent over. May fix eventually, but this
             # problem arises very rarely.
-            matchblock = remote_weak.index(checksum, matchblock + 1)  # pylint: disable=E0606
+            matchblock = remote_weak.index(
+                checksum, matchblock + 1)  # pylint: disable=E0606
             stronghash = hashlib.sha1(bytes(window)).hexdigest()
             matchblock = remote_strong.index(stronghash, matchblock)
 
@@ -141,7 +142,8 @@ def rsyncdelta(datastream, remotesignatures, blocksize=4096):
 
             # Yank off the extra byte and calculate the new window checksum
             oldbyte = window.popleft()
-            checksum, a, b = rollingchecksum(oldbyte, newbyte, a, b, blocksize)  # pylint: disable=E0601
+            checksum, a, b = rollingchecksum(
+                oldbyte, newbyte, a, b, blocksize)  # pylint: disable=E0601
 
             last_byte.append(oldbyte)
             if len(last_byte) == blocksize:

freezer/storage/ftp.py

@@ -322,8 +322,7 @@ class FtpsStorage(BaseFtpStorage):
 
     def init(self):
         try:
-            ftps = ftplib.FTP_TLS(keyfile=self.keyfile,
-                                  certfile=self.certfile)
+            ftps = ftplib.FTP_TLS()
             ftps.set_pasv(True)
             ftps.connect(self.remote_ip, self.port, 60)
             ftps.login(self.remote_username, self.remote_pwd)

test-requirements.txt

@@ -20,4 +20,4 @@ python-openstackclient>=3.12.0 # Apache-2.0
 doc8>=0.6.0 # Apache-2.0
 Pygments>=2.2.0 # BSD license
 # astroid<=2.5.0;python_version>="3.0" # LGPLv2.1
-pylint>=2.6.0;python_version>="3.0" # GPLv2
+pylint>=2.6.0 # GPLv2

tox.ini

@@ -59,6 +59,9 @@ basepython = python3.9
 [testenv:py38]
 basepython = python3.8
 
+[testenv:py312]
+basepython = python3.12
+
 [testenv:docs]
 deps =
   -c{env:UPPER_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/master}