openstack/freezer
Code Issues Proposed changes

Restore CI jobs

Browse Source 
Change-Id: I9867097ee2752790d1b0c3226f5ba28ac27d85bc
This commit is contained in:
Dmitriy Rabotyagov 2024-12-01 17:10:20 +01:00
parent dbf55403be
commit aa6ce8dfcc
6 changed files with 19 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
.zuul.yaml
View File

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

5
devstack/lib/freezer
View File

@ -59,6 +59,11 @@ function install_freezer {
git_clone $FREEZER_REPO $FREEZER_DIR $FREEZER_BRANCH git_clone $FREEZER_REPO $FREEZER_DIR $FREEZER_BRANCH
setup_develop $FREEZER_DIR 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 # executed during: stack post-config

6
freezer/engine/rsync/pyrsync.py
View File

@ -101,7 +101,8 @@ def rsyncdelta(datastream, remotesignatures, blocksize=4096):
# matching strong hash does not occur at the first match, it will # matching strong hash does not occur at the first match, it will
# be missed and the data sent over. May fix eventually, but this # be missed and the data sent over. May fix eventually, but this
# problem arises very rarely. # 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() stronghash = hashlib.sha1(bytes(window)).hexdigest()
matchblock = remote_strong.index(stronghash, matchblock) 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 # Yank off the extra byte and calculate the new window checksum
oldbyte = window.popleft() 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) last_byte.append(oldbyte)
if len(last_byte) == blocksize: if len(last_byte) == blocksize:

3
freezer/storage/ftp.py
View File

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

2
test-requirements.txt
View File

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

3
tox.ini
View File

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